]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-3.0-3.18.1-201412310755.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.1-201412310755.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 3f84029..3c5b65e 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..7c807f0 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,6 +196,28 @@ 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 @@ -175,6 +262,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1152 return ret;
1153 }
1154
1155 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1156 +{
1157 + return atomic_cmpxchg(v, old, new);
1158 +}
1159 +
1160 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1161 {
1162 int c, old;
1163 @@ -196,16 +288,38 @@ ATOMIC_OPS(sub, -=, sub)
1164
1165 #undef ATOMIC_OPS
1166 #undef ATOMIC_OP_RETURN
1167 +#undef __ATOMIC_OP_RETURN
1168 #undef ATOMIC_OP
1169 +#undef __ATOMIC_OP
1170
1171 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1172 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1173 +{
1174 + return xchg(&v->counter, new);
1175 +}
1176
1177 #define atomic_inc(v) atomic_add(1, v)
1178 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1179 +{
1180 + atomic_add_unchecked(1, v);
1181 +}
1182 #define atomic_dec(v) atomic_sub(1, v)
1183 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1184 +{
1185 + atomic_sub_unchecked(1, v);
1186 +}
1187
1188 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1189 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1190 +{
1191 + return atomic_add_return_unchecked(1, v) == 0;
1192 +}
1193 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1194 #define atomic_inc_return(v) (atomic_add_return(1, v))
1195 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1196 +{
1197 + return atomic_add_return_unchecked(1, v);
1198 +}
1199 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1200 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1201
1202 @@ -216,6 +330,14 @@ typedef struct {
1203 long long counter;
1204 } atomic64_t;
1205
1206 +#ifdef CONFIG_PAX_REFCOUNT
1207 +typedef struct {
1208 + long long counter;
1209 +} atomic64_unchecked_t;
1210 +#else
1211 +typedef atomic64_t atomic64_unchecked_t;
1212 +#endif
1213 +
1214 #define ATOMIC64_INIT(i) { (i) }
1215
1216 #ifdef CONFIG_ARM_LPAE
1217 @@ -232,6 +354,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1218 return result;
1219 }
1220
1221 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1222 +{
1223 + long long result;
1224 +
1225 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1226 +" ldrd %0, %H0, [%1]"
1227 + : "=&r" (result)
1228 + : "r" (&v->counter), "Qo" (v->counter)
1229 + );
1230 +
1231 + return result;
1232 +}
1233 +
1234 static inline void atomic64_set(atomic64_t *v, long long i)
1235 {
1236 __asm__ __volatile__("@ atomic64_set\n"
1237 @@ -240,6 +375,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1238 : "r" (&v->counter), "r" (i)
1239 );
1240 }
1241 +
1242 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1243 +{
1244 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1245 +" strd %2, %H2, [%1]"
1246 + : "=Qo" (v->counter)
1247 + : "r" (&v->counter), "r" (i)
1248 + );
1249 +}
1250 #else
1251 static inline long long atomic64_read(const atomic64_t *v)
1252 {
1253 @@ -254,6 +398,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1254 return result;
1255 }
1256
1257 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1258 +{
1259 + long long result;
1260 +
1261 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1262 +" ldrexd %0, %H0, [%1]"
1263 + : "=&r" (result)
1264 + : "r" (&v->counter), "Qo" (v->counter)
1265 + );
1266 +
1267 + return result;
1268 +}
1269 +
1270 static inline void atomic64_set(atomic64_t *v, long long i)
1271 {
1272 long long tmp;
1273 @@ -268,29 +425,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1274 : "r" (&v->counter), "r" (i)
1275 : "cc");
1276 }
1277 +
1278 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1279 +{
1280 + long long tmp;
1281 +
1282 + prefetchw(&v->counter);
1283 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1284 +"1: ldrexd %0, %H0, [%2]\n"
1285 +" strexd %0, %3, %H3, [%2]\n"
1286 +" teq %0, #0\n"
1287 +" bne 1b"
1288 + : "=&r" (tmp), "=Qo" (v->counter)
1289 + : "r" (&v->counter), "r" (i)
1290 + : "cc");
1291 +}
1292 #endif
1293
1294 -#define ATOMIC64_OP(op, op1, op2) \
1295 -static inline void atomic64_##op(long long i, atomic64_t *v) \
1296 +#undef __OVERFLOW_POST_RETURN
1297 +#define __OVERFLOW_POST_RETURN \
1298 + " bvc 3f\n" \
1299 +" mov %0, %1\n" \
1300 +" mov %H0, %H1\n" \
1301 + "2: " REFCOUNT_TRAP_INSN "\n"\
1302 + "3:\n"
1303 +
1304 +#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1305 +static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1306 { \
1307 long long result; \
1308 unsigned long tmp; \
1309 \
1310 prefetchw(&v->counter); \
1311 - __asm__ __volatile__("@ atomic64_" #op "\n" \
1312 + __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1313 "1: ldrexd %0, %H0, [%3]\n" \
1314 " " #op1 " %Q0, %Q0, %Q4\n" \
1315 " " #op2 " %R0, %R0, %R4\n" \
1316 + post_op \
1317 " strexd %1, %0, %H0, [%3]\n" \
1318 " teq %1, #0\n" \
1319 -" bne 1b" \
1320 +" bne 1b\n" \
1321 + extable \
1322 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1323 : "r" (&v->counter), "r" (i) \
1324 : "cc"); \
1325 } \
1326
1327 -#define ATOMIC64_OP_RETURN(op, op1, op2) \
1328 -static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1329 +#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, , op1, op2, , ) \
1330 + __ATOMIC64_OP(op, _unchecked, op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1331 +
1332 +#define __ATOMIC64_OP_RETURN(op, op1, op2, post_op, extable) \
1333 +static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1334 { \
1335 long long result; \
1336 unsigned long tmp; \
1337 @@ -298,13 +483,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1338 smp_mb(); \
1339 prefetchw(&v->counter); \
1340 \
1341 - __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1342 + __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1343 "1: ldrexd %0, %H0, [%3]\n" \
1344 " " #op1 " %Q0, %Q0, %Q4\n" \
1345 " " #op2 " %R0, %R0, %R4\n" \
1346 + post_op \
1347 " strexd %1, %0, %H0, [%3]\n" \
1348 " teq %1, #0\n" \
1349 -" bne 1b" \
1350 +" bne 1b\n" \
1351 + extable \
1352 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1353 : "r" (&v->counter), "r" (i) \
1354 : "cc"); \
1355 @@ -314,6 +501,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1356 return result; \
1357 }
1358
1359 +#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, , op1, op2, , ) \
1360 + __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1361 +
1362 #define ATOMIC64_OPS(op, op1, op2) \
1363 ATOMIC64_OP(op, op1, op2) \
1364 ATOMIC64_OP_RETURN(op, op1, op2)
1365 @@ -323,7 +513,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1366
1367 #undef ATOMIC64_OPS
1368 #undef ATOMIC64_OP_RETURN
1369 +#undef __ATOMIC64_OP_RETURN
1370 #undef ATOMIC64_OP
1371 +#undef __ATOMIC64_OP
1372 +#undef __OVERFLOW_EXTABLE
1373 +#undef __OVERFLOW_POST_RETURN
1374 +#undef __OVERFLOW_POST
1375
1376 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1377 long long new)
1378 @@ -351,6 +546,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1379 return oldval;
1380 }
1381
1382 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1383 + long long new)
1384 +{
1385 + long long oldval;
1386 + unsigned long res;
1387 +
1388 + smp_mb();
1389 +
1390 + do {
1391 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1392 + "ldrexd %1, %H1, [%3]\n"
1393 + "mov %0, #0\n"
1394 + "teq %1, %4\n"
1395 + "teqeq %H1, %H4\n"
1396 + "strexdeq %0, %5, %H5, [%3]"
1397 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1398 + : "r" (&ptr->counter), "r" (old), "r" (new)
1399 + : "cc");
1400 + } while (res);
1401 +
1402 + smp_mb();
1403 +
1404 + return oldval;
1405 +}
1406 +
1407 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1408 {
1409 long long result;
1410 @@ -376,21 +596,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1411 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1412 {
1413 long long result;
1414 - unsigned long tmp;
1415 + u64 tmp;
1416
1417 smp_mb();
1418 prefetchw(&v->counter);
1419
1420 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1421 -"1: ldrexd %0, %H0, [%3]\n"
1422 -" subs %Q0, %Q0, #1\n"
1423 -" sbc %R0, %R0, #0\n"
1424 +"1: ldrexd %1, %H1, [%3]\n"
1425 +" subs %Q0, %Q1, #1\n"
1426 +" sbcs %R0, %R1, #0\n"
1427 +
1428 +#ifdef CONFIG_PAX_REFCOUNT
1429 +" bvc 3f\n"
1430 +" mov %Q0, %Q1\n"
1431 +" mov %R0, %R1\n"
1432 +"2: " REFCOUNT_TRAP_INSN "\n"
1433 +"3:\n"
1434 +#endif
1435 +
1436 " teq %R0, #0\n"
1437 -" bmi 2f\n"
1438 +" bmi 4f\n"
1439 " strexd %1, %0, %H0, [%3]\n"
1440 " teq %1, #0\n"
1441 " bne 1b\n"
1442 -"2:"
1443 +"4:\n"
1444 +
1445 +#ifdef CONFIG_PAX_REFCOUNT
1446 + _ASM_EXTABLE(2b, 4b)
1447 +#endif
1448 +
1449 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1450 : "r" (&v->counter)
1451 : "cc");
1452 @@ -414,13 +648,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1453 " teq %0, %5\n"
1454 " teqeq %H0, %H5\n"
1455 " moveq %1, #0\n"
1456 -" beq 2f\n"
1457 +" beq 4f\n"
1458 " adds %Q0, %Q0, %Q6\n"
1459 -" adc %R0, %R0, %R6\n"
1460 +" adcs %R0, %R0, %R6\n"
1461 +
1462 +#ifdef CONFIG_PAX_REFCOUNT
1463 +" bvc 3f\n"
1464 +"2: " REFCOUNT_TRAP_INSN "\n"
1465 +"3:\n"
1466 +#endif
1467 +
1468 " strexd %2, %0, %H0, [%4]\n"
1469 " teq %2, #0\n"
1470 " bne 1b\n"
1471 -"2:"
1472 +"4:\n"
1473 +
1474 +#ifdef CONFIG_PAX_REFCOUNT
1475 + _ASM_EXTABLE(2b, 4b)
1476 +#endif
1477 +
1478 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1479 : "r" (&v->counter), "r" (u), "r" (a)
1480 : "cc");
1481 @@ -433,10 +679,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1482
1483 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1484 #define atomic64_inc(v) atomic64_add(1LL, (v))
1485 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1486 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1487 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1488 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1489 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1490 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1491 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1492 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1493 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1494 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1495 diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1496 index c6a3e73..35cca85 100644
1497 --- a/arch/arm/include/asm/barrier.h
1498 +++ b/arch/arm/include/asm/barrier.h
1499 @@ -63,7 +63,7 @@
1500 do { \
1501 compiletime_assert_atomic_type(*p); \
1502 smp_mb(); \
1503 - ACCESS_ONCE(*p) = (v); \
1504 + ACCESS_ONCE_RW(*p) = (v); \
1505 } while (0)
1506
1507 #define smp_load_acquire(p) \
1508 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1509 index 75fe66b..ba3dee4 100644
1510 --- a/arch/arm/include/asm/cache.h
1511 +++ b/arch/arm/include/asm/cache.h
1512 @@ -4,8 +4,10 @@
1513 #ifndef __ASMARM_CACHE_H
1514 #define __ASMARM_CACHE_H
1515
1516 +#include <linux/const.h>
1517 +
1518 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1519 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1520 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1521
1522 /*
1523 * Memory returned by kmalloc() may be used for DMA, so we must make
1524 @@ -24,5 +26,6 @@
1525 #endif
1526
1527 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1528 +#define __read_only __attribute__ ((__section__(".data..read_only")))
1529
1530 #endif
1531 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1532 index 10e78d0..dc8505d 100644
1533 --- a/arch/arm/include/asm/cacheflush.h
1534 +++ b/arch/arm/include/asm/cacheflush.h
1535 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
1536 void (*dma_unmap_area)(const void *, size_t, int);
1537
1538 void (*dma_flush_range)(const void *, const void *);
1539 -};
1540 +} __no_const;
1541
1542 /*
1543 * Select the calling method
1544 diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1545 index 5233151..87a71fa 100644
1546 --- a/arch/arm/include/asm/checksum.h
1547 +++ b/arch/arm/include/asm/checksum.h
1548 @@ -37,7 +37,19 @@ __wsum
1549 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1550
1551 __wsum
1552 -csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1553 +__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1554 +
1555 +static inline __wsum
1556 +csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1557 +{
1558 + __wsum ret;
1559 + pax_open_userland();
1560 + ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1561 + pax_close_userland();
1562 + return ret;
1563 +}
1564 +
1565 +
1566
1567 /*
1568 * Fold a partial checksum without adding pseudo headers
1569 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1570 index abb2c37..96db950 100644
1571 --- a/arch/arm/include/asm/cmpxchg.h
1572 +++ b/arch/arm/include/asm/cmpxchg.h
1573 @@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1574
1575 #define xchg(ptr,x) \
1576 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1577 +#define xchg_unchecked(ptr,x) \
1578 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1579
1580 #include <asm-generic/cmpxchg-local.h>
1581
1582 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1583 index 6ddbe44..b5e38b1 100644
1584 --- a/arch/arm/include/asm/domain.h
1585 +++ b/arch/arm/include/asm/domain.h
1586 @@ -48,18 +48,37 @@
1587 * Domain types
1588 */
1589 #define DOMAIN_NOACCESS 0
1590 -#define DOMAIN_CLIENT 1
1591 #ifdef CONFIG_CPU_USE_DOMAINS
1592 +#define DOMAIN_USERCLIENT 1
1593 +#define DOMAIN_KERNELCLIENT 1
1594 #define DOMAIN_MANAGER 3
1595 +#define DOMAIN_VECTORS DOMAIN_USER
1596 #else
1597 +
1598 +#ifdef CONFIG_PAX_KERNEXEC
1599 #define DOMAIN_MANAGER 1
1600 +#define DOMAIN_KERNEXEC 3
1601 +#else
1602 +#define DOMAIN_MANAGER 1
1603 +#endif
1604 +
1605 +#ifdef CONFIG_PAX_MEMORY_UDEREF
1606 +#define DOMAIN_USERCLIENT 0
1607 +#define DOMAIN_UDEREF 1
1608 +#define DOMAIN_VECTORS DOMAIN_KERNEL
1609 +#else
1610 +#define DOMAIN_USERCLIENT 1
1611 +#define DOMAIN_VECTORS DOMAIN_USER
1612 +#endif
1613 +#define DOMAIN_KERNELCLIENT 1
1614 +
1615 #endif
1616
1617 #define domain_val(dom,type) ((type) << (2*(dom)))
1618
1619 #ifndef __ASSEMBLY__
1620
1621 -#ifdef CONFIG_CPU_USE_DOMAINS
1622 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1623 static inline void set_domain(unsigned val)
1624 {
1625 asm volatile(
1626 @@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1627 isb();
1628 }
1629
1630 -#define modify_domain(dom,type) \
1631 - do { \
1632 - struct thread_info *thread = current_thread_info(); \
1633 - unsigned int domain = thread->cpu_domain; \
1634 - domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1635 - thread->cpu_domain = domain | domain_val(dom, type); \
1636 - set_domain(thread->cpu_domain); \
1637 - } while (0)
1638 -
1639 +extern void modify_domain(unsigned int dom, unsigned int type);
1640 #else
1641 static inline void set_domain(unsigned val) { }
1642 static inline void modify_domain(unsigned dom, unsigned type) { }
1643 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1644 index afb9caf..9a0bac0 100644
1645 --- a/arch/arm/include/asm/elf.h
1646 +++ b/arch/arm/include/asm/elf.h
1647 @@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1648 the loader. We need to make sure that it is out of the way of the program
1649 that it will "exec", and that there is sufficient room for the brk. */
1650
1651 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1652 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1653 +
1654 +#ifdef CONFIG_PAX_ASLR
1655 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1656 +
1657 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1658 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1659 +#endif
1660
1661 /* When the program starts, a1 contains a pointer to a function to be
1662 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1663 @@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1664 extern void elf_set_personality(const struct elf32_hdr *);
1665 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1666
1667 -struct mm_struct;
1668 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1669 -#define arch_randomize_brk arch_randomize_brk
1670 -
1671 #ifdef CONFIG_MMU
1672 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1673 struct linux_binprm;
1674 diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1675 index de53547..52b9a28 100644
1676 --- a/arch/arm/include/asm/fncpy.h
1677 +++ b/arch/arm/include/asm/fncpy.h
1678 @@ -81,7 +81,9 @@
1679 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1680 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1681 \
1682 + pax_open_kernel(); \
1683 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1684 + pax_close_kernel(); \
1685 flush_icache_range((unsigned long)(dest_buf), \
1686 (unsigned long)(dest_buf) + (size)); \
1687 \
1688 diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1689 index 53e69da..3fdc896 100644
1690 --- a/arch/arm/include/asm/futex.h
1691 +++ b/arch/arm/include/asm/futex.h
1692 @@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1693 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1694 return -EFAULT;
1695
1696 + pax_open_userland();
1697 +
1698 smp_mb();
1699 /* Prefetching cannot fault */
1700 prefetchw(uaddr);
1701 @@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1702 : "cc", "memory");
1703 smp_mb();
1704
1705 + pax_close_userland();
1706 +
1707 *uval = val;
1708 return ret;
1709 }
1710 @@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1711 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1712 return -EFAULT;
1713
1714 + pax_open_userland();
1715 +
1716 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1717 "1: " TUSER(ldr) " %1, [%4]\n"
1718 " teq %1, %2\n"
1719 @@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1720 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1721 : "cc", "memory");
1722
1723 + pax_close_userland();
1724 +
1725 *uval = val;
1726 return ret;
1727 }
1728 @@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1729 return -EFAULT;
1730
1731 pagefault_disable(); /* implies preempt_disable() */
1732 + pax_open_userland();
1733
1734 switch (op) {
1735 case FUTEX_OP_SET:
1736 @@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1737 ret = -ENOSYS;
1738 }
1739
1740 + pax_close_userland();
1741 pagefault_enable(); /* subsumes preempt_enable() */
1742
1743 if (!ret) {
1744 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1745 index 83eb2f7..ed77159 100644
1746 --- a/arch/arm/include/asm/kmap_types.h
1747 +++ b/arch/arm/include/asm/kmap_types.h
1748 @@ -4,6 +4,6 @@
1749 /*
1750 * This is the "bare minimum". AIO seems to require this.
1751 */
1752 -#define KM_TYPE_NR 16
1753 +#define KM_TYPE_NR 17
1754
1755 #endif
1756 diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1757 index 9e614a1..3302cca 100644
1758 --- a/arch/arm/include/asm/mach/dma.h
1759 +++ b/arch/arm/include/asm/mach/dma.h
1760 @@ -22,7 +22,7 @@ struct dma_ops {
1761 int (*residue)(unsigned int, dma_t *); /* optional */
1762 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1763 const char *type;
1764 -};
1765 +} __do_const;
1766
1767 struct dma_struct {
1768 void *addr; /* single DMA address */
1769 diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1770 index f98c7f3..e5c626d 100644
1771 --- a/arch/arm/include/asm/mach/map.h
1772 +++ b/arch/arm/include/asm/mach/map.h
1773 @@ -23,17 +23,19 @@ struct map_desc {
1774
1775 /* types 0-3 are defined in asm/io.h */
1776 enum {
1777 - MT_UNCACHED = 4,
1778 - MT_CACHECLEAN,
1779 - MT_MINICLEAN,
1780 + MT_UNCACHED_RW = 4,
1781 + MT_CACHECLEAN_RO,
1782 + MT_MINICLEAN_RO,
1783 MT_LOW_VECTORS,
1784 MT_HIGH_VECTORS,
1785 - MT_MEMORY_RWX,
1786 + __MT_MEMORY_RWX,
1787 MT_MEMORY_RW,
1788 - MT_ROM,
1789 - MT_MEMORY_RWX_NONCACHED,
1790 + MT_MEMORY_RX,
1791 + MT_ROM_RX,
1792 + MT_MEMORY_RW_NONCACHED,
1793 + MT_MEMORY_RX_NONCACHED,
1794 MT_MEMORY_RW_DTCM,
1795 - MT_MEMORY_RWX_ITCM,
1796 + MT_MEMORY_RX_ITCM,
1797 MT_MEMORY_RW_SO,
1798 MT_MEMORY_DMA_READY,
1799 };
1800 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1801 index 891a56b..48f337e 100644
1802 --- a/arch/arm/include/asm/outercache.h
1803 +++ b/arch/arm/include/asm/outercache.h
1804 @@ -36,7 +36,7 @@ struct outer_cache_fns {
1805
1806 /* This is an ARM L2C thing */
1807 void (*write_sec)(unsigned long, unsigned);
1808 -};
1809 +} __no_const;
1810
1811 extern struct outer_cache_fns outer_cache;
1812
1813 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1814 index 4355f0e..cd9168e 100644
1815 --- a/arch/arm/include/asm/page.h
1816 +++ b/arch/arm/include/asm/page.h
1817 @@ -23,6 +23,7 @@
1818
1819 #else
1820
1821 +#include <linux/compiler.h>
1822 #include <asm/glue.h>
1823
1824 /*
1825 @@ -114,7 +115,7 @@ struct cpu_user_fns {
1826 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1827 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1828 unsigned long vaddr, struct vm_area_struct *vma);
1829 -};
1830 +} __no_const;
1831
1832 #ifdef MULTI_USER
1833 extern struct cpu_user_fns cpu_user;
1834 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1835 index 78a7793..e3dc06c 100644
1836 --- a/arch/arm/include/asm/pgalloc.h
1837 +++ b/arch/arm/include/asm/pgalloc.h
1838 @@ -17,6 +17,7 @@
1839 #include <asm/processor.h>
1840 #include <asm/cacheflush.h>
1841 #include <asm/tlbflush.h>
1842 +#include <asm/system_info.h>
1843
1844 #define check_pgt_cache() do { } while (0)
1845
1846 @@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1847 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1848 }
1849
1850 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1851 +{
1852 + pud_populate(mm, pud, pmd);
1853 +}
1854 +
1855 #else /* !CONFIG_ARM_LPAE */
1856
1857 /*
1858 @@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1859 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1860 #define pmd_free(mm, pmd) do { } while (0)
1861 #define pud_populate(mm,pmd,pte) BUG()
1862 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1863
1864 #endif /* CONFIG_ARM_LPAE */
1865
1866 @@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1867 __free_page(pte);
1868 }
1869
1870 +static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1871 +{
1872 +#ifdef CONFIG_ARM_LPAE
1873 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1874 +#else
1875 + if (addr & SECTION_SIZE)
1876 + pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1877 + else
1878 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1879 +#endif
1880 + flush_pmd_entry(pmdp);
1881 +}
1882 +
1883 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1884 pmdval_t prot)
1885 {
1886 @@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1887 static inline void
1888 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1889 {
1890 - __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1891 + __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1892 }
1893 #define pmd_pgtable(pmd) pmd_page(pmd)
1894
1895 diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1896 index 5cfba15..f415e1a 100644
1897 --- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1898 +++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1899 @@ -20,12 +20,15 @@
1900 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1901 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1902 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1903 +#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1904 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1905 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1906 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1907 +
1908 /*
1909 * - section
1910 */
1911 +#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1912 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1913 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1914 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1915 @@ -37,6 +40,7 @@
1916 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1917 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1918 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1919 +#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1920
1921 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1922 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1923 @@ -66,6 +70,7 @@
1924 * - extended small page/tiny page
1925 */
1926 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1927 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1928 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1929 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1930 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1931 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1932 index f027941..f36ce30 100644
1933 --- a/arch/arm/include/asm/pgtable-2level.h
1934 +++ b/arch/arm/include/asm/pgtable-2level.h
1935 @@ -126,6 +126,9 @@
1936 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1937 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1938
1939 +/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1940 +#define L_PTE_PXN (_AT(pteval_t, 0))
1941 +
1942 /*
1943 * These are the memory types, defined to be compatible with
1944 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1945 diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1946 index 9fd61c7..f8f1cff 100644
1947 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1948 +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1949 @@ -76,6 +76,7 @@
1950 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1951 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1952 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1953 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1954 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1955
1956 /*
1957 diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1958 index a31ecdad..95e98d4 100644
1959 --- a/arch/arm/include/asm/pgtable-3level.h
1960 +++ b/arch/arm/include/asm/pgtable-3level.h
1961 @@ -81,6 +81,7 @@
1962 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1963 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1964 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1965 +#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1966 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1967 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
1968 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
1969 @@ -92,10 +93,12 @@
1970 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
1971 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
1972 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
1973 +#define PMD_SECT_RDONLY PMD_SECT_AP2
1974
1975 /*
1976 * To be used in assembly code with the upper page attributes.
1977 */
1978 +#define L_PTE_PXN_HIGH (1 << (53 - 32))
1979 #define L_PTE_XN_HIGH (1 << (54 - 32))
1980 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1981
1982 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1983 index 3b30062..01a5f9d 100644
1984 --- a/arch/arm/include/asm/pgtable.h
1985 +++ b/arch/arm/include/asm/pgtable.h
1986 @@ -33,6 +33,9 @@
1987 #include <asm/pgtable-2level.h>
1988 #endif
1989
1990 +#define ktla_ktva(addr) (addr)
1991 +#define ktva_ktla(addr) (addr)
1992 +
1993 /*
1994 * Just any arbitrary offset to the start of the vmalloc VM area: the
1995 * current 8MB value just means that there will be a 8MB "hole" after the
1996 @@ -48,6 +51,9 @@
1997 #define LIBRARY_TEXT_START 0x0c000000
1998
1999 #ifndef __ASSEMBLY__
2000 +extern pteval_t __supported_pte_mask;
2001 +extern pmdval_t __supported_pmd_mask;
2002 +
2003 extern void __pte_error(const char *file, int line, pte_t);
2004 extern void __pmd_error(const char *file, int line, pmd_t);
2005 extern void __pgd_error(const char *file, int line, pgd_t);
2006 @@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2007 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2008 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2009
2010 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
2011 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2012 +
2013 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2014 +#include <asm/domain.h>
2015 +#include <linux/thread_info.h>
2016 +#include <linux/preempt.h>
2017 +
2018 +static inline int test_domain(int domain, int domaintype)
2019 +{
2020 + return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2021 +}
2022 +#endif
2023 +
2024 +#ifdef CONFIG_PAX_KERNEXEC
2025 +static inline unsigned long pax_open_kernel(void) {
2026 +#ifdef CONFIG_ARM_LPAE
2027 + /* TODO */
2028 +#else
2029 + preempt_disable();
2030 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2031 + modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2032 +#endif
2033 + return 0;
2034 +}
2035 +
2036 +static inline unsigned long pax_close_kernel(void) {
2037 +#ifdef CONFIG_ARM_LPAE
2038 + /* TODO */
2039 +#else
2040 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2041 + /* DOMAIN_MANAGER = "client" under KERNEXEC */
2042 + modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2043 + preempt_enable_no_resched();
2044 +#endif
2045 + return 0;
2046 +}
2047 +#else
2048 +static inline unsigned long pax_open_kernel(void) { return 0; }
2049 +static inline unsigned long pax_close_kernel(void) { return 0; }
2050 +#endif
2051 +
2052 /*
2053 * This is the lowest virtual address we can permit any user space
2054 * mapping to be mapped at. This is particularly important for
2055 @@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2056 /*
2057 * The pgprot_* and protection_map entries will be fixed up in runtime
2058 * to include the cachable and bufferable bits based on memory policy,
2059 - * as well as any architecture dependent bits like global/ASID and SMP
2060 - * shared mapping bits.
2061 + * as well as any architecture dependent bits like global/ASID, PXN,
2062 + * and SMP shared mapping bits.
2063 */
2064 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2065
2066 @@ -267,7 +315,7 @@ PTE_BIT_FUNC(mknexec, |= L_PTE_XN);
2067 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2068 {
2069 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2070 - L_PTE_NONE | L_PTE_VALID;
2071 + L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2072 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2073 return pte;
2074 }
2075 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2076 index c25ef3e..735f14b 100644
2077 --- a/arch/arm/include/asm/psci.h
2078 +++ b/arch/arm/include/asm/psci.h
2079 @@ -32,7 +32,7 @@ struct psci_operations {
2080 int (*affinity_info)(unsigned long target_affinity,
2081 unsigned long lowest_affinity_level);
2082 int (*migrate_info_type)(void);
2083 -};
2084 +} __no_const;
2085
2086 extern struct psci_operations psci_ops;
2087 extern struct smp_operations psci_smp_ops;
2088 diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2089 index 18f5a55..5072a40 100644
2090 --- a/arch/arm/include/asm/smp.h
2091 +++ b/arch/arm/include/asm/smp.h
2092 @@ -107,7 +107,7 @@ struct smp_operations {
2093 int (*cpu_disable)(unsigned int cpu);
2094 #endif
2095 #endif
2096 -};
2097 +} __no_const;
2098
2099 struct of_cpu_method {
2100 const char *method;
2101 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2102 index ce73ab6..7310f8a 100644
2103 --- a/arch/arm/include/asm/thread_info.h
2104 +++ b/arch/arm/include/asm/thread_info.h
2105 @@ -78,9 +78,9 @@ struct thread_info {
2106 .flags = 0, \
2107 .preempt_count = INIT_PREEMPT_COUNT, \
2108 .addr_limit = KERNEL_DS, \
2109 - .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2110 - domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2111 - domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2112 + .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2113 + domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2114 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2115 .restart_block = { \
2116 .fn = do_no_restart_syscall, \
2117 }, \
2118 @@ -154,7 +154,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2119 #define TIF_SYSCALL_AUDIT 9
2120 #define TIF_SYSCALL_TRACEPOINT 10
2121 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2122 -#define TIF_NOHZ 12 /* in adaptive nohz mode */
2123 +/* within 8 bits of TIF_SYSCALL_TRACE
2124 + * to meet flexible second operand requirements
2125 + */
2126 +#define TIF_GRSEC_SETXID 12
2127 +#define TIF_NOHZ 13 /* in adaptive nohz mode */
2128 #define TIF_USING_IWMMXT 17
2129 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2130 #define TIF_RESTORE_SIGMASK 20
2131 @@ -168,10 +172,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2132 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2133 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2134 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2135 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2136
2137 /* Checks for any syscall work in entry-common.S */
2138 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2139 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2140 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2141
2142 /*
2143 * Change these and you break ASM code in entry-common.S
2144 diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2145 index 5f833f7..76e6644 100644
2146 --- a/arch/arm/include/asm/tls.h
2147 +++ b/arch/arm/include/asm/tls.h
2148 @@ -3,6 +3,7 @@
2149
2150 #include <linux/compiler.h>
2151 #include <asm/thread_info.h>
2152 +#include <asm/pgtable.h>
2153
2154 #ifdef __ASSEMBLY__
2155 #include <asm/asm-offsets.h>
2156 @@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2157 * at 0xffff0fe0 must be used instead. (see
2158 * entry-armv.S for details)
2159 */
2160 + pax_open_kernel();
2161 *((unsigned int *)0xffff0ff0) = val;
2162 + pax_close_kernel();
2163 #endif
2164 }
2165
2166 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2167 index 4767eb9..bf00668 100644
2168 --- a/arch/arm/include/asm/uaccess.h
2169 +++ b/arch/arm/include/asm/uaccess.h
2170 @@ -18,6 +18,7 @@
2171 #include <asm/domain.h>
2172 #include <asm/unified.h>
2173 #include <asm/compiler.h>
2174 +#include <asm/pgtable.h>
2175
2176 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2177 #include <asm-generic/uaccess-unaligned.h>
2178 @@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2179 static inline void set_fs(mm_segment_t fs)
2180 {
2181 current_thread_info()->addr_limit = fs;
2182 - modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2183 + modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2184 }
2185
2186 #define segment_eq(a,b) ((a) == (b))
2187
2188 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
2189 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2190 +
2191 +static inline void pax_open_userland(void)
2192 +{
2193 +
2194 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2195 + if (segment_eq(get_fs(), USER_DS)) {
2196 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2197 + modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2198 + }
2199 +#endif
2200 +
2201 +}
2202 +
2203 +static inline void pax_close_userland(void)
2204 +{
2205 +
2206 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2207 + if (segment_eq(get_fs(), USER_DS)) {
2208 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2209 + modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2210 + }
2211 +#endif
2212 +
2213 +}
2214 +
2215 #define __addr_ok(addr) ({ \
2216 unsigned long flag; \
2217 __asm__("cmp %2, %0; movlo %0, #0" \
2218 @@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2219
2220 #define get_user(x,p) \
2221 ({ \
2222 + int __e; \
2223 might_fault(); \
2224 - __get_user_check(x,p); \
2225 + pax_open_userland(); \
2226 + __e = __get_user_check(x,p); \
2227 + pax_close_userland(); \
2228 + __e; \
2229 })
2230
2231 extern int __put_user_1(void *, unsigned int);
2232 @@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2233
2234 #define put_user(x,p) \
2235 ({ \
2236 + int __e; \
2237 might_fault(); \
2238 - __put_user_check(x,p); \
2239 + pax_open_userland(); \
2240 + __e = __put_user_check(x,p); \
2241 + pax_close_userland(); \
2242 + __e; \
2243 })
2244
2245 #else /* CONFIG_MMU */
2246 @@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2247
2248 #endif /* CONFIG_MMU */
2249
2250 +#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2251 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2252
2253 #define user_addr_max() \
2254 @@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2255 #define __get_user(x,ptr) \
2256 ({ \
2257 long __gu_err = 0; \
2258 + pax_open_userland(); \
2259 __get_user_err((x),(ptr),__gu_err); \
2260 + pax_close_userland(); \
2261 __gu_err; \
2262 })
2263
2264 #define __get_user_error(x,ptr,err) \
2265 ({ \
2266 + pax_open_userland(); \
2267 __get_user_err((x),(ptr),err); \
2268 + pax_close_userland(); \
2269 (void) 0; \
2270 })
2271
2272 @@ -368,13 +409,17 @@ do { \
2273 #define __put_user(x,ptr) \
2274 ({ \
2275 long __pu_err = 0; \
2276 + pax_open_userland(); \
2277 __put_user_err((x),(ptr),__pu_err); \
2278 + pax_close_userland(); \
2279 __pu_err; \
2280 })
2281
2282 #define __put_user_error(x,ptr,err) \
2283 ({ \
2284 + pax_open_userland(); \
2285 __put_user_err((x),(ptr),err); \
2286 + pax_close_userland(); \
2287 (void) 0; \
2288 })
2289
2290 @@ -474,11 +519,44 @@ do { \
2291
2292
2293 #ifdef CONFIG_MMU
2294 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2295 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2296 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2297 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2298 +
2299 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2300 +{
2301 + unsigned long ret;
2302 +
2303 + check_object_size(to, n, false);
2304 + pax_open_userland();
2305 + ret = ___copy_from_user(to, from, n);
2306 + pax_close_userland();
2307 + return ret;
2308 +}
2309 +
2310 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2311 +{
2312 + unsigned long ret;
2313 +
2314 + check_object_size(from, n, true);
2315 + pax_open_userland();
2316 + ret = ___copy_to_user(to, from, n);
2317 + pax_close_userland();
2318 + return ret;
2319 +}
2320 +
2321 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2322 -extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2323 +extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2324 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2325 +
2326 +static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2327 +{
2328 + unsigned long ret;
2329 + pax_open_userland();
2330 + ret = ___clear_user(addr, n);
2331 + pax_close_userland();
2332 + return ret;
2333 +}
2334 +
2335 #else
2336 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2337 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2338 @@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2339
2340 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2341 {
2342 + if ((long)n < 0)
2343 + return n;
2344 +
2345 if (access_ok(VERIFY_READ, from, n))
2346 n = __copy_from_user(to, from, n);
2347 else /* security hole - plug it */
2348 @@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2349
2350 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2351 {
2352 + if ((long)n < 0)
2353 + return n;
2354 +
2355 if (access_ok(VERIFY_WRITE, to, n))
2356 n = __copy_to_user(to, from, n);
2357 return n;
2358 diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2359 index 5af0ed1..cea83883 100644
2360 --- a/arch/arm/include/uapi/asm/ptrace.h
2361 +++ b/arch/arm/include/uapi/asm/ptrace.h
2362 @@ -92,7 +92,7 @@
2363 * ARMv7 groups of PSR bits
2364 */
2365 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2366 -#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2367 +#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2368 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2369 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2370
2371 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2372 index a88671c..1cc895e 100644
2373 --- a/arch/arm/kernel/armksyms.c
2374 +++ b/arch/arm/kernel/armksyms.c
2375 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2376
2377 /* networking */
2378 EXPORT_SYMBOL(csum_partial);
2379 -EXPORT_SYMBOL(csum_partial_copy_from_user);
2380 +EXPORT_SYMBOL(__csum_partial_copy_from_user);
2381 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2382 EXPORT_SYMBOL(__csum_ipv6_magic);
2383
2384 @@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2385 #ifdef CONFIG_MMU
2386 EXPORT_SYMBOL(copy_page);
2387
2388 -EXPORT_SYMBOL(__copy_from_user);
2389 -EXPORT_SYMBOL(__copy_to_user);
2390 -EXPORT_SYMBOL(__clear_user);
2391 +EXPORT_SYMBOL(___copy_from_user);
2392 +EXPORT_SYMBOL(___copy_to_user);
2393 +EXPORT_SYMBOL(___clear_user);
2394
2395 EXPORT_SYMBOL(__get_user_1);
2396 EXPORT_SYMBOL(__get_user_2);
2397 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2398 index 2f5555d..d493c91 100644
2399 --- a/arch/arm/kernel/entry-armv.S
2400 +++ b/arch/arm/kernel/entry-armv.S
2401 @@ -47,6 +47,87 @@
2402 9997:
2403 .endm
2404
2405 + .macro pax_enter_kernel
2406 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2407 + @ make aligned space for saved DACR
2408 + sub sp, sp, #8
2409 + @ save regs
2410 + stmdb sp!, {r1, r2}
2411 + @ read DACR from cpu_domain into r1
2412 + mov r2, sp
2413 + @ assume 8K pages, since we have to split the immediate in two
2414 + bic r2, r2, #(0x1fc0)
2415 + bic r2, r2, #(0x3f)
2416 + ldr r1, [r2, #TI_CPU_DOMAIN]
2417 + @ store old DACR on stack
2418 + str r1, [sp, #8]
2419 +#ifdef CONFIG_PAX_KERNEXEC
2420 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2421 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2422 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2423 +#endif
2424 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2425 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2426 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2427 +#endif
2428 + @ write r1 to current_thread_info()->cpu_domain
2429 + str r1, [r2, #TI_CPU_DOMAIN]
2430 + @ write r1 to DACR
2431 + mcr p15, 0, r1, c3, c0, 0
2432 + @ instruction sync
2433 + instr_sync
2434 + @ restore regs
2435 + ldmia sp!, {r1, r2}
2436 +#endif
2437 + .endm
2438 +
2439 + .macro pax_open_userland
2440 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2441 + @ save regs
2442 + stmdb sp!, {r0, r1}
2443 + @ read DACR from cpu_domain into r1
2444 + mov r0, sp
2445 + @ assume 8K pages, since we have to split the immediate in two
2446 + bic r0, r0, #(0x1fc0)
2447 + bic r0, r0, #(0x3f)
2448 + ldr r1, [r0, #TI_CPU_DOMAIN]
2449 + @ set current DOMAIN_USER to DOMAIN_CLIENT
2450 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2451 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2452 + @ write r1 to current_thread_info()->cpu_domain
2453 + str r1, [r0, #TI_CPU_DOMAIN]
2454 + @ write r1 to DACR
2455 + mcr p15, 0, r1, c3, c0, 0
2456 + @ instruction sync
2457 + instr_sync
2458 + @ restore regs
2459 + ldmia sp!, {r0, r1}
2460 +#endif
2461 + .endm
2462 +
2463 + .macro pax_close_userland
2464 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2465 + @ save regs
2466 + stmdb sp!, {r0, r1}
2467 + @ read DACR from cpu_domain into r1
2468 + mov r0, sp
2469 + @ assume 8K pages, since we have to split the immediate in two
2470 + bic r0, r0, #(0x1fc0)
2471 + bic r0, r0, #(0x3f)
2472 + ldr r1, [r0, #TI_CPU_DOMAIN]
2473 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2474 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2475 + @ write r1 to current_thread_info()->cpu_domain
2476 + str r1, [r0, #TI_CPU_DOMAIN]
2477 + @ write r1 to DACR
2478 + mcr p15, 0, r1, c3, c0, 0
2479 + @ instruction sync
2480 + instr_sync
2481 + @ restore regs
2482 + ldmia sp!, {r0, r1}
2483 +#endif
2484 + .endm
2485 +
2486 .macro pabt_helper
2487 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2488 #ifdef MULTI_PABORT
2489 @@ -89,11 +170,15 @@
2490 * Invalid mode handlers
2491 */
2492 .macro inv_entry, reason
2493 +
2494 + pax_enter_kernel
2495 +
2496 sub sp, sp, #S_FRAME_SIZE
2497 ARM( stmib sp, {r1 - lr} )
2498 THUMB( stmia sp, {r0 - r12} )
2499 THUMB( str sp, [sp, #S_SP] )
2500 THUMB( str lr, [sp, #S_LR] )
2501 +
2502 mov r1, #\reason
2503 .endm
2504
2505 @@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2506 .macro svc_entry, stack_hole=0, trace=1
2507 UNWIND(.fnstart )
2508 UNWIND(.save {r0 - pc} )
2509 +
2510 + pax_enter_kernel
2511 +
2512 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2513 +
2514 #ifdef CONFIG_THUMB2_KERNEL
2515 SPFIX( str r0, [sp] ) @ temporarily saved
2516 SPFIX( mov r0, sp )
2517 @@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2518 ldmia r0, {r3 - r5}
2519 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2520 mov r6, #-1 @ "" "" "" ""
2521 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2522 + @ offset sp by 8 as done in pax_enter_kernel
2523 + add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2524 +#else
2525 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2526 +#endif
2527 SPFIX( addeq r2, r2, #4 )
2528 str r3, [sp, #-4]! @ save the "real" r0 copied
2529 @ from the exception stack
2530 @@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
2531 .macro usr_entry, trace=1
2532 UNWIND(.fnstart )
2533 UNWIND(.cantunwind ) @ don't unwind the user space
2534 +
2535 + pax_enter_kernel_user
2536 +
2537 sub sp, sp, #S_FRAME_SIZE
2538 ARM( stmib sp, {r1 - r12} )
2539 THUMB( stmia sp, {r0 - r12} )
2540 @@ -478,7 +575,9 @@ __und_usr:
2541 tst r3, #PSR_T_BIT @ Thumb mode?
2542 bne __und_usr_thumb
2543 sub r4, r2, #4 @ ARM instr at LR - 4
2544 + pax_open_userland
2545 1: ldrt r0, [r4]
2546 + pax_close_userland
2547 ARM_BE8(rev r0, r0) @ little endian instruction
2548
2549 @ r0 = 32-bit ARM instruction which caused the exception
2550 @@ -512,11 +611,15 @@ __und_usr_thumb:
2551 */
2552 .arch armv6t2
2553 #endif
2554 + pax_open_userland
2555 2: ldrht r5, [r4]
2556 + pax_close_userland
2557 ARM_BE8(rev16 r5, r5) @ little endian instruction
2558 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2559 blo __und_usr_fault_16 @ 16bit undefined instruction
2560 + pax_open_userland
2561 3: ldrht r0, [r2]
2562 + pax_close_userland
2563 ARM_BE8(rev16 r0, r0) @ little endian instruction
2564 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2565 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2566 @@ -546,7 +649,8 @@ ENDPROC(__und_usr)
2567 */
2568 .pushsection .fixup, "ax"
2569 .align 2
2570 -4: str r4, [sp, #S_PC] @ retry current instruction
2571 +4: pax_close_userland
2572 + str r4, [sp, #S_PC] @ retry current instruction
2573 ret r9
2574 .popsection
2575 .pushsection __ex_table,"a"
2576 @@ -766,7 +870,7 @@ ENTRY(__switch_to)
2577 THUMB( str lr, [ip], #4 )
2578 ldr r4, [r2, #TI_TP_VALUE]
2579 ldr r5, [r2, #TI_TP_VALUE + 4]
2580 -#ifdef CONFIG_CPU_USE_DOMAINS
2581 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2582 ldr r6, [r2, #TI_CPU_DOMAIN]
2583 #endif
2584 switch_tls r1, r4, r5, r3, r7
2585 @@ -775,7 +879,7 @@ ENTRY(__switch_to)
2586 ldr r8, =__stack_chk_guard
2587 ldr r7, [r7, #TSK_STACK_CANARY]
2588 #endif
2589 -#ifdef CONFIG_CPU_USE_DOMAINS
2590 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2591 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2592 #endif
2593 mov r5, r0
2594 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2595 index 6bb09d4..113e875 100644
2596 --- a/arch/arm/kernel/entry-common.S
2597 +++ b/arch/arm/kernel/entry-common.S
2598 @@ -11,18 +11,46 @@
2599 #include <asm/assembler.h>
2600 #include <asm/unistd.h>
2601 #include <asm/ftrace.h>
2602 +#include <asm/domain.h>
2603 #include <asm/unwind.h>
2604
2605 +#include "entry-header.S"
2606 +
2607 #ifdef CONFIG_NEED_RET_TO_USER
2608 #include <mach/entry-macro.S>
2609 #else
2610 .macro arch_ret_to_user, tmp1, tmp2
2611 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2612 + @ save regs
2613 + stmdb sp!, {r1, r2}
2614 + @ read DACR from cpu_domain into r1
2615 + mov r2, sp
2616 + @ assume 8K pages, since we have to split the immediate in two
2617 + bic r2, r2, #(0x1fc0)
2618 + bic r2, r2, #(0x3f)
2619 + ldr r1, [r2, #TI_CPU_DOMAIN]
2620 +#ifdef CONFIG_PAX_KERNEXEC
2621 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2622 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2623 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2624 +#endif
2625 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2626 + @ set current DOMAIN_USER to DOMAIN_UDEREF
2627 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2628 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2629 +#endif
2630 + @ write r1 to current_thread_info()->cpu_domain
2631 + str r1, [r2, #TI_CPU_DOMAIN]
2632 + @ write r1 to DACR
2633 + mcr p15, 0, r1, c3, c0, 0
2634 + @ instruction sync
2635 + instr_sync
2636 + @ restore regs
2637 + ldmia sp!, {r1, r2}
2638 +#endif
2639 .endm
2640 #endif
2641
2642 -#include "entry-header.S"
2643 -
2644 -
2645 .align 5
2646 /*
2647 * This is the fast syscall return path. We do as little as
2648 @@ -406,6 +434,12 @@ ENTRY(vector_swi)
2649 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2650 #endif
2651
2652 + /*
2653 + * do this here to avoid a performance hit of wrapping the code above
2654 + * that directly dereferences userland to parse the SWI instruction
2655 + */
2656 + pax_enter_kernel_user
2657 +
2658 adr tbl, sys_call_table @ load syscall table pointer
2659
2660 #if defined(CONFIG_OABI_COMPAT)
2661 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2662 index 4176df7..a901f8d 100644
2663 --- a/arch/arm/kernel/entry-header.S
2664 +++ b/arch/arm/kernel/entry-header.S
2665 @@ -196,6 +196,60 @@
2666 msr cpsr_c, \rtemp @ switch back to the SVC mode
2667 .endm
2668
2669 + .macro pax_enter_kernel_user
2670 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2671 + @ save regs
2672 + stmdb sp!, {r0, r1}
2673 + @ read DACR from cpu_domain into r1
2674 + mov r0, sp
2675 + @ assume 8K pages, since we have to split the immediate in two
2676 + bic r0, r0, #(0x1fc0)
2677 + bic r0, r0, #(0x3f)
2678 + ldr r1, [r0, #TI_CPU_DOMAIN]
2679 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2680 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2681 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2682 +#endif
2683 +#ifdef CONFIG_PAX_KERNEXEC
2684 + @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2685 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2686 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2687 +#endif
2688 + @ write r1 to current_thread_info()->cpu_domain
2689 + str r1, [r0, #TI_CPU_DOMAIN]
2690 + @ write r1 to DACR
2691 + mcr p15, 0, r1, c3, c0, 0
2692 + @ instruction sync
2693 + instr_sync
2694 + @ restore regs
2695 + ldmia sp!, {r0, r1}
2696 +#endif
2697 + .endm
2698 +
2699 + .macro pax_exit_kernel
2700 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2701 + @ save regs
2702 + stmdb sp!, {r0, r1}
2703 + @ read old DACR from stack into r1
2704 + ldr r1, [sp, #(8 + S_SP)]
2705 + sub r1, r1, #8
2706 + ldr r1, [r1]
2707 +
2708 + @ write r1 to current_thread_info()->cpu_domain
2709 + mov r0, sp
2710 + @ assume 8K pages, since we have to split the immediate in two
2711 + bic r0, r0, #(0x1fc0)
2712 + bic r0, r0, #(0x3f)
2713 + str r1, [r0, #TI_CPU_DOMAIN]
2714 + @ write r1 to DACR
2715 + mcr p15, 0, r1, c3, c0, 0
2716 + @ instruction sync
2717 + instr_sync
2718 + @ restore regs
2719 + ldmia sp!, {r0, r1}
2720 +#endif
2721 + .endm
2722 +
2723 #ifndef CONFIG_THUMB2_KERNEL
2724 .macro svc_exit, rpsr, irq = 0
2725 .if \irq != 0
2726 @@ -215,6 +269,9 @@
2727 blne trace_hardirqs_off
2728 #endif
2729 .endif
2730 +
2731 + pax_exit_kernel
2732 +
2733 msr spsr_cxsf, \rpsr
2734 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2735 @ We must avoid clrex due to Cortex-A15 erratum #830321
2736 @@ -290,6 +347,9 @@
2737 blne trace_hardirqs_off
2738 #endif
2739 .endif
2740 +
2741 + pax_exit_kernel
2742 +
2743 ldr lr, [sp, #S_SP] @ top of the stack
2744 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2745
2746 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2747 index b37752a..ff5cb72 100644
2748 --- a/arch/arm/kernel/fiq.c
2749 +++ b/arch/arm/kernel/fiq.c
2750 @@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2751 void *base = vectors_page;
2752 unsigned offset = FIQ_OFFSET;
2753
2754 + pax_open_kernel();
2755 memcpy(base + offset, start, length);
2756 + pax_close_kernel();
2757 +
2758 if (!cache_is_vipt_nonaliasing())
2759 flush_icache_range((unsigned long)base + offset, offset +
2760 length);
2761 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2762 index 664eee8..f470938 100644
2763 --- a/arch/arm/kernel/head.S
2764 +++ b/arch/arm/kernel/head.S
2765 @@ -437,7 +437,7 @@ __enable_mmu:
2766 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2767 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2768 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2769 - domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2770 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2771 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2772 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2773 #endif
2774 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2775 index 6a4dffe..4a86a70 100644
2776 --- a/arch/arm/kernel/module.c
2777 +++ b/arch/arm/kernel/module.c
2778 @@ -38,12 +38,39 @@
2779 #endif
2780
2781 #ifdef CONFIG_MMU
2782 -void *module_alloc(unsigned long size)
2783 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2784 {
2785 + if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2786 + return NULL;
2787 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2788 - GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2789 + GFP_KERNEL, prot, NUMA_NO_NODE,
2790 __builtin_return_address(0));
2791 }
2792 +
2793 +void *module_alloc(unsigned long size)
2794 +{
2795 +
2796 +#ifdef CONFIG_PAX_KERNEXEC
2797 + return __module_alloc(size, PAGE_KERNEL);
2798 +#else
2799 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2800 +#endif
2801 +
2802 +}
2803 +
2804 +#ifdef CONFIG_PAX_KERNEXEC
2805 +void module_free_exec(struct module *mod, void *module_region)
2806 +{
2807 + module_free(mod, module_region);
2808 +}
2809 +EXPORT_SYMBOL(module_free_exec);
2810 +
2811 +void *module_alloc_exec(unsigned long size)
2812 +{
2813 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2814 +}
2815 +EXPORT_SYMBOL(module_alloc_exec);
2816 +#endif
2817 #endif
2818
2819 int
2820 diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2821 index 07314af..c46655c 100644
2822 --- a/arch/arm/kernel/patch.c
2823 +++ b/arch/arm/kernel/patch.c
2824 @@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2825 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2826 int size;
2827
2828 + pax_open_kernel();
2829 if (thumb2 && __opcode_is_thumb16(insn)) {
2830 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2831 size = sizeof(u16);
2832 @@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2833 *(u32 *)addr = insn;
2834 size = sizeof(u32);
2835 }
2836 + pax_close_kernel();
2837
2838 flush_icache_range((uintptr_t)(addr),
2839 (uintptr_t)(addr) + size);
2840 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2841 index fe972a2..a772d83 100644
2842 --- a/arch/arm/kernel/process.c
2843 +++ b/arch/arm/kernel/process.c
2844 @@ -207,6 +207,7 @@ void machine_power_off(void)
2845
2846 if (pm_power_off)
2847 pm_power_off();
2848 + BUG();
2849 }
2850
2851 /*
2852 @@ -220,7 +221,7 @@ void machine_power_off(void)
2853 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2854 * to use. Implementing such co-ordination would be essentially impossible.
2855 */
2856 -void machine_restart(char *cmd)
2857 +__noreturn void machine_restart(char *cmd)
2858 {
2859 local_irq_disable();
2860 smp_send_stop();
2861 @@ -246,8 +247,8 @@ void __show_regs(struct pt_regs *regs)
2862
2863 show_regs_print_info(KERN_DEFAULT);
2864
2865 - print_symbol("PC is at %s\n", instruction_pointer(regs));
2866 - print_symbol("LR is at %s\n", regs->ARM_lr);
2867 + printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2868 + printk("LR is at %pA\n", (void *)regs->ARM_lr);
2869 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2870 "sp : %08lx ip : %08lx fp : %08lx\n",
2871 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2872 @@ -424,12 +425,6 @@ unsigned long get_wchan(struct task_struct *p)
2873 return 0;
2874 }
2875
2876 -unsigned long arch_randomize_brk(struct mm_struct *mm)
2877 -{
2878 - unsigned long range_end = mm->brk + 0x02000000;
2879 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2880 -}
2881 -
2882 #ifdef CONFIG_MMU
2883 #ifdef CONFIG_KUSER_HELPERS
2884 /*
2885 @@ -445,7 +440,7 @@ static struct vm_area_struct gate_vma = {
2886
2887 static int __init gate_vma_init(void)
2888 {
2889 - gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2890 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2891 return 0;
2892 }
2893 arch_initcall(gate_vma_init);
2894 @@ -474,81 +469,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2895 return is_gate_vma(vma) ? "[vectors]" : NULL;
2896 }
2897
2898 -/* If possible, provide a placement hint at a random offset from the
2899 - * stack for the signal page.
2900 - */
2901 -static unsigned long sigpage_addr(const struct mm_struct *mm,
2902 - unsigned int npages)
2903 -{
2904 - unsigned long offset;
2905 - unsigned long first;
2906 - unsigned long last;
2907 - unsigned long addr;
2908 - unsigned int slots;
2909 -
2910 - first = PAGE_ALIGN(mm->start_stack);
2911 -
2912 - last = TASK_SIZE - (npages << PAGE_SHIFT);
2913 -
2914 - /* No room after stack? */
2915 - if (first > last)
2916 - return 0;
2917 -
2918 - /* Just enough room? */
2919 - if (first == last)
2920 - return first;
2921 -
2922 - slots = ((last - first) >> PAGE_SHIFT) + 1;
2923 -
2924 - offset = get_random_int() % slots;
2925 -
2926 - addr = first + (offset << PAGE_SHIFT);
2927 -
2928 - return addr;
2929 -}
2930 -
2931 -static struct page *signal_page;
2932 -extern struct page *get_signal_page(void);
2933 -
2934 -static const struct vm_special_mapping sigpage_mapping = {
2935 - .name = "[sigpage]",
2936 - .pages = &signal_page,
2937 -};
2938 -
2939 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2940 {
2941 struct mm_struct *mm = current->mm;
2942 - struct vm_area_struct *vma;
2943 - unsigned long addr;
2944 - unsigned long hint;
2945 - int ret = 0;
2946 -
2947 - if (!signal_page)
2948 - signal_page = get_signal_page();
2949 - if (!signal_page)
2950 - return -ENOMEM;
2951
2952 down_write(&mm->mmap_sem);
2953 - hint = sigpage_addr(mm, 1);
2954 - addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2955 - if (IS_ERR_VALUE(addr)) {
2956 - ret = addr;
2957 - goto up_fail;
2958 - }
2959 -
2960 - vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2961 - VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2962 - &sigpage_mapping);
2963 -
2964 - if (IS_ERR(vma)) {
2965 - ret = PTR_ERR(vma);
2966 - goto up_fail;
2967 - }
2968 -
2969 - mm->context.sigpage = addr;
2970 -
2971 - up_fail:
2972 + mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2973 up_write(&mm->mmap_sem);
2974 - return ret;
2975 + return 0;
2976 }
2977 #endif
2978 diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2979 index f73891b..cf3004e 100644
2980 --- a/arch/arm/kernel/psci.c
2981 +++ b/arch/arm/kernel/psci.c
2982 @@ -28,7 +28,7 @@
2983 #include <asm/psci.h>
2984 #include <asm/system_misc.h>
2985
2986 -struct psci_operations psci_ops;
2987 +struct psci_operations psci_ops __read_only;
2988
2989 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2990 typedef int (*psci_initcall_t)(const struct device_node *);
2991 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
2992 index ef9119f..31995a3 100644
2993 --- a/arch/arm/kernel/ptrace.c
2994 +++ b/arch/arm/kernel/ptrace.c
2995 @@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
2996 regs->ARM_ip = ip;
2997 }
2998
2999 +#ifdef CONFIG_GRKERNSEC_SETXID
3000 +extern void gr_delayed_cred_worker(void);
3001 +#endif
3002 +
3003 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3004 {
3005 current_thread_info()->syscall = scno;
3006
3007 +#ifdef CONFIG_GRKERNSEC_SETXID
3008 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3009 + gr_delayed_cred_worker();
3010 +#endif
3011 +
3012 /* Do the secure computing check first; failures should be fast. */
3013 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3014 if (secure_computing() == -1)
3015 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3016 index c031063..e277ab8 100644
3017 --- a/arch/arm/kernel/setup.c
3018 +++ b/arch/arm/kernel/setup.c
3019 @@ -104,21 +104,23 @@ EXPORT_SYMBOL(elf_hwcap);
3020 unsigned int elf_hwcap2 __read_mostly;
3021 EXPORT_SYMBOL(elf_hwcap2);
3022
3023 +pteval_t __supported_pte_mask __read_only;
3024 +pmdval_t __supported_pmd_mask __read_only;
3025
3026 #ifdef MULTI_CPU
3027 -struct processor processor __read_mostly;
3028 +struct processor processor __read_only;
3029 #endif
3030 #ifdef MULTI_TLB
3031 -struct cpu_tlb_fns cpu_tlb __read_mostly;
3032 +struct cpu_tlb_fns cpu_tlb __read_only;
3033 #endif
3034 #ifdef MULTI_USER
3035 -struct cpu_user_fns cpu_user __read_mostly;
3036 +struct cpu_user_fns cpu_user __read_only;
3037 #endif
3038 #ifdef MULTI_CACHE
3039 -struct cpu_cache_fns cpu_cache __read_mostly;
3040 +struct cpu_cache_fns cpu_cache __read_only;
3041 #endif
3042 #ifdef CONFIG_OUTER_CACHE
3043 -struct outer_cache_fns outer_cache __read_mostly;
3044 +struct outer_cache_fns outer_cache __read_only;
3045 EXPORT_SYMBOL(outer_cache);
3046 #endif
3047
3048 @@ -252,9 +254,13 @@ static int __get_cpu_architecture(void)
3049 asm("mrc p15, 0, %0, c0, c1, 4"
3050 : "=r" (mmfr0));
3051 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3052 - (mmfr0 & 0x000000f0) >= 0x00000030)
3053 + (mmfr0 & 0x000000f0) >= 0x00000030) {
3054 cpu_arch = CPU_ARCH_ARMv7;
3055 - else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3056 + if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3057 + __supported_pte_mask |= L_PTE_PXN;
3058 + __supported_pmd_mask |= PMD_PXNTABLE;
3059 + }
3060 + } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3061 (mmfr0 & 0x000000f0) == 0x00000020)
3062 cpu_arch = CPU_ARCH_ARMv6;
3063 else
3064 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3065 index bd19834..e4d8c66 100644
3066 --- a/arch/arm/kernel/signal.c
3067 +++ b/arch/arm/kernel/signal.c
3068 @@ -24,8 +24,6 @@
3069
3070 extern const unsigned long sigreturn_codes[7];
3071
3072 -static unsigned long signal_return_offset;
3073 -
3074 #ifdef CONFIG_CRUNCH
3075 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3076 {
3077 @@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3078 * except when the MPU has protected the vectors
3079 * page from PL0
3080 */
3081 - retcode = mm->context.sigpage + signal_return_offset +
3082 - (idx << 2) + thumb;
3083 + retcode = mm->context.sigpage + (idx << 2) + thumb;
3084 } else
3085 #endif
3086 {
3087 @@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3088 } while (thread_flags & _TIF_WORK_MASK);
3089 return 0;
3090 }
3091 -
3092 -struct page *get_signal_page(void)
3093 -{
3094 - unsigned long ptr;
3095 - unsigned offset;
3096 - struct page *page;
3097 - void *addr;
3098 -
3099 - page = alloc_pages(GFP_KERNEL, 0);
3100 -
3101 - if (!page)
3102 - return NULL;
3103 -
3104 - addr = page_address(page);
3105 -
3106 - /* Give the signal return code some randomness */
3107 - offset = 0x200 + (get_random_int() & 0x7fc);
3108 - signal_return_offset = offset;
3109 -
3110 - /*
3111 - * Copy signal return handlers into the vector page, and
3112 - * set sigreturn to be a pointer to these.
3113 - */
3114 - memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3115 -
3116 - ptr = (unsigned long)addr + offset;
3117 - flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3118 -
3119 - return page;
3120 -}
3121 diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3122 index 13396d3..589d615 100644
3123 --- a/arch/arm/kernel/smp.c
3124 +++ b/arch/arm/kernel/smp.c
3125 @@ -76,7 +76,7 @@ enum ipi_msg_type {
3126
3127 static DECLARE_COMPLETION(cpu_running);
3128
3129 -static struct smp_operations smp_ops;
3130 +static struct smp_operations smp_ops __read_only;
3131
3132 void __init smp_set_ops(struct smp_operations *ops)
3133 {
3134 diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3135 index 7a3be1d..b00c7de 100644
3136 --- a/arch/arm/kernel/tcm.c
3137 +++ b/arch/arm/kernel/tcm.c
3138 @@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3139 .virtual = ITCM_OFFSET,
3140 .pfn = __phys_to_pfn(ITCM_OFFSET),
3141 .length = 0,
3142 - .type = MT_MEMORY_RWX_ITCM,
3143 + .type = MT_MEMORY_RX_ITCM,
3144 }
3145 };
3146
3147 @@ -267,7 +267,9 @@ no_dtcm:
3148 start = &__sitcm_text;
3149 end = &__eitcm_text;
3150 ram = &__itcm_start;
3151 + pax_open_kernel();
3152 memcpy(start, ram, itcm_code_sz);
3153 + pax_close_kernel();
3154 pr_debug("CPU ITCM: copied code from %p - %p\n",
3155 start, end);
3156 itcm_present = true;
3157 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3158 index 9f5d818..e013427 100644
3159 --- a/arch/arm/kernel/traps.c
3160 +++ b/arch/arm/kernel/traps.c
3161 @@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3162 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3163 {
3164 #ifdef CONFIG_KALLSYMS
3165 - printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3166 + printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3167 #else
3168 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3169 #endif
3170 @@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3171 static int die_owner = -1;
3172 static unsigned int die_nest_count;
3173
3174 +extern void gr_handle_kernel_exploit(void);
3175 +
3176 static unsigned long oops_begin(void)
3177 {
3178 int cpu;
3179 @@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3180 panic("Fatal exception in interrupt");
3181 if (panic_on_oops)
3182 panic("Fatal exception");
3183 +
3184 + gr_handle_kernel_exploit();
3185 +
3186 if (signr)
3187 do_exit(signr);
3188 }
3189 @@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3190 kuser_init(vectors_base);
3191
3192 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3193 - modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3194 +
3195 +#ifndef CONFIG_PAX_MEMORY_UDEREF
3196 + modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3197 +#endif
3198 +
3199 #else /* ifndef CONFIG_CPU_V7M */
3200 /*
3201 * on V7-M there is no need to copy the vector table to a dedicated
3202 diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3203 index 8e95aa4..595dfc8 100644
3204 --- a/arch/arm/kernel/vmlinux.lds.S
3205 +++ b/arch/arm/kernel/vmlinux.lds.S
3206 @@ -8,7 +8,11 @@
3207 #include <asm/thread_info.h>
3208 #include <asm/memory.h>
3209 #include <asm/page.h>
3210 -
3211 +
3212 +#ifdef CONFIG_PAX_KERNEXEC
3213 +#include <asm/pgtable.h>
3214 +#endif
3215 +
3216 #define PROC_INFO \
3217 . = ALIGN(4); \
3218 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3219 @@ -34,7 +38,7 @@
3220 #endif
3221
3222 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3223 - defined(CONFIG_GENERIC_BUG)
3224 + defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3225 #define ARM_EXIT_KEEP(x) x
3226 #define ARM_EXIT_DISCARD(x)
3227 #else
3228 @@ -90,6 +94,11 @@ SECTIONS
3229 _text = .;
3230 HEAD_TEXT
3231 }
3232 +
3233 +#ifdef CONFIG_PAX_KERNEXEC
3234 + . = ALIGN(1<<SECTION_SHIFT);
3235 +#endif
3236 +
3237 .text : { /* Real text segment */
3238 _stext = .; /* Text and read-only data */
3239 __exception_text_start = .;
3240 @@ -112,6 +121,8 @@ SECTIONS
3241 ARM_CPU_KEEP(PROC_INFO)
3242 }
3243
3244 + _etext = .; /* End of text section */
3245 +
3246 RO_DATA(PAGE_SIZE)
3247
3248 . = ALIGN(4);
3249 @@ -142,7 +153,9 @@ SECTIONS
3250
3251 NOTES
3252
3253 - _etext = .; /* End of text and rodata section */
3254 +#ifdef CONFIG_PAX_KERNEXEC
3255 + . = ALIGN(1<<SECTION_SHIFT);
3256 +#endif
3257
3258 #ifndef CONFIG_XIP_KERNEL
3259 . = ALIGN(PAGE_SIZE);
3260 @@ -221,6 +234,11 @@ SECTIONS
3261 #else
3262 . = ALIGN(THREAD_SIZE);
3263 __init_end = .;
3264 +
3265 +#ifdef CONFIG_PAX_KERNEXEC
3266 + . = ALIGN(1<<SECTION_SHIFT);
3267 +#endif
3268 +
3269 __data_loc = .;
3270 #endif
3271
3272 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3273 index 9e193c8..3560fe6 100644
3274 --- a/arch/arm/kvm/arm.c
3275 +++ b/arch/arm/kvm/arm.c
3276 @@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3277 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3278
3279 /* The VMID used in the VTTBR */
3280 -static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3281 +static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3282 static u8 kvm_next_vmid;
3283 static DEFINE_SPINLOCK(kvm_vmid_lock);
3284
3285 @@ -354,7 +354,7 @@ void force_vm_exit(const cpumask_t *mask)
3286 */
3287 static bool need_new_vmid_gen(struct kvm *kvm)
3288 {
3289 - return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3290 + return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3291 }
3292
3293 /**
3294 @@ -387,7 +387,7 @@ static void update_vttbr(struct kvm *kvm)
3295
3296 /* First user of a new VMID generation? */
3297 if (unlikely(kvm_next_vmid == 0)) {
3298 - atomic64_inc(&kvm_vmid_gen);
3299 + atomic64_inc_unchecked(&kvm_vmid_gen);
3300 kvm_next_vmid = 1;
3301
3302 /*
3303 @@ -404,7 +404,7 @@ static void update_vttbr(struct kvm *kvm)
3304 kvm_call_hyp(__kvm_flush_vm_context);
3305 }
3306
3307 - kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3308 + kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3309 kvm->arch.vmid = kvm_next_vmid;
3310 kvm_next_vmid++;
3311
3312 @@ -980,7 +980,7 @@ static void check_kvm_target_cpu(void *ret)
3313 /**
3314 * Initialize Hyp-mode and memory mappings on all CPUs.
3315 */
3316 -int kvm_arch_init(void *opaque)
3317 +int kvm_arch_init(const void *opaque)
3318 {
3319 int err;
3320 int ret, cpu;
3321 diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3322 index 14a0d98..7771a7d 100644
3323 --- a/arch/arm/lib/clear_user.S
3324 +++ b/arch/arm/lib/clear_user.S
3325 @@ -12,14 +12,14 @@
3326
3327 .text
3328
3329 -/* Prototype: int __clear_user(void *addr, size_t sz)
3330 +/* Prototype: int ___clear_user(void *addr, size_t sz)
3331 * Purpose : clear some user memory
3332 * Params : addr - user memory address to clear
3333 * : sz - number of bytes to clear
3334 * Returns : number of bytes NOT cleared
3335 */
3336 ENTRY(__clear_user_std)
3337 -WEAK(__clear_user)
3338 +WEAK(___clear_user)
3339 stmfd sp!, {r1, lr}
3340 mov r2, #0
3341 cmp r1, #4
3342 @@ -44,7 +44,7 @@ WEAK(__clear_user)
3343 USER( strnebt r2, [r0])
3344 mov r0, #0
3345 ldmfd sp!, {r1, pc}
3346 -ENDPROC(__clear_user)
3347 +ENDPROC(___clear_user)
3348 ENDPROC(__clear_user_std)
3349
3350 .pushsection .fixup,"ax"
3351 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3352 index 66a477a..bee61d3 100644
3353 --- a/arch/arm/lib/copy_from_user.S
3354 +++ b/arch/arm/lib/copy_from_user.S
3355 @@ -16,7 +16,7 @@
3356 /*
3357 * Prototype:
3358 *
3359 - * size_t __copy_from_user(void *to, const void *from, size_t n)
3360 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
3361 *
3362 * Purpose:
3363 *
3364 @@ -84,11 +84,11 @@
3365
3366 .text
3367
3368 -ENTRY(__copy_from_user)
3369 +ENTRY(___copy_from_user)
3370
3371 #include "copy_template.S"
3372
3373 -ENDPROC(__copy_from_user)
3374 +ENDPROC(___copy_from_user)
3375
3376 .pushsection .fixup,"ax"
3377 .align 0
3378 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3379 index 6ee2f67..d1cce76 100644
3380 --- a/arch/arm/lib/copy_page.S
3381 +++ b/arch/arm/lib/copy_page.S
3382 @@ -10,6 +10,7 @@
3383 * ASM optimised string functions
3384 */
3385 #include <linux/linkage.h>
3386 +#include <linux/const.h>
3387 #include <asm/assembler.h>
3388 #include <asm/asm-offsets.h>
3389 #include <asm/cache.h>
3390 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3391 index d066df6..df28194 100644
3392 --- a/arch/arm/lib/copy_to_user.S
3393 +++ b/arch/arm/lib/copy_to_user.S
3394 @@ -16,7 +16,7 @@
3395 /*
3396 * Prototype:
3397 *
3398 - * size_t __copy_to_user(void *to, const void *from, size_t n)
3399 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
3400 *
3401 * Purpose:
3402 *
3403 @@ -88,11 +88,11 @@
3404 .text
3405
3406 ENTRY(__copy_to_user_std)
3407 -WEAK(__copy_to_user)
3408 +WEAK(___copy_to_user)
3409
3410 #include "copy_template.S"
3411
3412 -ENDPROC(__copy_to_user)
3413 +ENDPROC(___copy_to_user)
3414 ENDPROC(__copy_to_user_std)
3415
3416 .pushsection .fixup,"ax"
3417 diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3418 index 7d08b43..f7ca7ea 100644
3419 --- a/arch/arm/lib/csumpartialcopyuser.S
3420 +++ b/arch/arm/lib/csumpartialcopyuser.S
3421 @@ -57,8 +57,8 @@
3422 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3423 */
3424
3425 -#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3426 -#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3427 +#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3428 +#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3429
3430 #include "csumpartialcopygeneric.S"
3431
3432 diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3433 index 312d43e..21d2322 100644
3434 --- a/arch/arm/lib/delay.c
3435 +++ b/arch/arm/lib/delay.c
3436 @@ -29,7 +29,7 @@
3437 /*
3438 * Default to the loop-based delay implementation.
3439 */
3440 -struct arm_delay_ops arm_delay_ops = {
3441 +struct arm_delay_ops arm_delay_ops __read_only = {
3442 .delay = __loop_delay,
3443 .const_udelay = __loop_const_udelay,
3444 .udelay = __loop_udelay,
3445 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3446 index 3e58d71..029817c 100644
3447 --- a/arch/arm/lib/uaccess_with_memcpy.c
3448 +++ b/arch/arm/lib/uaccess_with_memcpy.c
3449 @@ -136,7 +136,7 @@ out:
3450 }
3451
3452 unsigned long
3453 -__copy_to_user(void __user *to, const void *from, unsigned long n)
3454 +___copy_to_user(void __user *to, const void *from, unsigned long n)
3455 {
3456 /*
3457 * This test is stubbed out of the main function above to keep
3458 @@ -190,7 +190,7 @@ out:
3459 return n;
3460 }
3461
3462 -unsigned long __clear_user(void __user *addr, unsigned long n)
3463 +unsigned long ___clear_user(void __user *addr, unsigned long n)
3464 {
3465 /* See rational for this in __copy_to_user() above. */
3466 if (n < 64)
3467 diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3468 index 9610792..4dfb851 100644
3469 --- a/arch/arm/mach-at91/setup.c
3470 +++ b/arch/arm/mach-at91/setup.c
3471 @@ -83,7 +83,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3472
3473 desc->pfn = __phys_to_pfn(base);
3474 desc->length = length;
3475 - desc->type = MT_MEMORY_RWX_NONCACHED;
3476 + desc->type = MT_MEMORY_RW_NONCACHED;
3477
3478 pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3479 base, length, desc->virtual);
3480 diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3481 index 7f352de..6dc0929 100644
3482 --- a/arch/arm/mach-keystone/keystone.c
3483 +++ b/arch/arm/mach-keystone/keystone.c
3484 @@ -27,7 +27,7 @@
3485
3486 #include "keystone.h"
3487
3488 -static struct notifier_block platform_nb;
3489 +static notifier_block_no_const platform_nb;
3490 static unsigned long keystone_dma_pfn_offset __read_mostly;
3491
3492 static int keystone_platform_notifier(struct notifier_block *nb,
3493 diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3494 index 044b511..afd1da8 100644
3495 --- a/arch/arm/mach-mvebu/coherency.c
3496 +++ b/arch/arm/mach-mvebu/coherency.c
3497 @@ -316,7 +316,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3498
3499 /*
3500 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3501 - * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3502 + * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3503 * is needed as a workaround for a deadlock issue between the PCIe
3504 * interface and the cache controller.
3505 */
3506 @@ -329,7 +329,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3507 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3508
3509 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3510 - mtype = MT_UNCACHED;
3511 + mtype = MT_UNCACHED_RW;
3512
3513 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3514 }
3515 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3516 index 97767a2..9233746 100644
3517 --- a/arch/arm/mach-omap2/board-n8x0.c
3518 +++ b/arch/arm/mach-omap2/board-n8x0.c
3519 @@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3520 }
3521 #endif
3522
3523 -struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3524 +struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3525 .late_init = n8x0_menelaus_late_init,
3526 };
3527
3528 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3529 index 5fa3755..1e8c247 100644
3530 --- a/arch/arm/mach-omap2/gpmc.c
3531 +++ b/arch/arm/mach-omap2/gpmc.c
3532 @@ -151,7 +151,6 @@ struct omap3_gpmc_regs {
3533 };
3534
3535 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3536 -static struct irq_chip gpmc_irq_chip;
3537 static int gpmc_irq_start;
3538
3539 static struct resource gpmc_mem_root;
3540 @@ -736,6 +735,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3541
3542 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3543
3544 +static struct irq_chip gpmc_irq_chip = {
3545 + .name = "gpmc",
3546 + .irq_startup = gpmc_irq_noop_ret,
3547 + .irq_enable = gpmc_irq_enable,
3548 + .irq_disable = gpmc_irq_disable,
3549 + .irq_shutdown = gpmc_irq_noop,
3550 + .irq_ack = gpmc_irq_noop,
3551 + .irq_mask = gpmc_irq_noop,
3552 + .irq_unmask = gpmc_irq_noop,
3553 +
3554 +};
3555 +
3556 static int gpmc_setup_irq(void)
3557 {
3558 int i;
3559 @@ -750,15 +761,6 @@ static int gpmc_setup_irq(void)
3560 return gpmc_irq_start;
3561 }
3562
3563 - gpmc_irq_chip.name = "gpmc";
3564 - gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3565 - gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3566 - gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3567 - gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3568 - gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3569 - gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3570 - gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3571 -
3572 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3573 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3574
3575 diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3576 index 6944ae3..bc587ca 100644
3577 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3578 +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3579 @@ -86,7 +86,7 @@ struct cpu_pm_ops {
3580 void (*resume)(void);
3581 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3582 void (*hotplug_restart)(void);
3583 -};
3584 +} __no_const;
3585
3586 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3587 static struct powerdomain *mpuss_pd;
3588 @@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3589 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3590 {}
3591
3592 -struct cpu_pm_ops omap_pm_ops = {
3593 +static struct cpu_pm_ops omap_pm_ops __read_only = {
3594 .finish_suspend = default_finish_suspend,
3595 .resume = dummy_cpu_resume,
3596 .scu_prepare = dummy_scu_prepare,
3597 diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3598 index f961c46..4a453dc 100644
3599 --- a/arch/arm/mach-omap2/omap-wakeupgen.c
3600 +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3601 @@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3602 return NOTIFY_OK;
3603 }
3604
3605 -static struct notifier_block __refdata irq_hotplug_notifier = {
3606 +static struct notifier_block irq_hotplug_notifier = {
3607 .notifier_call = irq_cpu_hotplug_notify,
3608 };
3609
3610 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3611 index 8c58b71..95b655f 100644
3612 --- a/arch/arm/mach-omap2/omap_device.c
3613 +++ b/arch/arm/mach-omap2/omap_device.c
3614 @@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3615 struct platform_device __init *omap_device_build(const char *pdev_name,
3616 int pdev_id,
3617 struct omap_hwmod *oh,
3618 - void *pdata, int pdata_len)
3619 + const void *pdata, int pdata_len)
3620 {
3621 struct omap_hwmod *ohs[] = { oh };
3622
3623 @@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3624 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3625 int pdev_id,
3626 struct omap_hwmod **ohs,
3627 - int oh_cnt, void *pdata,
3628 + int oh_cnt, const void *pdata,
3629 int pdata_len)
3630 {
3631 int ret = -ENOMEM;
3632 diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3633 index 78c02b3..c94109a 100644
3634 --- a/arch/arm/mach-omap2/omap_device.h
3635 +++ b/arch/arm/mach-omap2/omap_device.h
3636 @@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3637 /* Core code interface */
3638
3639 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3640 - struct omap_hwmod *oh, void *pdata,
3641 + struct omap_hwmod *oh, const void *pdata,
3642 int pdata_len);
3643
3644 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3645 struct omap_hwmod **oh, int oh_cnt,
3646 - void *pdata, int pdata_len);
3647 + const void *pdata, int pdata_len);
3648
3649 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3650 struct omap_hwmod **ohs, int oh_cnt);
3651 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3652 index 716247e..8df346d 100644
3653 --- a/arch/arm/mach-omap2/omap_hwmod.c
3654 +++ b/arch/arm/mach-omap2/omap_hwmod.c
3655 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3656 int (*init_clkdm)(struct omap_hwmod *oh);
3657 void (*update_context_lost)(struct omap_hwmod *oh);
3658 int (*get_context_lost)(struct omap_hwmod *oh);
3659 -};
3660 +} __no_const;
3661
3662 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3663 -static struct omap_hwmod_soc_ops soc_ops;
3664 +static struct omap_hwmod_soc_ops soc_ops __read_only;
3665
3666 /* omap_hwmod_list contains all registered struct omap_hwmods */
3667 static LIST_HEAD(omap_hwmod_list);
3668 diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3669 index 95fee54..cfa9cf1 100644
3670 --- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3671 +++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3672 @@ -10,6 +10,7 @@
3673
3674 #include <linux/kernel.h>
3675 #include <linux/init.h>
3676 +#include <asm/pgtable.h>
3677
3678 #include "powerdomain.h"
3679
3680 @@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3681
3682 void __init am43xx_powerdomains_init(void)
3683 {
3684 - omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3685 + pax_open_kernel();
3686 + *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3687 + pax_close_kernel();
3688 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3689 pwrdm_register_pwrdms(powerdomains_am43xx);
3690 pwrdm_complete_init();
3691 diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3692 index ff0a68c..b312aa0 100644
3693 --- a/arch/arm/mach-omap2/wd_timer.c
3694 +++ b/arch/arm/mach-omap2/wd_timer.c
3695 @@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3696 struct omap_hwmod *oh;
3697 char *oh_name = "wd_timer2";
3698 char *dev_name = "omap_wdt";
3699 - struct omap_wd_timer_platform_data pdata;
3700 + static struct omap_wd_timer_platform_data pdata = {
3701 + .read_reset_sources = prm_read_reset_sources
3702 + };
3703
3704 if (!cpu_class_is_omap2() || of_have_populated_dt())
3705 return 0;
3706 @@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3707 return -EINVAL;
3708 }
3709
3710 - pdata.read_reset_sources = prm_read_reset_sources;
3711 -
3712 pdev = omap_device_build(dev_name, id, oh, &pdata,
3713 sizeof(struct omap_wd_timer_platform_data));
3714 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3715 diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3716 index b30bf5c..d0825bf 100644
3717 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3718 +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3719 @@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3720 bool entered_lp2 = false;
3721
3722 if (tegra_pending_sgi())
3723 - ACCESS_ONCE(abort_flag) = true;
3724 + ACCESS_ONCE_RW(abort_flag) = true;
3725
3726 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3727
3728 diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3729 index 2dea8b5..6499da2 100644
3730 --- a/arch/arm/mach-ux500/setup.h
3731 +++ b/arch/arm/mach-ux500/setup.h
3732 @@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3733 .type = MT_DEVICE, \
3734 }
3735
3736 -#define __MEM_DEV_DESC(x, sz) { \
3737 - .virtual = IO_ADDRESS(x), \
3738 - .pfn = __phys_to_pfn(x), \
3739 - .length = sz, \
3740 - .type = MT_MEMORY_RWX, \
3741 -}
3742 -
3743 extern struct smp_operations ux500_smp_ops;
3744 extern void ux500_cpu_die(unsigned int cpu);
3745
3746 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3747 index 7eb94e6..799ad3e 100644
3748 --- a/arch/arm/mm/Kconfig
3749 +++ b/arch/arm/mm/Kconfig
3750 @@ -446,6 +446,7 @@ config CPU_32v5
3751
3752 config CPU_32v6
3753 bool
3754 + select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3755 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3756
3757 config CPU_32v6K
3758 @@ -600,6 +601,7 @@ config CPU_CP15_MPU
3759
3760 config CPU_USE_DOMAINS
3761 bool
3762 + depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3763 help
3764 This option enables or disables the use of domain switching
3765 via the set_fs() function.
3766 @@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3767
3768 config KUSER_HELPERS
3769 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3770 - depends on MMU
3771 + depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3772 default y
3773 help
3774 Warning: disabling this option may break user programs.
3775 @@ -812,7 +814,7 @@ config KUSER_HELPERS
3776 See Documentation/arm/kernel_user_helpers.txt for details.
3777
3778 However, the fixed address nature of these helpers can be used
3779 - by ROP (return orientated programming) authors when creating
3780 + by ROP (Return Oriented Programming) authors when creating
3781 exploits.
3782
3783 If all of the binaries and libraries which run on your platform
3784 diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3785 index 83792f4..c25d36b 100644
3786 --- a/arch/arm/mm/alignment.c
3787 +++ b/arch/arm/mm/alignment.c
3788 @@ -216,10 +216,12 @@ union offset_union {
3789 #define __get16_unaligned_check(ins,val,addr) \
3790 do { \
3791 unsigned int err = 0, v, a = addr; \
3792 + pax_open_userland(); \
3793 __get8_unaligned_check(ins,v,a,err); \
3794 val = v << ((BE) ? 8 : 0); \
3795 __get8_unaligned_check(ins,v,a,err); \
3796 val |= v << ((BE) ? 0 : 8); \
3797 + pax_close_userland(); \
3798 if (err) \
3799 goto fault; \
3800 } while (0)
3801 @@ -233,6 +235,7 @@ union offset_union {
3802 #define __get32_unaligned_check(ins,val,addr) \
3803 do { \
3804 unsigned int err = 0, v, a = addr; \
3805 + pax_open_userland(); \
3806 __get8_unaligned_check(ins,v,a,err); \
3807 val = v << ((BE) ? 24 : 0); \
3808 __get8_unaligned_check(ins,v,a,err); \
3809 @@ -241,6 +244,7 @@ union offset_union {
3810 val |= v << ((BE) ? 8 : 16); \
3811 __get8_unaligned_check(ins,v,a,err); \
3812 val |= v << ((BE) ? 0 : 24); \
3813 + pax_close_userland(); \
3814 if (err) \
3815 goto fault; \
3816 } while (0)
3817 @@ -254,6 +258,7 @@ union offset_union {
3818 #define __put16_unaligned_check(ins,val,addr) \
3819 do { \
3820 unsigned int err = 0, v = val, a = addr; \
3821 + pax_open_userland(); \
3822 __asm__( FIRST_BYTE_16 \
3823 ARM( "1: "ins" %1, [%2], #1\n" ) \
3824 THUMB( "1: "ins" %1, [%2]\n" ) \
3825 @@ -273,6 +278,7 @@ union offset_union {
3826 " .popsection\n" \
3827 : "=r" (err), "=&r" (v), "=&r" (a) \
3828 : "0" (err), "1" (v), "2" (a)); \
3829 + pax_close_userland(); \
3830 if (err) \
3831 goto fault; \
3832 } while (0)
3833 @@ -286,6 +292,7 @@ union offset_union {
3834 #define __put32_unaligned_check(ins,val,addr) \
3835 do { \
3836 unsigned int err = 0, v = val, a = addr; \
3837 + pax_open_userland(); \
3838 __asm__( FIRST_BYTE_32 \
3839 ARM( "1: "ins" %1, [%2], #1\n" ) \
3840 THUMB( "1: "ins" %1, [%2]\n" ) \
3841 @@ -315,6 +322,7 @@ union offset_union {
3842 " .popsection\n" \
3843 : "=r" (err), "=&r" (v), "=&r" (a) \
3844 : "0" (err), "1" (v), "2" (a)); \
3845 + pax_close_userland(); \
3846 if (err) \
3847 goto fault; \
3848 } while (0)
3849 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3850 index 5e65ca8..879e7b3 100644
3851 --- a/arch/arm/mm/cache-l2x0.c
3852 +++ b/arch/arm/mm/cache-l2x0.c
3853 @@ -42,7 +42,7 @@ struct l2c_init_data {
3854 void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
3855 void (*save)(void __iomem *);
3856 struct outer_cache_fns outer_cache;
3857 -};
3858 +} __do_const;
3859
3860 #define CACHE_LINE_SIZE 32
3861
3862 diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3863 index 6eb97b3..ac509f6 100644
3864 --- a/arch/arm/mm/context.c
3865 +++ b/arch/arm/mm/context.c
3866 @@ -43,7 +43,7 @@
3867 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3868
3869 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3870 -static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3871 +static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3872 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3873
3874 static DEFINE_PER_CPU(atomic64_t, active_asids);
3875 @@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3876 {
3877 static u32 cur_idx = 1;
3878 u64 asid = atomic64_read(&mm->context.id);
3879 - u64 generation = atomic64_read(&asid_generation);
3880 + u64 generation = atomic64_read_unchecked(&asid_generation);
3881
3882 if (asid != 0 && is_reserved_asid(asid)) {
3883 /*
3884 @@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3885 */
3886 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3887 if (asid == NUM_USER_ASIDS) {
3888 - generation = atomic64_add_return(ASID_FIRST_VERSION,
3889 + generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3890 &asid_generation);
3891 flush_context(cpu);
3892 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3893 @@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3894 cpu_set_reserved_ttbr0();
3895
3896 asid = atomic64_read(&mm->context.id);
3897 - if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3898 + if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3899 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3900 goto switch_mm_fastpath;
3901
3902 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3903 /* Check that our ASID belongs to the current generation. */
3904 asid = atomic64_read(&mm->context.id);
3905 - if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3906 + if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3907 asid = new_context(mm, cpu);
3908 atomic64_set(&mm->context.id, asid);
3909 }
3910 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3911 index eb8830a..e8ff52e 100644
3912 --- a/arch/arm/mm/fault.c
3913 +++ b/arch/arm/mm/fault.c
3914 @@ -25,6 +25,7 @@
3915 #include <asm/system_misc.h>
3916 #include <asm/system_info.h>
3917 #include <asm/tlbflush.h>
3918 +#include <asm/sections.h>
3919
3920 #include "fault.h"
3921
3922 @@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3923 if (fixup_exception(regs))
3924 return;
3925
3926 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3927 + if (addr < TASK_SIZE) {
3928 + if (current->signal->curr_ip)
3929 + 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),
3930 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3931 + else
3932 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3933 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3934 + }
3935 +#endif
3936 +
3937 +#ifdef CONFIG_PAX_KERNEXEC
3938 + if ((fsr & FSR_WRITE) &&
3939 + (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3940 + (MODULES_VADDR <= addr && addr < MODULES_END)))
3941 + {
3942 + if (current->signal->curr_ip)
3943 + 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),
3944 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3945 + else
3946 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3947 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3948 + }
3949 +#endif
3950 +
3951 /*
3952 * No handler, we'll have to terminate things with extreme prejudice.
3953 */
3954 @@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3955 }
3956 #endif
3957
3958 +#ifdef CONFIG_PAX_PAGEEXEC
3959 + if (fsr & FSR_LNX_PF) {
3960 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3961 + do_group_exit(SIGKILL);
3962 + }
3963 +#endif
3964 +
3965 tsk->thread.address = addr;
3966 tsk->thread.error_code = fsr;
3967 tsk->thread.trap_no = 14;
3968 @@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3969 }
3970 #endif /* CONFIG_MMU */
3971
3972 +#ifdef CONFIG_PAX_PAGEEXEC
3973 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3974 +{
3975 + long i;
3976 +
3977 + printk(KERN_ERR "PAX: bytes at PC: ");
3978 + for (i = 0; i < 20; i++) {
3979 + unsigned char c;
3980 + if (get_user(c, (__force unsigned char __user *)pc+i))
3981 + printk(KERN_CONT "?? ");
3982 + else
3983 + printk(KERN_CONT "%02x ", c);
3984 + }
3985 + printk("\n");
3986 +
3987 + printk(KERN_ERR "PAX: bytes at SP-4: ");
3988 + for (i = -1; i < 20; i++) {
3989 + unsigned long c;
3990 + if (get_user(c, (__force unsigned long __user *)sp+i))
3991 + printk(KERN_CONT "???????? ");
3992 + else
3993 + printk(KERN_CONT "%08lx ", c);
3994 + }
3995 + printk("\n");
3996 +}
3997 +#endif
3998 +
3999 /*
4000 * First Level Translation Fault Handler
4001 *
4002 @@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4003 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4004 struct siginfo info;
4005
4006 +#ifdef CONFIG_PAX_MEMORY_UDEREF
4007 + if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4008 + if (current->signal->curr_ip)
4009 + 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),
4010 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4011 + else
4012 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4013 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4014 + goto die;
4015 + }
4016 +#endif
4017 +
4018 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4019 return;
4020
4021 +die:
4022 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4023 inf->name, fsr, addr);
4024
4025 @@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4026 ifsr_info[nr].name = name;
4027 }
4028
4029 +asmlinkage int sys_sigreturn(struct pt_regs *regs);
4030 +asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4031 +
4032 asmlinkage void __exception
4033 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4034 {
4035 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4036 struct siginfo info;
4037 + unsigned long pc = instruction_pointer(regs);
4038 +
4039 + if (user_mode(regs)) {
4040 + unsigned long sigpage = current->mm->context.sigpage;
4041 +
4042 + if (sigpage <= pc && pc < sigpage + 7*4) {
4043 + if (pc < sigpage + 3*4)
4044 + sys_sigreturn(regs);
4045 + else
4046 + sys_rt_sigreturn(regs);
4047 + return;
4048 + }
4049 + if (pc == 0xffff0f60UL) {
4050 + /*
4051 + * PaX: __kuser_cmpxchg64 emulation
4052 + */
4053 + // TODO
4054 + //regs->ARM_pc = regs->ARM_lr;
4055 + //return;
4056 + }
4057 + if (pc == 0xffff0fa0UL) {
4058 + /*
4059 + * PaX: __kuser_memory_barrier emulation
4060 + */
4061 + // dmb(); implied by the exception
4062 + regs->ARM_pc = regs->ARM_lr;
4063 + return;
4064 + }
4065 + if (pc == 0xffff0fc0UL) {
4066 + /*
4067 + * PaX: __kuser_cmpxchg emulation
4068 + */
4069 + // TODO
4070 + //long new;
4071 + //int op;
4072 +
4073 + //op = FUTEX_OP_SET << 28;
4074 + //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4075 + //regs->ARM_r0 = old != new;
4076 + //regs->ARM_pc = regs->ARM_lr;
4077 + //return;
4078 + }
4079 + if (pc == 0xffff0fe0UL) {
4080 + /*
4081 + * PaX: __kuser_get_tls emulation
4082 + */
4083 + regs->ARM_r0 = current_thread_info()->tp_value[0];
4084 + regs->ARM_pc = regs->ARM_lr;
4085 + return;
4086 + }
4087 + }
4088 +
4089 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4090 + else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4091 + if (current->signal->curr_ip)
4092 + 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),
4093 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4094 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4095 + else
4096 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4097 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4098 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4099 + goto die;
4100 + }
4101 +#endif
4102 +
4103 +#ifdef CONFIG_PAX_REFCOUNT
4104 + if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4105 +#ifdef CONFIG_THUMB2_KERNEL
4106 + unsigned short bkpt;
4107 +
4108 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4109 +#else
4110 + unsigned int bkpt;
4111 +
4112 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4113 +#endif
4114 + current->thread.error_code = ifsr;
4115 + current->thread.trap_no = 0;
4116 + pax_report_refcount_overflow(regs);
4117 + fixup_exception(regs);
4118 + return;
4119 + }
4120 + }
4121 +#endif
4122
4123 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4124 return;
4125
4126 +die:
4127 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4128 inf->name, ifsr, addr);
4129
4130 diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4131 index cf08bdf..772656c 100644
4132 --- a/arch/arm/mm/fault.h
4133 +++ b/arch/arm/mm/fault.h
4134 @@ -3,6 +3,7 @@
4135
4136 /*
4137 * Fault status register encodings. We steal bit 31 for our own purposes.
4138 + * Set when the FSR value is from an instruction fault.
4139 */
4140 #define FSR_LNX_PF (1 << 31)
4141 #define FSR_WRITE (1 << 11)
4142 @@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4143 }
4144 #endif
4145
4146 +/* valid for LPAE and !LPAE */
4147 +static inline int is_xn_fault(unsigned int fsr)
4148 +{
4149 + return ((fsr_fs(fsr) & 0x3c) == 0xc);
4150 +}
4151 +
4152 +static inline int is_domain_fault(unsigned int fsr)
4153 +{
4154 + return ((fsr_fs(fsr) & 0xD) == 0x9);
4155 +}
4156 +
4157 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4158 unsigned long search_exception_table(unsigned long addr);
4159
4160 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4161 index 9481f85..6dae261 100644
4162 --- a/arch/arm/mm/init.c
4163 +++ b/arch/arm/mm/init.c
4164 @@ -31,6 +31,8 @@
4165 #include <asm/setup.h>
4166 #include <asm/tlb.h>
4167 #include <asm/fixmap.h>
4168 +#include <asm/system_info.h>
4169 +#include <asm/cp15.h>
4170
4171 #include <asm/mach/arch.h>
4172 #include <asm/mach/map.h>
4173 @@ -619,7 +621,46 @@ void free_initmem(void)
4174 {
4175 #ifdef CONFIG_HAVE_TCM
4176 extern char __tcm_start, __tcm_end;
4177 +#endif
4178
4179 +#ifdef CONFIG_PAX_KERNEXEC
4180 + unsigned long addr;
4181 + pgd_t *pgd;
4182 + pud_t *pud;
4183 + pmd_t *pmd;
4184 + int cpu_arch = cpu_architecture();
4185 + unsigned int cr = get_cr();
4186 +
4187 + if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4188 + /* make pages tables, etc before .text NX */
4189 + for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4190 + pgd = pgd_offset_k(addr);
4191 + pud = pud_offset(pgd, addr);
4192 + pmd = pmd_offset(pud, addr);
4193 + __section_update(pmd, addr, PMD_SECT_XN);
4194 + }
4195 + /* make init NX */
4196 + for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4197 + pgd = pgd_offset_k(addr);
4198 + pud = pud_offset(pgd, addr);
4199 + pmd = pmd_offset(pud, addr);
4200 + __section_update(pmd, addr, PMD_SECT_XN);
4201 + }
4202 + /* make kernel code/rodata RX */
4203 + for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4204 + pgd = pgd_offset_k(addr);
4205 + pud = pud_offset(pgd, addr);
4206 + pmd = pmd_offset(pud, addr);
4207 +#ifdef CONFIG_ARM_LPAE
4208 + __section_update(pmd, addr, PMD_SECT_RDONLY);
4209 +#else
4210 + __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4211 +#endif
4212 + }
4213 + }
4214 +#endif
4215 +
4216 +#ifdef CONFIG_HAVE_TCM
4217 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4218 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4219 #endif
4220 diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4221 index d1e5ad7..84dcbf2 100644
4222 --- a/arch/arm/mm/ioremap.c
4223 +++ b/arch/arm/mm/ioremap.c
4224 @@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4225 unsigned int mtype;
4226
4227 if (cached)
4228 - mtype = MT_MEMORY_RWX;
4229 + mtype = MT_MEMORY_RX;
4230 else
4231 - mtype = MT_MEMORY_RWX_NONCACHED;
4232 + mtype = MT_MEMORY_RX_NONCACHED;
4233
4234 return __arm_ioremap_caller(phys_addr, size, mtype,
4235 __builtin_return_address(0));
4236 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4237 index 5e85ed3..b10a7ed 100644
4238 --- a/arch/arm/mm/mmap.c
4239 +++ b/arch/arm/mm/mmap.c
4240 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4241 struct vm_area_struct *vma;
4242 int do_align = 0;
4243 int aliasing = cache_is_vipt_aliasing();
4244 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4245 struct vm_unmapped_area_info info;
4246
4247 /*
4248 @@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4249 if (len > TASK_SIZE)
4250 return -ENOMEM;
4251
4252 +#ifdef CONFIG_PAX_RANDMMAP
4253 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4254 +#endif
4255 +
4256 if (addr) {
4257 if (do_align)
4258 addr = COLOUR_ALIGN(addr, pgoff);
4259 @@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4260 addr = PAGE_ALIGN(addr);
4261
4262 vma = find_vma(mm, addr);
4263 - if (TASK_SIZE - len >= addr &&
4264 - (!vma || addr + len <= vma->vm_start))
4265 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4266 return addr;
4267 }
4268
4269 @@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4270 info.high_limit = TASK_SIZE;
4271 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4272 info.align_offset = pgoff << PAGE_SHIFT;
4273 + info.threadstack_offset = offset;
4274 return vm_unmapped_area(&info);
4275 }
4276
4277 @@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4278 unsigned long addr = addr0;
4279 int do_align = 0;
4280 int aliasing = cache_is_vipt_aliasing();
4281 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4282 struct vm_unmapped_area_info info;
4283
4284 /*
4285 @@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4286 return addr;
4287 }
4288
4289 +#ifdef CONFIG_PAX_RANDMMAP
4290 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4291 +#endif
4292 +
4293 /* requesting a specific address */
4294 if (addr) {
4295 if (do_align)
4296 @@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4297 else
4298 addr = PAGE_ALIGN(addr);
4299 vma = find_vma(mm, addr);
4300 - if (TASK_SIZE - len >= addr &&
4301 - (!vma || addr + len <= vma->vm_start))
4302 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4303 return addr;
4304 }
4305
4306 @@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4307 info.high_limit = mm->mmap_base;
4308 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4309 info.align_offset = pgoff << PAGE_SHIFT;
4310 + info.threadstack_offset = offset;
4311 addr = vm_unmapped_area(&info);
4312
4313 /*
4314 @@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4315 {
4316 unsigned long random_factor = 0UL;
4317
4318 +#ifdef CONFIG_PAX_RANDMMAP
4319 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4320 +#endif
4321 +
4322 /* 8 bits of randomness in 20 address space bits */
4323 if ((current->flags & PF_RANDOMIZE) &&
4324 !(current->personality & ADDR_NO_RANDOMIZE))
4325 @@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4326
4327 if (mmap_is_legacy()) {
4328 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4329 +
4330 +#ifdef CONFIG_PAX_RANDMMAP
4331 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4332 + mm->mmap_base += mm->delta_mmap;
4333 +#endif
4334 +
4335 mm->get_unmapped_area = arch_get_unmapped_area;
4336 } else {
4337 mm->mmap_base = mmap_base(random_factor);
4338 +
4339 +#ifdef CONFIG_PAX_RANDMMAP
4340 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4341 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4342 +#endif
4343 +
4344 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4345 }
4346 }
4347 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4348 index 9f98cec..115fcb6 100644
4349 --- a/arch/arm/mm/mmu.c
4350 +++ b/arch/arm/mm/mmu.c
4351 @@ -40,6 +40,22 @@
4352 #include "mm.h"
4353 #include "tcm.h"
4354
4355 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4356 +void modify_domain(unsigned int dom, unsigned int type)
4357 +{
4358 + struct thread_info *thread = current_thread_info();
4359 + unsigned int domain = thread->cpu_domain;
4360 + /*
4361 + * DOMAIN_MANAGER might be defined to some other value,
4362 + * use the arch-defined constant
4363 + */
4364 + domain &= ~domain_val(dom, 3);
4365 + thread->cpu_domain = domain | domain_val(dom, type);
4366 + set_domain(thread->cpu_domain);
4367 +}
4368 +EXPORT_SYMBOL(modify_domain);
4369 +#endif
4370 +
4371 /*
4372 * empty_zero_page is a special page that is used for
4373 * zero-initialized data and COW.
4374 @@ -239,7 +255,15 @@ __setup("noalign", noalign_setup);
4375 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4376 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4377
4378 -static struct mem_type mem_types[] = {
4379 +#ifdef CONFIG_PAX_KERNEXEC
4380 +#define L_PTE_KERNEXEC L_PTE_RDONLY
4381 +#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4382 +#else
4383 +#define L_PTE_KERNEXEC L_PTE_DIRTY
4384 +#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4385 +#endif
4386 +
4387 +static struct mem_type mem_types[] __read_only = {
4388 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4389 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4390 L_PTE_SHARED,
4391 @@ -268,19 +292,19 @@ static struct mem_type mem_types[] = {
4392 .prot_sect = PROT_SECT_DEVICE,
4393 .domain = DOMAIN_IO,
4394 },
4395 - [MT_UNCACHED] = {
4396 + [MT_UNCACHED_RW] = {
4397 .prot_pte = PROT_PTE_DEVICE,
4398 .prot_l1 = PMD_TYPE_TABLE,
4399 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4400 .domain = DOMAIN_IO,
4401 },
4402 - [MT_CACHECLEAN] = {
4403 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4404 + [MT_CACHECLEAN_RO] = {
4405 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4406 .domain = DOMAIN_KERNEL,
4407 },
4408 #ifndef CONFIG_ARM_LPAE
4409 - [MT_MINICLEAN] = {
4410 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4411 + [MT_MINICLEAN_RO] = {
4412 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4413 .domain = DOMAIN_KERNEL,
4414 },
4415 #endif
4416 @@ -288,15 +312,15 @@ static struct mem_type mem_types[] = {
4417 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4418 L_PTE_RDONLY,
4419 .prot_l1 = PMD_TYPE_TABLE,
4420 - .domain = DOMAIN_USER,
4421 + .domain = DOMAIN_VECTORS,
4422 },
4423 [MT_HIGH_VECTORS] = {
4424 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4425 L_PTE_USER | L_PTE_RDONLY,
4426 .prot_l1 = PMD_TYPE_TABLE,
4427 - .domain = DOMAIN_USER,
4428 + .domain = DOMAIN_VECTORS,
4429 },
4430 - [MT_MEMORY_RWX] = {
4431 + [__MT_MEMORY_RWX] = {
4432 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4433 .prot_l1 = PMD_TYPE_TABLE,
4434 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4435 @@ -309,17 +333,30 @@ static struct mem_type mem_types[] = {
4436 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4437 .domain = DOMAIN_KERNEL,
4438 },
4439 - [MT_ROM] = {
4440 - .prot_sect = PMD_TYPE_SECT,
4441 + [MT_MEMORY_RX] = {
4442 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4443 + .prot_l1 = PMD_TYPE_TABLE,
4444 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4445 + .domain = DOMAIN_KERNEL,
4446 + },
4447 + [MT_ROM_RX] = {
4448 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4449 .domain = DOMAIN_KERNEL,
4450 },
4451 - [MT_MEMORY_RWX_NONCACHED] = {
4452 + [MT_MEMORY_RW_NONCACHED] = {
4453 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4454 L_PTE_MT_BUFFERABLE,
4455 .prot_l1 = PMD_TYPE_TABLE,
4456 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4457 .domain = DOMAIN_KERNEL,
4458 },
4459 + [MT_MEMORY_RX_NONCACHED] = {
4460 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4461 + L_PTE_MT_BUFFERABLE,
4462 + .prot_l1 = PMD_TYPE_TABLE,
4463 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4464 + .domain = DOMAIN_KERNEL,
4465 + },
4466 [MT_MEMORY_RW_DTCM] = {
4467 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4468 L_PTE_XN,
4469 @@ -327,9 +364,10 @@ static struct mem_type mem_types[] = {
4470 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4471 .domain = DOMAIN_KERNEL,
4472 },
4473 - [MT_MEMORY_RWX_ITCM] = {
4474 - .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4475 + [MT_MEMORY_RX_ITCM] = {
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_MEMORY_RW_SO] = {
4482 @@ -547,9 +585,14 @@ static void __init build_mem_type_table(void)
4483 * Mark cache clean areas and XIP ROM read only
4484 * from SVC mode and no access from userspace.
4485 */
4486 - mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4487 - mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4488 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4489 + mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4490 +#ifdef CONFIG_PAX_KERNEXEC
4491 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4492 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4493 + mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4494 +#endif
4495 + mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4496 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4497 #endif
4498
4499 /*
4500 @@ -566,13 +609,17 @@ static void __init build_mem_type_table(void)
4501 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4502 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4503 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4504 - mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4505 - mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4506 + mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4507 + mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4508 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4509 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4510 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4511 + mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4512 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4513 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4514 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4515 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4516 + mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4517 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4518 + mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4519 }
4520 }
4521
4522 @@ -583,15 +630,20 @@ static void __init build_mem_type_table(void)
4523 if (cpu_arch >= CPU_ARCH_ARMv6) {
4524 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4525 /* Non-cacheable Normal is XCB = 001 */
4526 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4527 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4528 + PMD_SECT_BUFFERED;
4529 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4530 PMD_SECT_BUFFERED;
4531 } else {
4532 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4533 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4534 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4535 + PMD_SECT_TEX(1);
4536 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4537 PMD_SECT_TEX(1);
4538 }
4539 } else {
4540 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4541 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4542 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4543 }
4544
4545 #ifdef CONFIG_ARM_LPAE
4546 @@ -607,6 +659,8 @@ static void __init build_mem_type_table(void)
4547 vecs_pgprot |= PTE_EXT_AF;
4548 #endif
4549
4550 + user_pgprot |= __supported_pte_mask;
4551 +
4552 for (i = 0; i < 16; i++) {
4553 pteval_t v = pgprot_val(protection_map[i]);
4554 protection_map[i] = __pgprot(v | user_pgprot);
4555 @@ -624,21 +678,24 @@ static void __init build_mem_type_table(void)
4556
4557 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4558 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4559 - mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4560 - mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4561 + mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4562 + mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4563 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4564 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4565 + mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4566 + mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4567 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4568 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4569 - mem_types[MT_ROM].prot_sect |= cp->pmd;
4570 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4571 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4572 + mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4573
4574 switch (cp->pmd) {
4575 case PMD_SECT_WT:
4576 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4577 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4578 break;
4579 case PMD_SECT_WB:
4580 case PMD_SECT_WBWA:
4581 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4582 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4583 break;
4584 }
4585 pr_info("Memory policy: %sData cache %s\n",
4586 @@ -856,7 +913,7 @@ static void __init create_mapping(struct map_desc *md)
4587 return;
4588 }
4589
4590 - if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4591 + if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4592 md->virtual >= PAGE_OFFSET &&
4593 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4594 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4595 @@ -1224,18 +1281,15 @@ void __init arm_mm_memblock_reserve(void)
4596 * called function. This means you can't use any function or debugging
4597 * method which may touch any device, otherwise the kernel _will_ crash.
4598 */
4599 +
4600 +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4601 +
4602 static void __init devicemaps_init(const struct machine_desc *mdesc)
4603 {
4604 struct map_desc map;
4605 unsigned long addr;
4606 - void *vectors;
4607
4608 - /*
4609 - * Allocate the vector page early.
4610 - */
4611 - vectors = early_alloc(PAGE_SIZE * 2);
4612 -
4613 - early_trap_init(vectors);
4614 + early_trap_init(&vectors);
4615
4616 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4617 pmd_clear(pmd_off_k(addr));
4618 @@ -1248,7 +1302,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4619 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4620 map.virtual = MODULES_VADDR;
4621 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4622 - map.type = MT_ROM;
4623 + map.type = MT_ROM_RX;
4624 create_mapping(&map);
4625 #endif
4626
4627 @@ -1259,14 +1313,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4628 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4629 map.virtual = FLUSH_BASE;
4630 map.length = SZ_1M;
4631 - map.type = MT_CACHECLEAN;
4632 + map.type = MT_CACHECLEAN_RO;
4633 create_mapping(&map);
4634 #endif
4635 #ifdef FLUSH_BASE_MINICACHE
4636 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4637 map.virtual = FLUSH_BASE_MINICACHE;
4638 map.length = SZ_1M;
4639 - map.type = MT_MINICLEAN;
4640 + map.type = MT_MINICLEAN_RO;
4641 create_mapping(&map);
4642 #endif
4643
4644 @@ -1275,7 +1329,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4645 * location (0xffff0000). If we aren't using high-vectors, also
4646 * create a mapping at the low-vectors virtual address.
4647 */
4648 - map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4649 + map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4650 map.virtual = 0xffff0000;
4651 map.length = PAGE_SIZE;
4652 #ifdef CONFIG_KUSER_HELPERS
4653 @@ -1335,8 +1389,10 @@ static void __init kmap_init(void)
4654 static void __init map_lowmem(void)
4655 {
4656 struct memblock_region *reg;
4657 +#ifndef CONFIG_PAX_KERNEXEC
4658 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4659 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4660 +#endif
4661
4662 /* Map all the lowmem memory banks. */
4663 for_each_memblock(memory, reg) {
4664 @@ -1349,11 +1405,48 @@ static void __init map_lowmem(void)
4665 if (start >= end)
4666 break;
4667
4668 +#ifdef CONFIG_PAX_KERNEXEC
4669 + map.pfn = __phys_to_pfn(start);
4670 + map.virtual = __phys_to_virt(start);
4671 + map.length = end - start;
4672 +
4673 + if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4674 + struct map_desc kernel;
4675 + struct map_desc initmap;
4676 +
4677 + /* when freeing initmem we will make this RW */
4678 + initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4679 + initmap.virtual = (unsigned long)__init_begin;
4680 + initmap.length = _sdata - __init_begin;
4681 + initmap.type = __MT_MEMORY_RWX;
4682 + create_mapping(&initmap);
4683 +
4684 + /* when freeing initmem we will make this RX */
4685 + kernel.pfn = __phys_to_pfn(__pa(_stext));
4686 + kernel.virtual = (unsigned long)_stext;
4687 + kernel.length = __init_begin - _stext;
4688 + kernel.type = __MT_MEMORY_RWX;
4689 + create_mapping(&kernel);
4690 +
4691 + if (map.virtual < (unsigned long)_stext) {
4692 + map.length = (unsigned long)_stext - map.virtual;
4693 + map.type = __MT_MEMORY_RWX;
4694 + create_mapping(&map);
4695 + }
4696 +
4697 + map.pfn = __phys_to_pfn(__pa(_sdata));
4698 + map.virtual = (unsigned long)_sdata;
4699 + map.length = end - __pa(_sdata);
4700 + }
4701 +
4702 + map.type = MT_MEMORY_RW;
4703 + create_mapping(&map);
4704 +#else
4705 if (end < kernel_x_start || start >= kernel_x_end) {
4706 map.pfn = __phys_to_pfn(start);
4707 map.virtual = __phys_to_virt(start);
4708 map.length = end - start;
4709 - map.type = MT_MEMORY_RWX;
4710 + map.type = __MT_MEMORY_RWX;
4711
4712 create_mapping(&map);
4713 } else {
4714 @@ -1370,7 +1463,7 @@ static void __init map_lowmem(void)
4715 map.pfn = __phys_to_pfn(kernel_x_start);
4716 map.virtual = __phys_to_virt(kernel_x_start);
4717 map.length = kernel_x_end - kernel_x_start;
4718 - map.type = MT_MEMORY_RWX;
4719 + map.type = __MT_MEMORY_RWX;
4720
4721 create_mapping(&map);
4722
4723 @@ -1383,6 +1476,7 @@ static void __init map_lowmem(void)
4724 create_mapping(&map);
4725 }
4726 }
4727 +#endif
4728 }
4729 }
4730
4731 diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4732 index e1268f9..a9755a7 100644
4733 --- a/arch/arm/net/bpf_jit_32.c
4734 +++ b/arch/arm/net/bpf_jit_32.c
4735 @@ -20,6 +20,7 @@
4736 #include <asm/cacheflush.h>
4737 #include <asm/hwcap.h>
4738 #include <asm/opcodes.h>
4739 +#include <asm/pgtable.h>
4740
4741 #include "bpf_jit_32.h"
4742
4743 @@ -71,7 +72,11 @@ struct jit_ctx {
4744 #endif
4745 };
4746
4747 +#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4748 +int bpf_jit_enable __read_only;
4749 +#else
4750 int bpf_jit_enable __read_mostly;
4751 +#endif
4752
4753 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4754 {
4755 @@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4756 {
4757 u32 *ptr;
4758 /* We are guaranteed to have aligned memory. */
4759 + pax_open_kernel();
4760 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4761 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4762 + pax_close_kernel();
4763 }
4764
4765 static void build_prologue(struct jit_ctx *ctx)
4766 diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4767 index 5b217f4..c23f40e 100644
4768 --- a/arch/arm/plat-iop/setup.c
4769 +++ b/arch/arm/plat-iop/setup.c
4770 @@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4771 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4772 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4773 .length = IOP3XX_PERIPHERAL_SIZE,
4774 - .type = MT_UNCACHED,
4775 + .type = MT_UNCACHED_RW,
4776 },
4777 };
4778
4779 diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4780 index a5bc92d..0bb4730 100644
4781 --- a/arch/arm/plat-omap/sram.c
4782 +++ b/arch/arm/plat-omap/sram.c
4783 @@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4784 * Looks like we need to preserve some bootloader code at the
4785 * beginning of SRAM for jumping to flash for reboot to work...
4786 */
4787 + pax_open_kernel();
4788 memset_io(omap_sram_base + omap_sram_skip, 0,
4789 omap_sram_size - omap_sram_skip);
4790 + pax_close_kernel();
4791 }
4792 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4793 index ce6d763..cfea917 100644
4794 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4795 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4796 @@ -47,7 +47,7 @@ struct samsung_dma_ops {
4797 int (*started)(unsigned ch);
4798 int (*flush)(unsigned ch);
4799 int (*stop)(unsigned ch);
4800 -};
4801 +} __no_const;
4802
4803 extern void *samsung_dmadev_get_ops(void);
4804 extern void *s3c_dma_get_ops(void);
4805 diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4806 index 6389d60..b5d3bdd 100644
4807 --- a/arch/arm64/include/asm/barrier.h
4808 +++ b/arch/arm64/include/asm/barrier.h
4809 @@ -41,7 +41,7 @@
4810 do { \
4811 compiletime_assert_atomic_type(*p); \
4812 barrier(); \
4813 - ACCESS_ONCE(*p) = (v); \
4814 + ACCESS_ONCE_RW(*p) = (v); \
4815 } while (0)
4816
4817 #define smp_load_acquire(p) \
4818 diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4819 index 3bf8f4e..5dd5491 100644
4820 --- a/arch/arm64/include/asm/uaccess.h
4821 +++ b/arch/arm64/include/asm/uaccess.h
4822 @@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4823 flag; \
4824 })
4825
4826 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4827 #define access_ok(type, addr, size) __range_ok(addr, size)
4828 #define user_addr_max get_fs
4829
4830 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4831 index c3a58a1..78fbf54 100644
4832 --- a/arch/avr32/include/asm/cache.h
4833 +++ b/arch/avr32/include/asm/cache.h
4834 @@ -1,8 +1,10 @@
4835 #ifndef __ASM_AVR32_CACHE_H
4836 #define __ASM_AVR32_CACHE_H
4837
4838 +#include <linux/const.h>
4839 +
4840 #define L1_CACHE_SHIFT 5
4841 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4842 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4843
4844 /*
4845 * Memory returned by kmalloc() may be used for DMA, so we must make
4846 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4847 index d232888..87c8df1 100644
4848 --- a/arch/avr32/include/asm/elf.h
4849 +++ b/arch/avr32/include/asm/elf.h
4850 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4851 the loader. We need to make sure that it is out of the way of the program
4852 that it will "exec", and that there is sufficient room for the brk. */
4853
4854 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4855 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4856
4857 +#ifdef CONFIG_PAX_ASLR
4858 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4859 +
4860 +#define PAX_DELTA_MMAP_LEN 15
4861 +#define PAX_DELTA_STACK_LEN 15
4862 +#endif
4863
4864 /* This yields a mask that user programs can use to figure out what
4865 instruction set this CPU supports. This could be done in user space,
4866 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4867 index 479330b..53717a8 100644
4868 --- a/arch/avr32/include/asm/kmap_types.h
4869 +++ b/arch/avr32/include/asm/kmap_types.h
4870 @@ -2,9 +2,9 @@
4871 #define __ASM_AVR32_KMAP_TYPES_H
4872
4873 #ifdef CONFIG_DEBUG_HIGHMEM
4874 -# define KM_TYPE_NR 29
4875 +# define KM_TYPE_NR 30
4876 #else
4877 -# define KM_TYPE_NR 14
4878 +# define KM_TYPE_NR 15
4879 #endif
4880
4881 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4882 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4883 index 0eca933..eb78c7b 100644
4884 --- a/arch/avr32/mm/fault.c
4885 +++ b/arch/avr32/mm/fault.c
4886 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4887
4888 int exception_trace = 1;
4889
4890 +#ifdef CONFIG_PAX_PAGEEXEC
4891 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4892 +{
4893 + unsigned long i;
4894 +
4895 + printk(KERN_ERR "PAX: bytes at PC: ");
4896 + for (i = 0; i < 20; i++) {
4897 + unsigned char c;
4898 + if (get_user(c, (unsigned char *)pc+i))
4899 + printk(KERN_CONT "???????? ");
4900 + else
4901 + printk(KERN_CONT "%02x ", c);
4902 + }
4903 + printk("\n");
4904 +}
4905 +#endif
4906 +
4907 /*
4908 * This routine handles page faults. It determines the address and the
4909 * problem, and then passes it off to one of the appropriate routines.
4910 @@ -176,6 +193,16 @@ bad_area:
4911 up_read(&mm->mmap_sem);
4912
4913 if (user_mode(regs)) {
4914 +
4915 +#ifdef CONFIG_PAX_PAGEEXEC
4916 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4917 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4918 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4919 + do_group_exit(SIGKILL);
4920 + }
4921 + }
4922 +#endif
4923 +
4924 if (exception_trace && printk_ratelimit())
4925 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4926 "sp %08lx ecr %lu\n",
4927 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4928 index 568885a..f8008df 100644
4929 --- a/arch/blackfin/include/asm/cache.h
4930 +++ b/arch/blackfin/include/asm/cache.h
4931 @@ -7,6 +7,7 @@
4932 #ifndef __ARCH_BLACKFIN_CACHE_H
4933 #define __ARCH_BLACKFIN_CACHE_H
4934
4935 +#include <linux/const.h>
4936 #include <linux/linkage.h> /* for asmlinkage */
4937
4938 /*
4939 @@ -14,7 +15,7 @@
4940 * Blackfin loads 32 bytes for cache
4941 */
4942 #define L1_CACHE_SHIFT 5
4943 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4944 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4945 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4946
4947 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4948 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4949 index aea2718..3639a60 100644
4950 --- a/arch/cris/include/arch-v10/arch/cache.h
4951 +++ b/arch/cris/include/arch-v10/arch/cache.h
4952 @@ -1,8 +1,9 @@
4953 #ifndef _ASM_ARCH_CACHE_H
4954 #define _ASM_ARCH_CACHE_H
4955
4956 +#include <linux/const.h>
4957 /* Etrax 100LX have 32-byte cache-lines. */
4958 -#define L1_CACHE_BYTES 32
4959 #define L1_CACHE_SHIFT 5
4960 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4961
4962 #endif /* _ASM_ARCH_CACHE_H */
4963 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4964 index 7caf25d..ee65ac5 100644
4965 --- a/arch/cris/include/arch-v32/arch/cache.h
4966 +++ b/arch/cris/include/arch-v32/arch/cache.h
4967 @@ -1,11 +1,12 @@
4968 #ifndef _ASM_CRIS_ARCH_CACHE_H
4969 #define _ASM_CRIS_ARCH_CACHE_H
4970
4971 +#include <linux/const.h>
4972 #include <arch/hwregs/dma.h>
4973
4974 /* A cache-line is 32 bytes. */
4975 -#define L1_CACHE_BYTES 32
4976 #define L1_CACHE_SHIFT 5
4977 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4978
4979 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4980
4981 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4982 index 102190a..5334cea 100644
4983 --- a/arch/frv/include/asm/atomic.h
4984 +++ b/arch/frv/include/asm/atomic.h
4985 @@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
4986 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4987 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4988
4989 +#define atomic64_read_unchecked(v) atomic64_read(v)
4990 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4991 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4992 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4993 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4994 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
4995 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4996 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
4997 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4998 +
4999 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5000 {
5001 int c, old;
5002 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5003 index 2797163..c2a401df9 100644
5004 --- a/arch/frv/include/asm/cache.h
5005 +++ b/arch/frv/include/asm/cache.h
5006 @@ -12,10 +12,11 @@
5007 #ifndef __ASM_CACHE_H
5008 #define __ASM_CACHE_H
5009
5010 +#include <linux/const.h>
5011
5012 /* bytes per L1 cache line */
5013 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5014 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5015 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5016
5017 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5018 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5019 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5020 index 43901f2..0d8b865 100644
5021 --- a/arch/frv/include/asm/kmap_types.h
5022 +++ b/arch/frv/include/asm/kmap_types.h
5023 @@ -2,6 +2,6 @@
5024 #ifndef _ASM_KMAP_TYPES_H
5025 #define _ASM_KMAP_TYPES_H
5026
5027 -#define KM_TYPE_NR 17
5028 +#define KM_TYPE_NR 18
5029
5030 #endif
5031 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5032 index 836f147..4cf23f5 100644
5033 --- a/arch/frv/mm/elf-fdpic.c
5034 +++ b/arch/frv/mm/elf-fdpic.c
5035 @@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5036 {
5037 struct vm_area_struct *vma;
5038 struct vm_unmapped_area_info info;
5039 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5040
5041 if (len > TASK_SIZE)
5042 return -ENOMEM;
5043 @@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5044 if (addr) {
5045 addr = PAGE_ALIGN(addr);
5046 vma = find_vma(current->mm, addr);
5047 - if (TASK_SIZE - len >= addr &&
5048 - (!vma || addr + len <= vma->vm_start))
5049 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5050 goto success;
5051 }
5052
5053 @@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5054 info.high_limit = (current->mm->start_stack - 0x00200000);
5055 info.align_mask = 0;
5056 info.align_offset = 0;
5057 + info.threadstack_offset = offset;
5058 addr = vm_unmapped_area(&info);
5059 if (!(addr & ~PAGE_MASK))
5060 goto success;
5061 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5062 index 2635117..fa223cb 100644
5063 --- a/arch/hexagon/include/asm/cache.h
5064 +++ b/arch/hexagon/include/asm/cache.h
5065 @@ -21,9 +21,11 @@
5066 #ifndef __ASM_CACHE_H
5067 #define __ASM_CACHE_H
5068
5069 +#include <linux/const.h>
5070 +
5071 /* Bytes per L1 cache line */
5072 -#define L1_CACHE_SHIFT (5)
5073 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5074 +#define L1_CACHE_SHIFT 5
5075 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5076
5077 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5078 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5079 diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5080 index c84c88b..2a6e1ba 100644
5081 --- a/arch/ia64/Kconfig
5082 +++ b/arch/ia64/Kconfig
5083 @@ -549,6 +549,7 @@ source "drivers/sn/Kconfig"
5084 config KEXEC
5085 bool "kexec system call"
5086 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5087 + depends on !GRKERNSEC_KMEM
5088 help
5089 kexec is a system call that implements the ability to shutdown your
5090 current kernel, and to start another kernel. It is like a reboot
5091 diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5092 index 5441b14..039a446 100644
5093 --- a/arch/ia64/Makefile
5094 +++ b/arch/ia64/Makefile
5095 @@ -99,5 +99,6 @@ endef
5096 archprepare: make_nr_irqs_h FORCE
5097 PHONY += make_nr_irqs_h FORCE
5098
5099 +make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5100 make_nr_irqs_h: FORCE
5101 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5102 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5103 index 0bf0350..2ad1957 100644
5104 --- a/arch/ia64/include/asm/atomic.h
5105 +++ b/arch/ia64/include/asm/atomic.h
5106 @@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5107 #define atomic64_inc(v) atomic64_add(1, (v))
5108 #define atomic64_dec(v) atomic64_sub(1, (v))
5109
5110 +#define atomic64_read_unchecked(v) atomic64_read(v)
5111 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5112 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5113 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5114 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5115 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
5116 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5117 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
5118 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5119 +
5120 #endif /* _ASM_IA64_ATOMIC_H */
5121 diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5122 index a48957c..e097b56 100644
5123 --- a/arch/ia64/include/asm/barrier.h
5124 +++ b/arch/ia64/include/asm/barrier.h
5125 @@ -67,7 +67,7 @@
5126 do { \
5127 compiletime_assert_atomic_type(*p); \
5128 barrier(); \
5129 - ACCESS_ONCE(*p) = (v); \
5130 + ACCESS_ONCE_RW(*p) = (v); \
5131 } while (0)
5132
5133 #define smp_load_acquire(p) \
5134 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5135 index 988254a..e1ee885 100644
5136 --- a/arch/ia64/include/asm/cache.h
5137 +++ b/arch/ia64/include/asm/cache.h
5138 @@ -1,6 +1,7 @@
5139 #ifndef _ASM_IA64_CACHE_H
5140 #define _ASM_IA64_CACHE_H
5141
5142 +#include <linux/const.h>
5143
5144 /*
5145 * Copyright (C) 1998-2000 Hewlett-Packard Co
5146 @@ -9,7 +10,7 @@
5147
5148 /* Bytes per L1 (data) cache line. */
5149 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5150 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5151 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5152
5153 #ifdef CONFIG_SMP
5154 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5155 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5156 index 5a83c5c..4d7f553 100644
5157 --- a/arch/ia64/include/asm/elf.h
5158 +++ b/arch/ia64/include/asm/elf.h
5159 @@ -42,6 +42,13 @@
5160 */
5161 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5162
5163 +#ifdef CONFIG_PAX_ASLR
5164 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5165 +
5166 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5167 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5168 +#endif
5169 +
5170 #define PT_IA_64_UNWIND 0x70000001
5171
5172 /* IA-64 relocations: */
5173 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5174 index 5767cdf..7462574 100644
5175 --- a/arch/ia64/include/asm/pgalloc.h
5176 +++ b/arch/ia64/include/asm/pgalloc.h
5177 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5178 pgd_val(*pgd_entry) = __pa(pud);
5179 }
5180
5181 +static inline void
5182 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5183 +{
5184 + pgd_populate(mm, pgd_entry, pud);
5185 +}
5186 +
5187 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5188 {
5189 return quicklist_alloc(0, GFP_KERNEL, NULL);
5190 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5191 pud_val(*pud_entry) = __pa(pmd);
5192 }
5193
5194 +static inline void
5195 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5196 +{
5197 + pud_populate(mm, pud_entry, pmd);
5198 +}
5199 +
5200 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5201 {
5202 return quicklist_alloc(0, GFP_KERNEL, NULL);
5203 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5204 index 7935115..c0eca6a 100644
5205 --- a/arch/ia64/include/asm/pgtable.h
5206 +++ b/arch/ia64/include/asm/pgtable.h
5207 @@ -12,7 +12,7 @@
5208 * David Mosberger-Tang <davidm@hpl.hp.com>
5209 */
5210
5211 -
5212 +#include <linux/const.h>
5213 #include <asm/mman.h>
5214 #include <asm/page.h>
5215 #include <asm/processor.h>
5216 @@ -142,6 +142,17 @@
5217 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5218 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5219 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5220 +
5221 +#ifdef CONFIG_PAX_PAGEEXEC
5222 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5223 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5224 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5225 +#else
5226 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
5227 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
5228 +# define PAGE_COPY_NOEXEC PAGE_COPY
5229 +#endif
5230 +
5231 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5232 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5233 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5234 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5235 index 45698cd..e8e2dbc 100644
5236 --- a/arch/ia64/include/asm/spinlock.h
5237 +++ b/arch/ia64/include/asm/spinlock.h
5238 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5239 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5240
5241 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5242 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5243 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5244 }
5245
5246 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5247 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5248 index 449c8c0..3d4b1e9 100644
5249 --- a/arch/ia64/include/asm/uaccess.h
5250 +++ b/arch/ia64/include/asm/uaccess.h
5251 @@ -70,6 +70,7 @@
5252 && ((segment).seg == KERNEL_DS.seg \
5253 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5254 })
5255 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5256 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5257
5258 /*
5259 @@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5260 static inline unsigned long
5261 __copy_to_user (void __user *to, const void *from, unsigned long count)
5262 {
5263 + if (count > INT_MAX)
5264 + return count;
5265 +
5266 + if (!__builtin_constant_p(count))
5267 + check_object_size(from, count, true);
5268 +
5269 return __copy_user(to, (__force void __user *) from, count);
5270 }
5271
5272 static inline unsigned long
5273 __copy_from_user (void *to, const void __user *from, unsigned long count)
5274 {
5275 + if (count > INT_MAX)
5276 + return count;
5277 +
5278 + if (!__builtin_constant_p(count))
5279 + check_object_size(to, count, false);
5280 +
5281 return __copy_user((__force void __user *) to, from, count);
5282 }
5283
5284 @@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5285 ({ \
5286 void __user *__cu_to = (to); \
5287 const void *__cu_from = (from); \
5288 - long __cu_len = (n); \
5289 + unsigned long __cu_len = (n); \
5290 \
5291 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
5292 + if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5293 + if (!__builtin_constant_p(n)) \
5294 + check_object_size(__cu_from, __cu_len, true); \
5295 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5296 + } \
5297 __cu_len; \
5298 })
5299
5300 @@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5301 ({ \
5302 void *__cu_to = (to); \
5303 const void __user *__cu_from = (from); \
5304 - long __cu_len = (n); \
5305 + unsigned long __cu_len = (n); \
5306 \
5307 __chk_user_ptr(__cu_from); \
5308 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
5309 + if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5310 + if (!__builtin_constant_p(n)) \
5311 + check_object_size(__cu_to, __cu_len, false); \
5312 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5313 + } \
5314 __cu_len; \
5315 })
5316
5317 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5318 index 24603be..948052d 100644
5319 --- a/arch/ia64/kernel/module.c
5320 +++ b/arch/ia64/kernel/module.c
5321 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5322 void
5323 module_free (struct module *mod, void *module_region)
5324 {
5325 - if (mod && mod->arch.init_unw_table &&
5326 - module_region == mod->module_init) {
5327 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5328 unw_remove_unwind_table(mod->arch.init_unw_table);
5329 mod->arch.init_unw_table = NULL;
5330 }
5331 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5332 }
5333
5334 static inline int
5335 +in_init_rx (const struct module *mod, uint64_t addr)
5336 +{
5337 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5338 +}
5339 +
5340 +static inline int
5341 +in_init_rw (const struct module *mod, uint64_t addr)
5342 +{
5343 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5344 +}
5345 +
5346 +static inline int
5347 in_init (const struct module *mod, uint64_t addr)
5348 {
5349 - return addr - (uint64_t) mod->module_init < mod->init_size;
5350 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5351 +}
5352 +
5353 +static inline int
5354 +in_core_rx (const struct module *mod, uint64_t addr)
5355 +{
5356 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5357 +}
5358 +
5359 +static inline int
5360 +in_core_rw (const struct module *mod, uint64_t addr)
5361 +{
5362 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5363 }
5364
5365 static inline int
5366 in_core (const struct module *mod, uint64_t addr)
5367 {
5368 - return addr - (uint64_t) mod->module_core < mod->core_size;
5369 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5370 }
5371
5372 static inline int
5373 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5374 break;
5375
5376 case RV_BDREL:
5377 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5378 + if (in_init_rx(mod, val))
5379 + val -= (uint64_t) mod->module_init_rx;
5380 + else if (in_init_rw(mod, val))
5381 + val -= (uint64_t) mod->module_init_rw;
5382 + else if (in_core_rx(mod, val))
5383 + val -= (uint64_t) mod->module_core_rx;
5384 + else if (in_core_rw(mod, val))
5385 + val -= (uint64_t) mod->module_core_rw;
5386 break;
5387
5388 case RV_LTV:
5389 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5390 * addresses have been selected...
5391 */
5392 uint64_t gp;
5393 - if (mod->core_size > MAX_LTOFF)
5394 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5395 /*
5396 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5397 * at the end of the module.
5398 */
5399 - gp = mod->core_size - MAX_LTOFF / 2;
5400 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5401 else
5402 - gp = mod->core_size / 2;
5403 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5404 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5405 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5406 mod->arch.gp = gp;
5407 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5408 }
5409 diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5410 index c39c3cd..3c77738 100644
5411 --- a/arch/ia64/kernel/palinfo.c
5412 +++ b/arch/ia64/kernel/palinfo.c
5413 @@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5414 return NOTIFY_OK;
5415 }
5416
5417 -static struct notifier_block __refdata palinfo_cpu_notifier =
5418 +static struct notifier_block palinfo_cpu_notifier =
5419 {
5420 .notifier_call = palinfo_cpu_callback,
5421 .priority = 0,
5422 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5423 index 41e33f8..65180b2a 100644
5424 --- a/arch/ia64/kernel/sys_ia64.c
5425 +++ b/arch/ia64/kernel/sys_ia64.c
5426 @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5427 unsigned long align_mask = 0;
5428 struct mm_struct *mm = current->mm;
5429 struct vm_unmapped_area_info info;
5430 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5431
5432 if (len > RGN_MAP_LIMIT)
5433 return -ENOMEM;
5434 @@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5435 if (REGION_NUMBER(addr) == RGN_HPAGE)
5436 addr = 0;
5437 #endif
5438 +
5439 +#ifdef CONFIG_PAX_RANDMMAP
5440 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5441 + addr = mm->free_area_cache;
5442 + else
5443 +#endif
5444 +
5445 if (!addr)
5446 addr = TASK_UNMAPPED_BASE;
5447
5448 @@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5449 info.high_limit = TASK_SIZE;
5450 info.align_mask = align_mask;
5451 info.align_offset = 0;
5452 + info.threadstack_offset = offset;
5453 return vm_unmapped_area(&info);
5454 }
5455
5456 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5457 index 84f8a52..7c76178 100644
5458 --- a/arch/ia64/kernel/vmlinux.lds.S
5459 +++ b/arch/ia64/kernel/vmlinux.lds.S
5460 @@ -192,7 +192,7 @@ SECTIONS {
5461 /* Per-cpu data: */
5462 . = ALIGN(PERCPU_PAGE_SIZE);
5463 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5464 - __phys_per_cpu_start = __per_cpu_load;
5465 + __phys_per_cpu_start = per_cpu_load;
5466 /*
5467 * ensure percpu data fits
5468 * into percpu page size
5469 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5470 index 7225dad..2a7c8256 100644
5471 --- a/arch/ia64/mm/fault.c
5472 +++ b/arch/ia64/mm/fault.c
5473 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5474 return pte_present(pte);
5475 }
5476
5477 +#ifdef CONFIG_PAX_PAGEEXEC
5478 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5479 +{
5480 + unsigned long i;
5481 +
5482 + printk(KERN_ERR "PAX: bytes at PC: ");
5483 + for (i = 0; i < 8; i++) {
5484 + unsigned int c;
5485 + if (get_user(c, (unsigned int *)pc+i))
5486 + printk(KERN_CONT "???????? ");
5487 + else
5488 + printk(KERN_CONT "%08x ", c);
5489 + }
5490 + printk("\n");
5491 +}
5492 +#endif
5493 +
5494 # define VM_READ_BIT 0
5495 # define VM_WRITE_BIT 1
5496 # define VM_EXEC_BIT 2
5497 @@ -151,8 +168,21 @@ retry:
5498 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5499 goto bad_area;
5500
5501 - if ((vma->vm_flags & mask) != mask)
5502 + if ((vma->vm_flags & mask) != mask) {
5503 +
5504 +#ifdef CONFIG_PAX_PAGEEXEC
5505 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5506 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5507 + goto bad_area;
5508 +
5509 + up_read(&mm->mmap_sem);
5510 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5511 + do_group_exit(SIGKILL);
5512 + }
5513 +#endif
5514 +
5515 goto bad_area;
5516 + }
5517
5518 /*
5519 * If for any reason at all we couldn't handle the fault, make
5520 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5521 index 76069c1..c2aa816 100644
5522 --- a/arch/ia64/mm/hugetlbpage.c
5523 +++ b/arch/ia64/mm/hugetlbpage.c
5524 @@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5525 unsigned long pgoff, unsigned long flags)
5526 {
5527 struct vm_unmapped_area_info info;
5528 + unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5529
5530 if (len > RGN_MAP_LIMIT)
5531 return -ENOMEM;
5532 @@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5533 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5534 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5535 info.align_offset = 0;
5536 + info.threadstack_offset = offset;
5537 return vm_unmapped_area(&info);
5538 }
5539
5540 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5541 index 6b33457..88b5124 100644
5542 --- a/arch/ia64/mm/init.c
5543 +++ b/arch/ia64/mm/init.c
5544 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5545 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5546 vma->vm_end = vma->vm_start + PAGE_SIZE;
5547 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5548 +
5549 +#ifdef CONFIG_PAX_PAGEEXEC
5550 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5551 + vma->vm_flags &= ~VM_EXEC;
5552 +
5553 +#ifdef CONFIG_PAX_MPROTECT
5554 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
5555 + vma->vm_flags &= ~VM_MAYEXEC;
5556 +#endif
5557 +
5558 + }
5559 +#endif
5560 +
5561 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5562 down_write(&current->mm->mmap_sem);
5563 if (insert_vm_struct(current->mm, vma)) {
5564 @@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5565 gate_vma.vm_start = FIXADDR_USER_START;
5566 gate_vma.vm_end = FIXADDR_USER_END;
5567 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5568 - gate_vma.vm_page_prot = __P101;
5569 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5570
5571 return 0;
5572 }
5573 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5574 index 40b3ee9..8c2c112 100644
5575 --- a/arch/m32r/include/asm/cache.h
5576 +++ b/arch/m32r/include/asm/cache.h
5577 @@ -1,8 +1,10 @@
5578 #ifndef _ASM_M32R_CACHE_H
5579 #define _ASM_M32R_CACHE_H
5580
5581 +#include <linux/const.h>
5582 +
5583 /* L1 cache line size */
5584 #define L1_CACHE_SHIFT 4
5585 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5586 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5587
5588 #endif /* _ASM_M32R_CACHE_H */
5589 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5590 index 82abd15..d95ae5d 100644
5591 --- a/arch/m32r/lib/usercopy.c
5592 +++ b/arch/m32r/lib/usercopy.c
5593 @@ -14,6 +14,9 @@
5594 unsigned long
5595 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5596 {
5597 + if ((long)n < 0)
5598 + return n;
5599 +
5600 prefetch(from);
5601 if (access_ok(VERIFY_WRITE, to, n))
5602 __copy_user(to,from,n);
5603 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5604 unsigned long
5605 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5606 {
5607 + if ((long)n < 0)
5608 + return n;
5609 +
5610 prefetchw(to);
5611 if (access_ok(VERIFY_READ, from, n))
5612 __copy_user_zeroing(to,from,n);
5613 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5614 index 0395c51..5f26031 100644
5615 --- a/arch/m68k/include/asm/cache.h
5616 +++ b/arch/m68k/include/asm/cache.h
5617 @@ -4,9 +4,11 @@
5618 #ifndef __ARCH_M68K_CACHE_H
5619 #define __ARCH_M68K_CACHE_H
5620
5621 +#include <linux/const.h>
5622 +
5623 /* bytes per L1 cache line */
5624 #define L1_CACHE_SHIFT 4
5625 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5626 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5627
5628 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5629
5630 diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5631 index c7591e8..ecef036 100644
5632 --- a/arch/metag/include/asm/barrier.h
5633 +++ b/arch/metag/include/asm/barrier.h
5634 @@ -89,7 +89,7 @@ static inline void fence(void)
5635 do { \
5636 compiletime_assert_atomic_type(*p); \
5637 smp_mb(); \
5638 - ACCESS_ONCE(*p) = (v); \
5639 + ACCESS_ONCE_RW(*p) = (v); \
5640 } while (0)
5641
5642 #define smp_load_acquire(p) \
5643 diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5644 index 3c32075..ae0ae75 100644
5645 --- a/arch/metag/mm/hugetlbpage.c
5646 +++ b/arch/metag/mm/hugetlbpage.c
5647 @@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5648 info.high_limit = TASK_SIZE;
5649 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5650 info.align_offset = 0;
5651 + info.threadstack_offset = 0;
5652 return vm_unmapped_area(&info);
5653 }
5654
5655 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5656 index 4efe96a..60e8699 100644
5657 --- a/arch/microblaze/include/asm/cache.h
5658 +++ b/arch/microblaze/include/asm/cache.h
5659 @@ -13,11 +13,12 @@
5660 #ifndef _ASM_MICROBLAZE_CACHE_H
5661 #define _ASM_MICROBLAZE_CACHE_H
5662
5663 +#include <linux/const.h>
5664 #include <asm/registers.h>
5665
5666 #define L1_CACHE_SHIFT 5
5667 /* word-granular cache in microblaze */
5668 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5669 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5670
5671 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5672
5673 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5674 index 9536ef9..9333776 100644
5675 --- a/arch/mips/Kconfig
5676 +++ b/arch/mips/Kconfig
5677 @@ -2413,6 +2413,7 @@ source "kernel/Kconfig.preempt"
5678
5679 config KEXEC
5680 bool "Kexec system call"
5681 + depends on !GRKERNSEC_KMEM
5682 help
5683 kexec is a system call that implements the ability to shutdown your
5684 current kernel, and to start another kernel. It is like a reboot
5685 diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5686 index 02f2444..506969c 100644
5687 --- a/arch/mips/cavium-octeon/dma-octeon.c
5688 +++ b/arch/mips/cavium-octeon/dma-octeon.c
5689 @@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5690 if (dma_release_from_coherent(dev, order, vaddr))
5691 return;
5692
5693 - swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5694 + swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5695 }
5696
5697 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5698 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5699 index 6dd6bfc..903b0d6 100644
5700 --- a/arch/mips/include/asm/atomic.h
5701 +++ b/arch/mips/include/asm/atomic.h
5702 @@ -21,15 +21,39 @@
5703 #include <asm/cmpxchg.h>
5704 #include <asm/war.h>
5705
5706 +#ifdef CONFIG_GENERIC_ATOMIC64
5707 +#include <asm-generic/atomic64.h>
5708 +#endif
5709 +
5710 #define ATOMIC_INIT(i) { (i) }
5711
5712 +#ifdef CONFIG_64BIT
5713 +#define _ASM_EXTABLE(from, to) \
5714 +" .section __ex_table,\"a\"\n" \
5715 +" .dword " #from ", " #to"\n" \
5716 +" .previous\n"
5717 +#else
5718 +#define _ASM_EXTABLE(from, to) \
5719 +" .section __ex_table,\"a\"\n" \
5720 +" .word " #from ", " #to"\n" \
5721 +" .previous\n"
5722 +#endif
5723 +
5724 /*
5725 * atomic_read - read atomic variable
5726 * @v: pointer of type atomic_t
5727 *
5728 * Atomically reads the value of @v.
5729 */
5730 -#define atomic_read(v) ACCESS_ONCE((v)->counter)
5731 +static inline int atomic_read(const atomic_t *v)
5732 +{
5733 + return ACCESS_ONCE(v->counter);
5734 +}
5735 +
5736 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5737 +{
5738 + return ACCESS_ONCE(v->counter);
5739 +}
5740
5741 /*
5742 * atomic_set - set atomic variable
5743 @@ -38,47 +62,77 @@
5744 *
5745 * Atomically sets the value of @v to @i.
5746 */
5747 -#define atomic_set(v, i) ((v)->counter = (i))
5748 +static inline void atomic_set(atomic_t *v, int i)
5749 +{
5750 + v->counter = i;
5751 +}
5752
5753 -#define ATOMIC_OP(op, c_op, asm_op) \
5754 -static __inline__ void atomic_##op(int i, atomic_t * v) \
5755 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5756 +{
5757 + v->counter = i;
5758 +}
5759 +
5760 +#ifdef CONFIG_PAX_REFCOUNT
5761 +#define __OVERFLOW_POST \
5762 + " b 4f \n" \
5763 + " .set noreorder \n" \
5764 + "3: b 5f \n" \
5765 + " move %0, %1 \n" \
5766 + " .set reorder \n"
5767 +#define __OVERFLOW_EXTABLE \
5768 + "3:\n" \
5769 + _ASM_EXTABLE(2b, 3b)
5770 +#else
5771 +#define __OVERFLOW_POST
5772 +#define __OVERFLOW_EXTABLE
5773 +#endif
5774 +
5775 +#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5776 +static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5777 { \
5778 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5779 int temp; \
5780 \
5781 __asm__ __volatile__( \
5782 - " .set arch=r4000 \n" \
5783 - "1: ll %0, %1 # atomic_" #op " \n" \
5784 - " " #asm_op " %0, %2 \n" \
5785 + " .set mips3 \n" \
5786 + "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5787 + "2: " #asm_op " %0, %2 \n" \
5788 " sc %0, %1 \n" \
5789 " beqzl %0, 1b \n" \
5790 + extable \
5791 " .set mips0 \n" \
5792 : "=&r" (temp), "+m" (v->counter) \
5793 : "Ir" (i)); \
5794 } else if (kernel_uses_llsc) { \
5795 int temp; \
5796 \
5797 - do { \
5798 - __asm__ __volatile__( \
5799 - " .set arch=r4000 \n" \
5800 - " ll %0, %1 # atomic_" #op "\n" \
5801 - " " #asm_op " %0, %2 \n" \
5802 - " sc %0, %1 \n" \
5803 - " .set mips0 \n" \
5804 - : "=&r" (temp), "+m" (v->counter) \
5805 - : "Ir" (i)); \
5806 - } while (unlikely(!temp)); \
5807 + __asm__ __volatile__( \
5808 + " .set mips3 \n" \
5809 + " ll %0, %1 # atomic_" #op #suffix "\n" \
5810 + "2: " #asm_op " %0, %2 \n" \
5811 + " sc %0, %1 \n" \
5812 + " beqz %0, 1b \n" \
5813 + extable \
5814 + " .set mips0 \n" \
5815 + : "=&r" (temp), "+m" (v->counter) \
5816 + : "Ir" (i)); \
5817 } else { \
5818 unsigned long flags; \
5819 \
5820 raw_local_irq_save(flags); \
5821 - v->counter c_op i; \
5822 + __asm__ __volatile__( \
5823 + "2: " #asm_op " %0, %1 \n" \
5824 + extable \
5825 + : "+r" (v->counter) : "Ir" (i)); \
5826 raw_local_irq_restore(flags); \
5827 } \
5828 } \
5829
5830 -#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5831 -static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5832 +#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , asm_op##u) \
5833 + __ATOMIC_OP(op, _unchecked, asm_op)
5834 +
5835 +#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5836 +static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5837 { \
5838 int result; \
5839 \
5840 @@ -88,37 +142,47 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5841 int temp; \
5842 \
5843 __asm__ __volatile__( \
5844 - " .set arch=r4000 \n" \
5845 - "1: ll %1, %2 # atomic_" #op "_return \n" \
5846 - " " #asm_op " %0, %1, %3 \n" \
5847 + " .set mips3 \n" \
5848 + "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5849 + "2: " #asm_op " %0, %1, %3 \n" \
5850 " sc %0, %2 \n" \
5851 " beqzl %0, 1b \n" \
5852 - " " #asm_op " %0, %1, %3 \n" \
5853 + post_op \
5854 + extable \
5855 + "4: " #asm_op " %0, %1, %3 \n" \
5856 + "5: \n" \
5857 " .set mips0 \n" \
5858 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5859 : "Ir" (i)); \
5860 } else if (kernel_uses_llsc) { \
5861 int temp; \
5862 \
5863 - do { \
5864 - __asm__ __volatile__( \
5865 - " .set arch=r4000 \n" \
5866 - " ll %1, %2 # atomic_" #op "_return \n" \
5867 - " " #asm_op " %0, %1, %3 \n" \
5868 - " sc %0, %2 \n" \
5869 - " .set mips0 \n" \
5870 - : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5871 - : "Ir" (i)); \
5872 - } while (unlikely(!result)); \
5873 + __asm__ __volatile__( \
5874 + " .set mips3 \n" \
5875 + "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5876 + "2: " #asm_op " %0, %1, %3 \n" \
5877 + " sc %0, %2 \n" \
5878 + " beqz %0, 1b \n" \
5879 + post_op \
5880 + extable \
5881 + "4: " #asm_op " %0, %1, %3 \n" \
5882 + "5: \n" \
5883 + " .set mips0 \n" \
5884 + : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5885 + : "Ir" (i)); \
5886 \
5887 result = temp; result c_op i; \
5888 } else { \
5889 unsigned long flags; \
5890 \
5891 raw_local_irq_save(flags); \
5892 - result = v->counter; \
5893 - result c_op i; \
5894 - v->counter = result; \
5895 + __asm__ __volatile__( \
5896 + " lw %0, %1 \n" \
5897 + "2: " #asm_op " %0, %1, %2 \n" \
5898 + " sw %0, %1 \n" \
5899 + "3: \n" \
5900 + extable \
5901 + : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
5902 raw_local_irq_restore(flags); \
5903 } \
5904 \
5905 @@ -127,16 +191,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5906 return result; \
5907 }
5908
5909 -#define ATOMIC_OPS(op, c_op, asm_op) \
5910 - ATOMIC_OP(op, c_op, asm_op) \
5911 - ATOMIC_OP_RETURN(op, c_op, asm_op)
5912 +#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
5913 + __ATOMIC_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5914
5915 -ATOMIC_OPS(add, +=, addu)
5916 -ATOMIC_OPS(sub, -=, subu)
5917 +#define ATOMIC_OPS(op, asm_op) \
5918 + ATOMIC_OP(op, asm_op) \
5919 + ATOMIC_OP_RETURN(op, asm_op)
5920 +
5921 +ATOMIC_OPS(add, add)
5922 +ATOMIC_OPS(sub, sub)
5923
5924 #undef ATOMIC_OPS
5925 #undef ATOMIC_OP_RETURN
5926 +#undef __ATOMIC_OP_RETURN
5927 #undef ATOMIC_OP
5928 +#undef __ATOMIC_OP
5929
5930 /*
5931 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5932 @@ -146,7 +215,7 @@ ATOMIC_OPS(sub, -=, subu)
5933 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5934 * The function returns the old value of @v minus @i.
5935 */
5936 -static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5937 +static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5938 {
5939 int result;
5940
5941 @@ -203,8 +272,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5942 return result;
5943 }
5944
5945 -#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5946 -#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5947 +static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5948 +{
5949 + return cmpxchg(&v->counter, old, new);
5950 +}
5951 +
5952 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5953 + int new)
5954 +{
5955 + return cmpxchg(&(v->counter), old, new);
5956 +}
5957 +
5958 +static inline int atomic_xchg(atomic_t *v, int new)
5959 +{
5960 + return xchg(&v->counter, new);
5961 +}
5962 +
5963 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5964 +{
5965 + return xchg(&(v->counter), new);
5966 +}
5967
5968 /**
5969 * __atomic_add_unless - add unless the number is a given value
5970 @@ -232,6 +319,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5971
5972 #define atomic_dec_return(v) atomic_sub_return(1, (v))
5973 #define atomic_inc_return(v) atomic_add_return(1, (v))
5974 +static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
5975 +{
5976 + return atomic_add_return_unchecked(1, v);
5977 +}
5978
5979 /*
5980 * atomic_sub_and_test - subtract value from variable and test result
5981 @@ -253,6 +344,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5982 * other cases.
5983 */
5984 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
5985 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
5986 +{
5987 + return atomic_add_return_unchecked(1, v) == 0;
5988 +}
5989
5990 /*
5991 * atomic_dec_and_test - decrement by 1 and test
5992 @@ -277,6 +372,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5993 * Atomically increments @v by 1.
5994 */
5995 #define atomic_inc(v) atomic_add(1, (v))
5996 +static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
5997 +{
5998 + atomic_add_unchecked(1, v);
5999 +}
6000
6001 /*
6002 * atomic_dec - decrement and test
6003 @@ -285,6 +384,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6004 * Atomically decrements @v by 1.
6005 */
6006 #define atomic_dec(v) atomic_sub(1, (v))
6007 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6008 +{
6009 + atomic_sub_unchecked(1, v);
6010 +}
6011
6012 /*
6013 * atomic_add_negative - add and test if negative
6014 @@ -306,54 +409,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6015 * @v: pointer of type atomic64_t
6016 *
6017 */
6018 -#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6019 +static inline long atomic64_read(const atomic64_t *v)
6020 +{
6021 + return ACCESS_ONCE(v->counter);
6022 +}
6023 +
6024 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6025 +{
6026 + return ACCESS_ONCE(v->counter);
6027 +}
6028
6029 /*
6030 * atomic64_set - set atomic variable
6031 * @v: pointer of type atomic64_t
6032 * @i: required value
6033 */
6034 -#define atomic64_set(v, i) ((v)->counter = (i))
6035 +static inline void atomic64_set(atomic64_t *v, long i)
6036 +{
6037 + v->counter = i;
6038 +}
6039
6040 -#define ATOMIC64_OP(op, c_op, asm_op) \
6041 -static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6042 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6043 +{
6044 + v->counter = i;
6045 +}
6046 +
6047 +#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6048 +static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6049 { \
6050 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6051 long temp; \
6052 \
6053 __asm__ __volatile__( \
6054 - " .set arch=r4000 \n" \
6055 - "1: lld %0, %1 # atomic64_" #op " \n" \
6056 - " " #asm_op " %0, %2 \n" \
6057 + " .set mips3 \n" \
6058 + "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6059 + "2: " #asm_op " %0, %2 \n" \
6060 " scd %0, %1 \n" \
6061 " beqzl %0, 1b \n" \
6062 + extable \
6063 " .set mips0 \n" \
6064 : "=&r" (temp), "+m" (v->counter) \
6065 : "Ir" (i)); \
6066 } else if (kernel_uses_llsc) { \
6067 long temp; \
6068 \
6069 - do { \
6070 - __asm__ __volatile__( \
6071 - " .set arch=r4000 \n" \
6072 - " lld %0, %1 # atomic64_" #op "\n" \
6073 - " " #asm_op " %0, %2 \n" \
6074 - " scd %0, %1 \n" \
6075 - " .set mips0 \n" \
6076 - : "=&r" (temp), "+m" (v->counter) \
6077 - : "Ir" (i)); \
6078 - } while (unlikely(!temp)); \
6079 + __asm__ __volatile__( \
6080 + " .set mips3 \n" \
6081 + " lld %0, %1 # atomic64_" #op #suffix "\n" \
6082 + "2: " #asm_op " %0, %2 \n" \
6083 + " scd %0, %1 \n" \
6084 + " beqz %0, 1b \n" \
6085 + extable \
6086 + " .set mips0 \n" \
6087 + : "=&r" (temp), "+m" (v->counter) \
6088 + : "Ir" (i)); \
6089 } else { \
6090 unsigned long flags; \
6091 \
6092 raw_local_irq_save(flags); \
6093 - v->counter c_op i; \
6094 + __asm__ __volatile__( \
6095 + "2: " #asm_op " %0, %1 \n" \
6096 + extable \
6097 + : "+r" (v->counter) : "Ir" (i)); \
6098 raw_local_irq_restore(flags); \
6099 } \
6100 } \
6101
6102 -#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6103 -static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6104 +#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , asm_op##u) \
6105 + __ATOMIC64_OP(op, _unchecked, asm_op)
6106 +
6107 +#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6108 +static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6109 { \
6110 long result; \
6111 \
6112 @@ -363,38 +489,48 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6113 long temp; \
6114 \
6115 __asm__ __volatile__( \
6116 - " .set arch=r4000 \n" \
6117 + " .set mips3 \n" \
6118 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6119 - " " #asm_op " %0, %1, %3 \n" \
6120 + "2: " #asm_op " %0, %1, %3 \n" \
6121 " scd %0, %2 \n" \
6122 " beqzl %0, 1b \n" \
6123 - " " #asm_op " %0, %1, %3 \n" \
6124 + post_op \
6125 + extable \
6126 + "4: " #asm_op " %0, %1, %3 \n" \
6127 + "5: \n" \
6128 " .set mips0 \n" \
6129 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
6130 : "Ir" (i)); \
6131 } else if (kernel_uses_llsc) { \
6132 long temp; \
6133 \
6134 - do { \
6135 - __asm__ __volatile__( \
6136 - " .set arch=r4000 \n" \
6137 - " lld %1, %2 # atomic64_" #op "_return\n" \
6138 - " " #asm_op " %0, %1, %3 \n" \
6139 - " scd %0, %2 \n" \
6140 - " .set mips0 \n" \
6141 - : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6142 - : "Ir" (i), "m" (v->counter) \
6143 - : "memory"); \
6144 - } while (unlikely(!result)); \
6145 + __asm__ __volatile__( \
6146 + " .set mips3 \n" \
6147 + "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n" \
6148 + "2: " #asm_op " %0, %1, %3 \n" \
6149 + " scd %0, %2 \n" \
6150 + " beqz %0, 1b \n" \
6151 + post_op \
6152 + extable \
6153 + "4: " #asm_op " %0, %1, %3 \n" \
6154 + "5: \n" \
6155 + " .set mips0 \n" \
6156 + : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6157 + : "Ir" (i), "m" (v->counter) \
6158 + : "memory"); \
6159 \
6160 result = temp; result c_op i; \
6161 } else { \
6162 unsigned long flags; \
6163 \
6164 raw_local_irq_save(flags); \
6165 - result = v->counter; \
6166 - result c_op i; \
6167 - v->counter = result; \
6168 + __asm__ __volatile__( \
6169 + " ld %0, %1 \n" \
6170 + "2: " #asm_op " %0, %1, %2 \n" \
6171 + " sd %0, %1 \n" \
6172 + "3: \n" \
6173 + extable \
6174 + : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
6175 raw_local_irq_restore(flags); \
6176 } \
6177 \
6178 @@ -403,16 +539,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6179 return result; \
6180 }
6181
6182 -#define ATOMIC64_OPS(op, c_op, asm_op) \
6183 - ATOMIC64_OP(op, c_op, asm_op) \
6184 - ATOMIC64_OP_RETURN(op, c_op, asm_op)
6185 +#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
6186 + __ATOMIC64_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6187
6188 -ATOMIC64_OPS(add, +=, daddu)
6189 -ATOMIC64_OPS(sub, -=, dsubu)
6190 +#define ATOMIC64_OPS(op, asm_op) \
6191 + ATOMIC64_OP(op, asm_op) \
6192 + ATOMIC64_OP_RETURN(op, asm_op)
6193 +
6194 +ATOMIC64_OPS(add, dadd)
6195 +ATOMIC64_OPS(sub, dsub)
6196
6197 #undef ATOMIC64_OPS
6198 #undef ATOMIC64_OP_RETURN
6199 +#undef __ATOMIC64_OP_RETURN
6200 #undef ATOMIC64_OP
6201 +#undef __ATOMIC64_OP
6202 +#undef __OVERFLOW_EXTABLE
6203 +#undef __OVERFLOW_POST
6204
6205 /*
6206 * atomic64_sub_if_positive - conditionally subtract integer from atomic variable
6207 @@ -422,7 +565,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6208 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6209 * The function returns the old value of @v minus @i.
6210 */
6211 -static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6212 +static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6213 {
6214 long result;
6215
6216 @@ -479,9 +622,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6217 return result;
6218 }
6219
6220 -#define atomic64_cmpxchg(v, o, n) \
6221 - ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6222 -#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6223 +static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6224 +{
6225 + return cmpxchg(&v->counter, old, new);
6226 +}
6227 +
6228 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6229 + long new)
6230 +{
6231 + return cmpxchg(&(v->counter), old, new);
6232 +}
6233 +
6234 +static inline long atomic64_xchg(atomic64_t *v, long new)
6235 +{
6236 + return xchg(&v->counter, new);
6237 +}
6238 +
6239 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6240 +{
6241 + return xchg(&(v->counter), new);
6242 +}
6243
6244 /**
6245 * atomic64_add_unless - add unless the number is a given value
6246 @@ -511,6 +671,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6247
6248 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6249 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6250 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6251
6252 /*
6253 * atomic64_sub_and_test - subtract value from variable and test result
6254 @@ -532,6 +693,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6255 * other cases.
6256 */
6257 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6258 +#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6259
6260 /*
6261 * atomic64_dec_and_test - decrement by 1 and test
6262 @@ -556,6 +718,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6263 * Atomically increments @v by 1.
6264 */
6265 #define atomic64_inc(v) atomic64_add(1, (v))
6266 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6267
6268 /*
6269 * atomic64_dec - decrement and test
6270 @@ -564,6 +727,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6271 * Atomically decrements @v by 1.
6272 */
6273 #define atomic64_dec(v) atomic64_sub(1, (v))
6274 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6275
6276 /*
6277 * atomic64_add_negative - add and test if negative
6278 diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6279 index d0101dd..266982c 100644
6280 --- a/arch/mips/include/asm/barrier.h
6281 +++ b/arch/mips/include/asm/barrier.h
6282 @@ -184,7 +184,7 @@
6283 do { \
6284 compiletime_assert_atomic_type(*p); \
6285 smp_mb(); \
6286 - ACCESS_ONCE(*p) = (v); \
6287 + ACCESS_ONCE_RW(*p) = (v); \
6288 } while (0)
6289
6290 #define smp_load_acquire(p) \
6291 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6292 index b4db69f..8f3b093 100644
6293 --- a/arch/mips/include/asm/cache.h
6294 +++ b/arch/mips/include/asm/cache.h
6295 @@ -9,10 +9,11 @@
6296 #ifndef _ASM_CACHE_H
6297 #define _ASM_CACHE_H
6298
6299 +#include <linux/const.h>
6300 #include <kmalloc.h>
6301
6302 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6303 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6304 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6305
6306 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6307 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6308 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6309 index 1d38fe0..9beabc9 100644
6310 --- a/arch/mips/include/asm/elf.h
6311 +++ b/arch/mips/include/asm/elf.h
6312 @@ -381,13 +381,16 @@ extern const char *__elf_platform;
6313 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6314 #endif
6315
6316 +#ifdef CONFIG_PAX_ASLR
6317 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6318 +
6319 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6320 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6321 +#endif
6322 +
6323 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6324 struct linux_binprm;
6325 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6326 int uses_interp);
6327
6328 -struct mm_struct;
6329 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6330 -#define arch_randomize_brk arch_randomize_brk
6331 -
6332 #endif /* _ASM_ELF_H */
6333 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6334 index c1f6afa..38cc6e9 100644
6335 --- a/arch/mips/include/asm/exec.h
6336 +++ b/arch/mips/include/asm/exec.h
6337 @@ -12,6 +12,6 @@
6338 #ifndef _ASM_EXEC_H
6339 #define _ASM_EXEC_H
6340
6341 -extern unsigned long arch_align_stack(unsigned long sp);
6342 +#define arch_align_stack(x) ((x) & ~0xfUL)
6343
6344 #endif /* _ASM_EXEC_H */
6345 diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6346 index 9e8ef59..1139d6b 100644
6347 --- a/arch/mips/include/asm/hw_irq.h
6348 +++ b/arch/mips/include/asm/hw_irq.h
6349 @@ -10,7 +10,7 @@
6350
6351 #include <linux/atomic.h>
6352
6353 -extern atomic_t irq_err_count;
6354 +extern atomic_unchecked_t irq_err_count;
6355
6356 /*
6357 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6358 diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6359 index 46dfc3c..a16b13a 100644
6360 --- a/arch/mips/include/asm/local.h
6361 +++ b/arch/mips/include/asm/local.h
6362 @@ -12,15 +12,25 @@ typedef struct
6363 atomic_long_t a;
6364 } local_t;
6365
6366 +typedef struct {
6367 + atomic_long_unchecked_t a;
6368 +} local_unchecked_t;
6369 +
6370 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6371
6372 #define local_read(l) atomic_long_read(&(l)->a)
6373 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6374 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6375 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6376
6377 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6378 +#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6379 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6380 +#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6381 #define local_inc(l) atomic_long_inc(&(l)->a)
6382 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6383 #define local_dec(l) atomic_long_dec(&(l)->a)
6384 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6385
6386 /*
6387 * Same as above, but return the result value
6388 @@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6389 return result;
6390 }
6391
6392 +static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6393 +{
6394 + unsigned long result;
6395 +
6396 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6397 + unsigned long temp;
6398 +
6399 + __asm__ __volatile__(
6400 + " .set mips3 \n"
6401 + "1:" __LL "%1, %2 # local_add_return \n"
6402 + " addu %0, %1, %3 \n"
6403 + __SC "%0, %2 \n"
6404 + " beqzl %0, 1b \n"
6405 + " addu %0, %1, %3 \n"
6406 + " .set mips0 \n"
6407 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6408 + : "Ir" (i), "m" (l->a.counter)
6409 + : "memory");
6410 + } else if (kernel_uses_llsc) {
6411 + unsigned long temp;
6412 +
6413 + __asm__ __volatile__(
6414 + " .set mips3 \n"
6415 + "1:" __LL "%1, %2 # local_add_return \n"
6416 + " addu %0, %1, %3 \n"
6417 + __SC "%0, %2 \n"
6418 + " beqz %0, 1b \n"
6419 + " addu %0, %1, %3 \n"
6420 + " .set mips0 \n"
6421 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6422 + : "Ir" (i), "m" (l->a.counter)
6423 + : "memory");
6424 + } else {
6425 + unsigned long flags;
6426 +
6427 + local_irq_save(flags);
6428 + result = l->a.counter;
6429 + result += i;
6430 + l->a.counter = result;
6431 + local_irq_restore(flags);
6432 + }
6433 +
6434 + return result;
6435 +}
6436 +
6437 static __inline__ long local_sub_return(long i, local_t * l)
6438 {
6439 unsigned long result;
6440 @@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6441
6442 #define local_cmpxchg(l, o, n) \
6443 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6444 +#define local_cmpxchg_unchecked(l, o, n) \
6445 + ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6446 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6447
6448 /**
6449 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6450 index 3be8180..c4798d5 100644
6451 --- a/arch/mips/include/asm/page.h
6452 +++ b/arch/mips/include/asm/page.h
6453 @@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6454 #ifdef CONFIG_CPU_MIPS32
6455 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6456 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6457 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6458 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6459 #else
6460 typedef struct { unsigned long long pte; } pte_t;
6461 #define pte_val(x) ((x).pte)
6462 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6463 index b336037..5b874cc 100644
6464 --- a/arch/mips/include/asm/pgalloc.h
6465 +++ b/arch/mips/include/asm/pgalloc.h
6466 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6467 {
6468 set_pud(pud, __pud((unsigned long)pmd));
6469 }
6470 +
6471 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6472 +{
6473 + pud_populate(mm, pud, pmd);
6474 +}
6475 #endif
6476
6477 /*
6478 diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6479 index d6d1928..ce4f822 100644
6480 --- a/arch/mips/include/asm/pgtable.h
6481 +++ b/arch/mips/include/asm/pgtable.h
6482 @@ -20,6 +20,9 @@
6483 #include <asm/io.h>
6484 #include <asm/pgtable-bits.h>
6485
6486 +#define ktla_ktva(addr) (addr)
6487 +#define ktva_ktla(addr) (addr)
6488 +
6489 struct mm_struct;
6490 struct vm_area_struct;
6491
6492 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6493 index 7de8658..c109224 100644
6494 --- a/arch/mips/include/asm/thread_info.h
6495 +++ b/arch/mips/include/asm/thread_info.h
6496 @@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6497 #define TIF_SECCOMP 4 /* secure computing */
6498 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6499 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6500 +/* li takes a 32bit immediate */
6501 +#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6502 +
6503 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6504 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6505 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6506 @@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6507 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6508 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6509 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6510 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6511
6512 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6513 _TIF_SYSCALL_AUDIT | \
6514 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6515 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6516 + _TIF_GRSEC_SETXID)
6517
6518 /* work to do in syscall_trace_leave() */
6519 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6520 - _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6521 + _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6522
6523 /* work to do on interrupt/exception return */
6524 #define _TIF_WORK_MASK \
6525 @@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6526 /* work to do on any return to u-space */
6527 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6528 _TIF_WORK_SYSCALL_EXIT | \
6529 - _TIF_SYSCALL_TRACEPOINT)
6530 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6531
6532 /*
6533 * We stash processor id into a COP0 register to retrieve it fast
6534 diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6535 index 22a5624..7c96295 100644
6536 --- a/arch/mips/include/asm/uaccess.h
6537 +++ b/arch/mips/include/asm/uaccess.h
6538 @@ -130,6 +130,7 @@ extern u64 __ua_limit;
6539 __ok == 0; \
6540 })
6541
6542 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6543 #define access_ok(type, addr, size) \
6544 likely(__access_ok((addr), (size), __access_mask))
6545
6546 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6547 index 1188e00..41cf144 100644
6548 --- a/arch/mips/kernel/binfmt_elfn32.c
6549 +++ b/arch/mips/kernel/binfmt_elfn32.c
6550 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6551 #undef ELF_ET_DYN_BASE
6552 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6553
6554 +#ifdef CONFIG_PAX_ASLR
6555 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6556 +
6557 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6558 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6559 +#endif
6560 +
6561 #include <asm/processor.h>
6562 #include <linux/module.h>
6563 #include <linux/elfcore.h>
6564 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6565 index 9287678..f870e47 100644
6566 --- a/arch/mips/kernel/binfmt_elfo32.c
6567 +++ b/arch/mips/kernel/binfmt_elfo32.c
6568 @@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6569 #undef ELF_ET_DYN_BASE
6570 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6571
6572 +#ifdef CONFIG_PAX_ASLR
6573 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6574 +
6575 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6576 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6577 +#endif
6578 +
6579 #include <asm/processor.h>
6580
6581 #include <linux/module.h>
6582 diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6583 index 50b3648..c2f3cec 100644
6584 --- a/arch/mips/kernel/i8259.c
6585 +++ b/arch/mips/kernel/i8259.c
6586 @@ -201,7 +201,7 @@ spurious_8259A_irq:
6587 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6588 spurious_irq_mask |= irqmask;
6589 }
6590 - atomic_inc(&irq_err_count);
6591 + atomic_inc_unchecked(&irq_err_count);
6592 /*
6593 * Theoretically we do not have to handle this IRQ,
6594 * but in Linux this does not cause problems and is
6595 diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6596 index 44a1f79..2bd6aa3 100644
6597 --- a/arch/mips/kernel/irq-gt641xx.c
6598 +++ b/arch/mips/kernel/irq-gt641xx.c
6599 @@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6600 }
6601 }
6602
6603 - atomic_inc(&irq_err_count);
6604 + atomic_inc_unchecked(&irq_err_count);
6605 }
6606
6607 void __init gt641xx_irq_init(void)
6608 diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6609 index d2bfbc2..a8eacd2 100644
6610 --- a/arch/mips/kernel/irq.c
6611 +++ b/arch/mips/kernel/irq.c
6612 @@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6613 printk("unexpected IRQ # %d\n", irq);
6614 }
6615
6616 -atomic_t irq_err_count;
6617 +atomic_unchecked_t irq_err_count;
6618
6619 int arch_show_interrupts(struct seq_file *p, int prec)
6620 {
6621 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6622 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6623 return 0;
6624 }
6625
6626 asmlinkage void spurious_interrupt(void)
6627 {
6628 - atomic_inc(&irq_err_count);
6629 + atomic_inc_unchecked(&irq_err_count);
6630 }
6631
6632 void __init init_IRQ(void)
6633 @@ -109,7 +109,10 @@ void __init init_IRQ(void)
6634 #endif
6635 }
6636
6637 +
6638 #ifdef DEBUG_STACKOVERFLOW
6639 +extern void gr_handle_kernel_exploit(void);
6640 +
6641 static inline void check_stack_overflow(void)
6642 {
6643 unsigned long sp;
6644 @@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6645 printk("do_IRQ: stack overflow: %ld\n",
6646 sp - sizeof(struct thread_info));
6647 dump_stack();
6648 + gr_handle_kernel_exploit();
6649 }
6650 }
6651 #else
6652 diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6653 index 0614717..002fa43 100644
6654 --- a/arch/mips/kernel/pm-cps.c
6655 +++ b/arch/mips/kernel/pm-cps.c
6656 @@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6657 nc_core_ready_count = nc_addr;
6658
6659 /* Ensure ready_count is zero-initialised before the assembly runs */
6660 - ACCESS_ONCE(*nc_core_ready_count) = 0;
6661 + ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6662 coupled_barrier(&per_cpu(pm_barrier, core), online);
6663
6664 /* Run the generated entry code */
6665 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6666 index 636b074..8fbb91f 100644
6667 --- a/arch/mips/kernel/process.c
6668 +++ b/arch/mips/kernel/process.c
6669 @@ -520,15 +520,3 @@ unsigned long get_wchan(struct task_struct *task)
6670 out:
6671 return pc;
6672 }
6673 -
6674 -/*
6675 - * Don't forget that the stack pointer must be aligned on a 8 bytes
6676 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6677 - */
6678 -unsigned long arch_align_stack(unsigned long sp)
6679 -{
6680 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6681 - sp -= get_random_int() & ~PAGE_MASK;
6682 -
6683 - return sp & ALMASK;
6684 -}
6685 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6686 index 9d1487d..10c5da5 100644
6687 --- a/arch/mips/kernel/ptrace.c
6688 +++ b/arch/mips/kernel/ptrace.c
6689 @@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6690 return ret;
6691 }
6692
6693 +#ifdef CONFIG_GRKERNSEC_SETXID
6694 +extern void gr_delayed_cred_worker(void);
6695 +#endif
6696 +
6697 /*
6698 * Notification of system call entry/exit
6699 * - triggered by current->work.syscall_trace
6700 @@ -777,6 +781,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6701 tracehook_report_syscall_entry(regs))
6702 ret = -1;
6703
6704 +#ifdef CONFIG_GRKERNSEC_SETXID
6705 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6706 + gr_delayed_cred_worker();
6707 +#endif
6708 +
6709 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6710 trace_sys_enter(regs, regs->regs[2]);
6711
6712 diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6713 index 07fc524..b9d7f28 100644
6714 --- a/arch/mips/kernel/reset.c
6715 +++ b/arch/mips/kernel/reset.c
6716 @@ -13,6 +13,7 @@
6717 #include <linux/reboot.h>
6718
6719 #include <asm/reboot.h>
6720 +#include <asm/bug.h>
6721
6722 /*
6723 * Urgs ... Too many MIPS machines to handle this in a generic way.
6724 @@ -29,16 +30,19 @@ void machine_restart(char *command)
6725 {
6726 if (_machine_restart)
6727 _machine_restart(command);
6728 + BUG();
6729 }
6730
6731 void machine_halt(void)
6732 {
6733 if (_machine_halt)
6734 _machine_halt();
6735 + BUG();
6736 }
6737
6738 void machine_power_off(void)
6739 {
6740 if (pm_power_off)
6741 pm_power_off();
6742 + BUG();
6743 }
6744 diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6745 index 2242bdd..b284048 100644
6746 --- a/arch/mips/kernel/sync-r4k.c
6747 +++ b/arch/mips/kernel/sync-r4k.c
6748 @@ -18,8 +18,8 @@
6749 #include <asm/mipsregs.h>
6750
6751 static atomic_t count_start_flag = ATOMIC_INIT(0);
6752 -static atomic_t count_count_start = ATOMIC_INIT(0);
6753 -static atomic_t count_count_stop = ATOMIC_INIT(0);
6754 +static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6755 +static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6756 static atomic_t count_reference = ATOMIC_INIT(0);
6757
6758 #define COUNTON 100
6759 @@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6760
6761 for (i = 0; i < NR_LOOPS; i++) {
6762 /* slaves loop on '!= 2' */
6763 - while (atomic_read(&count_count_start) != 1)
6764 + while (atomic_read_unchecked(&count_count_start) != 1)
6765 mb();
6766 - atomic_set(&count_count_stop, 0);
6767 + atomic_set_unchecked(&count_count_stop, 0);
6768 smp_wmb();
6769
6770 /* this lets the slaves write their count register */
6771 - atomic_inc(&count_count_start);
6772 + atomic_inc_unchecked(&count_count_start);
6773
6774 /*
6775 * Everyone initialises count in the last loop:
6776 @@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6777 /*
6778 * Wait for all slaves to leave the synchronization point:
6779 */
6780 - while (atomic_read(&count_count_stop) != 1)
6781 + while (atomic_read_unchecked(&count_count_stop) != 1)
6782 mb();
6783 - atomic_set(&count_count_start, 0);
6784 + atomic_set_unchecked(&count_count_start, 0);
6785 smp_wmb();
6786 - atomic_inc(&count_count_stop);
6787 + atomic_inc_unchecked(&count_count_stop);
6788 }
6789 /* Arrange for an interrupt in a short while */
6790 write_c0_compare(read_c0_count() + COUNTON);
6791 @@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6792 initcount = atomic_read(&count_reference);
6793
6794 for (i = 0; i < NR_LOOPS; i++) {
6795 - atomic_inc(&count_count_start);
6796 - while (atomic_read(&count_count_start) != 2)
6797 + atomic_inc_unchecked(&count_count_start);
6798 + while (atomic_read_unchecked(&count_count_start) != 2)
6799 mb();
6800
6801 /*
6802 @@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6803 if (i == NR_LOOPS-1)
6804 write_c0_count(initcount);
6805
6806 - atomic_inc(&count_count_stop);
6807 - while (atomic_read(&count_count_stop) != 2)
6808 + atomic_inc_unchecked(&count_count_stop);
6809 + while (atomic_read_unchecked(&count_count_stop) != 2)
6810 mb();
6811 }
6812 /* Arrange for an interrupt in a short while */
6813 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6814 index 22b19c2..c5cc8c4 100644
6815 --- a/arch/mips/kernel/traps.c
6816 +++ b/arch/mips/kernel/traps.c
6817 @@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6818 siginfo_t info;
6819
6820 prev_state = exception_enter();
6821 - die_if_kernel("Integer overflow", regs);
6822 + if (unlikely(!user_mode(regs))) {
6823 +
6824 +#ifdef CONFIG_PAX_REFCOUNT
6825 + if (fixup_exception(regs)) {
6826 + pax_report_refcount_overflow(regs);
6827 + exception_exit(prev_state);
6828 + return;
6829 + }
6830 +#endif
6831 +
6832 + die("Integer overflow", regs);
6833 + }
6834
6835 info.si_code = FPE_INTOVF;
6836 info.si_signo = SIGFPE;
6837 diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6838 index e3b21e5..ea5ff7c 100644
6839 --- a/arch/mips/kvm/mips.c
6840 +++ b/arch/mips/kvm/mips.c
6841 @@ -805,7 +805,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6842 return r;
6843 }
6844
6845 -int kvm_arch_init(void *opaque)
6846 +int kvm_arch_init(const void *opaque)
6847 {
6848 if (kvm_mips_callbacks) {
6849 kvm_err("kvm: module already exists\n");
6850 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6851 index becc42b..9e43d4b 100644
6852 --- a/arch/mips/mm/fault.c
6853 +++ b/arch/mips/mm/fault.c
6854 @@ -28,6 +28,23 @@
6855 #include <asm/highmem.h> /* For VMALLOC_END */
6856 #include <linux/kdebug.h>
6857
6858 +#ifdef CONFIG_PAX_PAGEEXEC
6859 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6860 +{
6861 + unsigned long i;
6862 +
6863 + printk(KERN_ERR "PAX: bytes at PC: ");
6864 + for (i = 0; i < 5; i++) {
6865 + unsigned int c;
6866 + if (get_user(c, (unsigned int *)pc+i))
6867 + printk(KERN_CONT "???????? ");
6868 + else
6869 + printk(KERN_CONT "%08x ", c);
6870 + }
6871 + printk("\n");
6872 +}
6873 +#endif
6874 +
6875 /*
6876 * This routine handles page faults. It determines the address,
6877 * and the problem, and then passes it off to one of the appropriate
6878 @@ -199,6 +216,14 @@ bad_area:
6879 bad_area_nosemaphore:
6880 /* User mode accesses just cause a SIGSEGV */
6881 if (user_mode(regs)) {
6882 +
6883 +#ifdef CONFIG_PAX_PAGEEXEC
6884 + if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6885 + pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6886 + do_group_exit(SIGKILL);
6887 + }
6888 +#endif
6889 +
6890 tsk->thread.cp0_badvaddr = address;
6891 tsk->thread.error_code = write;
6892 #if 0
6893 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6894 index f1baadd..5472dca 100644
6895 --- a/arch/mips/mm/mmap.c
6896 +++ b/arch/mips/mm/mmap.c
6897 @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6898 struct vm_area_struct *vma;
6899 unsigned long addr = addr0;
6900 int do_color_align;
6901 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6902 struct vm_unmapped_area_info info;
6903
6904 if (unlikely(len > TASK_SIZE))
6905 @@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6906 do_color_align = 1;
6907
6908 /* requesting a specific address */
6909 +
6910 +#ifdef CONFIG_PAX_RANDMMAP
6911 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6912 +#endif
6913 +
6914 if (addr) {
6915 if (do_color_align)
6916 addr = COLOUR_ALIGN(addr, pgoff);
6917 @@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6918 addr = PAGE_ALIGN(addr);
6919
6920 vma = find_vma(mm, addr);
6921 - if (TASK_SIZE - len >= addr &&
6922 - (!vma || addr + len <= vma->vm_start))
6923 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6924 return addr;
6925 }
6926
6927 info.length = len;
6928 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6929 info.align_offset = pgoff << PAGE_SHIFT;
6930 + info.threadstack_offset = offset;
6931
6932 if (dir == DOWN) {
6933 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6934 @@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6935 {
6936 unsigned long random_factor = 0UL;
6937
6938 +#ifdef CONFIG_PAX_RANDMMAP
6939 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6940 +#endif
6941 +
6942 if (current->flags & PF_RANDOMIZE) {
6943 random_factor = get_random_int();
6944 random_factor = random_factor << PAGE_SHIFT;
6945 @@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6946
6947 if (mmap_is_legacy()) {
6948 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6949 +
6950 +#ifdef CONFIG_PAX_RANDMMAP
6951 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6952 + mm->mmap_base += mm->delta_mmap;
6953 +#endif
6954 +
6955 mm->get_unmapped_area = arch_get_unmapped_area;
6956 } else {
6957 mm->mmap_base = mmap_base(random_factor);
6958 +
6959 +#ifdef CONFIG_PAX_RANDMMAP
6960 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6961 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6962 +#endif
6963 +
6964 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6965 }
6966 }
6967
6968 -static inline unsigned long brk_rnd(void)
6969 -{
6970 - unsigned long rnd = get_random_int();
6971 -
6972 - rnd = rnd << PAGE_SHIFT;
6973 - /* 8MB for 32bit, 256MB for 64bit */
6974 - if (TASK_IS_32BIT_ADDR)
6975 - rnd = rnd & 0x7ffffful;
6976 - else
6977 - rnd = rnd & 0xffffffful;
6978 -
6979 - return rnd;
6980 -}
6981 -
6982 -unsigned long arch_randomize_brk(struct mm_struct *mm)
6983 -{
6984 - unsigned long base = mm->brk;
6985 - unsigned long ret;
6986 -
6987 - ret = PAGE_ALIGN(base + brk_rnd());
6988 -
6989 - if (ret < mm->brk)
6990 - return mm->brk;
6991 -
6992 - return ret;
6993 -}
6994 -
6995 int __virt_addr_valid(const volatile void *kaddr)
6996 {
6997 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
6998 diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
6999 index 59cccd9..f39ac2f 100644
7000 --- a/arch/mips/pci/pci-octeon.c
7001 +++ b/arch/mips/pci/pci-octeon.c
7002 @@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7003
7004
7005 static struct pci_ops octeon_pci_ops = {
7006 - octeon_read_config,
7007 - octeon_write_config,
7008 + .read = octeon_read_config,
7009 + .write = octeon_write_config,
7010 };
7011
7012 static struct resource octeon_pci_mem_resource = {
7013 diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7014 index 5e36c33..eb4a17b 100644
7015 --- a/arch/mips/pci/pcie-octeon.c
7016 +++ b/arch/mips/pci/pcie-octeon.c
7017 @@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7018 }
7019
7020 static struct pci_ops octeon_pcie0_ops = {
7021 - octeon_pcie0_read_config,
7022 - octeon_pcie0_write_config,
7023 + .read = octeon_pcie0_read_config,
7024 + .write = octeon_pcie0_write_config,
7025 };
7026
7027 static struct resource octeon_pcie0_mem_resource = {
7028 @@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7029 };
7030
7031 static struct pci_ops octeon_pcie1_ops = {
7032 - octeon_pcie1_read_config,
7033 - octeon_pcie1_write_config,
7034 + .read = octeon_pcie1_read_config,
7035 + .write = octeon_pcie1_write_config,
7036 };
7037
7038 static struct resource octeon_pcie1_mem_resource = {
7039 @@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7040 };
7041
7042 static struct pci_ops octeon_dummy_ops = {
7043 - octeon_dummy_read_config,
7044 - octeon_dummy_write_config,
7045 + .read = octeon_dummy_read_config,
7046 + .write = octeon_dummy_write_config,
7047 };
7048
7049 static struct resource octeon_dummy_mem_resource = {
7050 diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7051 index a2358b4..7cead4f 100644
7052 --- a/arch/mips/sgi-ip27/ip27-nmi.c
7053 +++ b/arch/mips/sgi-ip27/ip27-nmi.c
7054 @@ -187,9 +187,9 @@ void
7055 cont_nmi_dump(void)
7056 {
7057 #ifndef REAL_NMI_SIGNAL
7058 - static atomic_t nmied_cpus = ATOMIC_INIT(0);
7059 + static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7060
7061 - atomic_inc(&nmied_cpus);
7062 + atomic_inc_unchecked(&nmied_cpus);
7063 #endif
7064 /*
7065 * Only allow 1 cpu to proceed
7066 @@ -233,7 +233,7 @@ cont_nmi_dump(void)
7067 udelay(10000);
7068 }
7069 #else
7070 - while (atomic_read(&nmied_cpus) != num_online_cpus());
7071 + while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7072 #endif
7073
7074 /*
7075 diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7076 index a046b30..6799527 100644
7077 --- a/arch/mips/sni/rm200.c
7078 +++ b/arch/mips/sni/rm200.c
7079 @@ -270,7 +270,7 @@ spurious_8259A_irq:
7080 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7081 spurious_irq_mask |= irqmask;
7082 }
7083 - atomic_inc(&irq_err_count);
7084 + atomic_inc_unchecked(&irq_err_count);
7085 /*
7086 * Theoretically we do not have to handle this IRQ,
7087 * but in Linux this does not cause problems and is
7088 diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7089 index 41e873b..34d33a7 100644
7090 --- a/arch/mips/vr41xx/common/icu.c
7091 +++ b/arch/mips/vr41xx/common/icu.c
7092 @@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7093
7094 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7095
7096 - atomic_inc(&irq_err_count);
7097 + atomic_inc_unchecked(&irq_err_count);
7098
7099 return -1;
7100 }
7101 diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7102 index ae0e4ee..e8f0692 100644
7103 --- a/arch/mips/vr41xx/common/irq.c
7104 +++ b/arch/mips/vr41xx/common/irq.c
7105 @@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7106 irq_cascade_t *cascade;
7107
7108 if (irq >= NR_IRQS) {
7109 - atomic_inc(&irq_err_count);
7110 + atomic_inc_unchecked(&irq_err_count);
7111 return;
7112 }
7113
7114 @@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7115 ret = cascade->get_irq(irq);
7116 irq = ret;
7117 if (ret < 0)
7118 - atomic_inc(&irq_err_count);
7119 + atomic_inc_unchecked(&irq_err_count);
7120 else
7121 irq_dispatch(irq);
7122 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7123 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7124 index 967d144..db12197 100644
7125 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7126 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7127 @@ -11,12 +11,14 @@
7128 #ifndef _ASM_PROC_CACHE_H
7129 #define _ASM_PROC_CACHE_H
7130
7131 +#include <linux/const.h>
7132 +
7133 /* L1 cache */
7134
7135 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7136 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7137 -#define L1_CACHE_BYTES 16 /* bytes per entry */
7138 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7139 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7140 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7141
7142 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7143 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7144 index bcb5df2..84fabd2 100644
7145 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7146 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7147 @@ -16,13 +16,15 @@
7148 #ifndef _ASM_PROC_CACHE_H
7149 #define _ASM_PROC_CACHE_H
7150
7151 +#include <linux/const.h>
7152 +
7153 /*
7154 * L1 cache
7155 */
7156 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7157 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7158 -#define L1_CACHE_BYTES 32 /* bytes per entry */
7159 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7160 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7161 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7162
7163 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7164 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7165 index 4ce7a01..449202a 100644
7166 --- a/arch/openrisc/include/asm/cache.h
7167 +++ b/arch/openrisc/include/asm/cache.h
7168 @@ -19,11 +19,13 @@
7169 #ifndef __ASM_OPENRISC_CACHE_H
7170 #define __ASM_OPENRISC_CACHE_H
7171
7172 +#include <linux/const.h>
7173 +
7174 /* FIXME: How can we replace these with values from the CPU...
7175 * they shouldn't be hard-coded!
7176 */
7177
7178 -#define L1_CACHE_BYTES 16
7179 #define L1_CACHE_SHIFT 4
7180 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7181
7182 #endif /* __ASM_OPENRISC_CACHE_H */
7183 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7184 index 226f8ca..9d9b87d 100644
7185 --- a/arch/parisc/include/asm/atomic.h
7186 +++ b/arch/parisc/include/asm/atomic.h
7187 @@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7188 return dec;
7189 }
7190
7191 +#define atomic64_read_unchecked(v) atomic64_read(v)
7192 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7193 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7194 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7195 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7196 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7197 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7198 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7199 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7200 +
7201 #endif /* !CONFIG_64BIT */
7202
7203
7204 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7205 index 47f11c7..3420df2 100644
7206 --- a/arch/parisc/include/asm/cache.h
7207 +++ b/arch/parisc/include/asm/cache.h
7208 @@ -5,6 +5,7 @@
7209 #ifndef __ARCH_PARISC_CACHE_H
7210 #define __ARCH_PARISC_CACHE_H
7211
7212 +#include <linux/const.h>
7213
7214 /*
7215 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7216 @@ -15,13 +16,13 @@
7217 * just ruin performance.
7218 */
7219 #ifdef CONFIG_PA20
7220 -#define L1_CACHE_BYTES 64
7221 #define L1_CACHE_SHIFT 6
7222 #else
7223 -#define L1_CACHE_BYTES 32
7224 #define L1_CACHE_SHIFT 5
7225 #endif
7226
7227 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7228 +
7229 #ifndef __ASSEMBLY__
7230
7231 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7232 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7233 index 3391d06..c23a2cc 100644
7234 --- a/arch/parisc/include/asm/elf.h
7235 +++ b/arch/parisc/include/asm/elf.h
7236 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7237
7238 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7239
7240 +#ifdef CONFIG_PAX_ASLR
7241 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
7242 +
7243 +#define PAX_DELTA_MMAP_LEN 16
7244 +#define PAX_DELTA_STACK_LEN 16
7245 +#endif
7246 +
7247 /* This yields a mask that user programs can use to figure out what
7248 instruction set this CPU supports. This could be done in user space,
7249 but it's not easy, and we've already done it here. */
7250 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7251 index f213f5b..0af3e8e 100644
7252 --- a/arch/parisc/include/asm/pgalloc.h
7253 +++ b/arch/parisc/include/asm/pgalloc.h
7254 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7255 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7256 }
7257
7258 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7259 +{
7260 + pgd_populate(mm, pgd, pmd);
7261 +}
7262 +
7263 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7264 {
7265 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7266 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7267 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7268 #define pmd_free(mm, x) do { } while (0)
7269 #define pgd_populate(mm, pmd, pte) BUG()
7270 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
7271
7272 #endif
7273
7274 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7275 index 22b89d1..ce34230 100644
7276 --- a/arch/parisc/include/asm/pgtable.h
7277 +++ b/arch/parisc/include/asm/pgtable.h
7278 @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7279 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7280 #define PAGE_COPY PAGE_EXECREAD
7281 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7282 +
7283 +#ifdef CONFIG_PAX_PAGEEXEC
7284 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7285 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7286 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7287 +#else
7288 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
7289 +# define PAGE_COPY_NOEXEC PAGE_COPY
7290 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
7291 +#endif
7292 +
7293 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7294 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7295 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7296 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7297 index a5cb070..8604ddc 100644
7298 --- a/arch/parisc/include/asm/uaccess.h
7299 +++ b/arch/parisc/include/asm/uaccess.h
7300 @@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7301 const void __user *from,
7302 unsigned long n)
7303 {
7304 - int sz = __compiletime_object_size(to);
7305 + size_t sz = __compiletime_object_size(to);
7306 int ret = -EFAULT;
7307
7308 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7309 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7310 ret = __copy_from_user(to, from, n);
7311 else
7312 copy_from_user_overflow();
7313 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7314 index 50dfafc..b9fc230 100644
7315 --- a/arch/parisc/kernel/module.c
7316 +++ b/arch/parisc/kernel/module.c
7317 @@ -98,16 +98,38 @@
7318
7319 /* three functions to determine where in the module core
7320 * or init pieces the location is */
7321 +static inline int in_init_rx(struct module *me, void *loc)
7322 +{
7323 + return (loc >= me->module_init_rx &&
7324 + loc < (me->module_init_rx + me->init_size_rx));
7325 +}
7326 +
7327 +static inline int in_init_rw(struct module *me, void *loc)
7328 +{
7329 + return (loc >= me->module_init_rw &&
7330 + loc < (me->module_init_rw + me->init_size_rw));
7331 +}
7332 +
7333 static inline int in_init(struct module *me, void *loc)
7334 {
7335 - return (loc >= me->module_init &&
7336 - loc <= (me->module_init + me->init_size));
7337 + return in_init_rx(me, loc) || in_init_rw(me, loc);
7338 +}
7339 +
7340 +static inline int in_core_rx(struct module *me, void *loc)
7341 +{
7342 + return (loc >= me->module_core_rx &&
7343 + loc < (me->module_core_rx + me->core_size_rx));
7344 +}
7345 +
7346 +static inline int in_core_rw(struct module *me, void *loc)
7347 +{
7348 + return (loc >= me->module_core_rw &&
7349 + loc < (me->module_core_rw + me->core_size_rw));
7350 }
7351
7352 static inline int in_core(struct module *me, void *loc)
7353 {
7354 - return (loc >= me->module_core &&
7355 - loc <= (me->module_core + me->core_size));
7356 + return in_core_rx(me, loc) || in_core_rw(me, loc);
7357 }
7358
7359 static inline int in_local(struct module *me, void *loc)
7360 @@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7361 }
7362
7363 /* align things a bit */
7364 - me->core_size = ALIGN(me->core_size, 16);
7365 - me->arch.got_offset = me->core_size;
7366 - me->core_size += gots * sizeof(struct got_entry);
7367 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7368 + me->arch.got_offset = me->core_size_rw;
7369 + me->core_size_rw += gots * sizeof(struct got_entry);
7370
7371 - me->core_size = ALIGN(me->core_size, 16);
7372 - me->arch.fdesc_offset = me->core_size;
7373 - me->core_size += fdescs * sizeof(Elf_Fdesc);
7374 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7375 + me->arch.fdesc_offset = me->core_size_rw;
7376 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7377
7378 me->arch.got_max = gots;
7379 me->arch.fdesc_max = fdescs;
7380 @@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7381
7382 BUG_ON(value == 0);
7383
7384 - got = me->module_core + me->arch.got_offset;
7385 + got = me->module_core_rw + me->arch.got_offset;
7386 for (i = 0; got[i].addr; i++)
7387 if (got[i].addr == value)
7388 goto out;
7389 @@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7390 #ifdef CONFIG_64BIT
7391 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7392 {
7393 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7394 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7395
7396 if (!value) {
7397 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7398 @@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7399
7400 /* Create new one */
7401 fdesc->addr = value;
7402 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7403 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7404 return (Elf_Addr)fdesc;
7405 }
7406 #endif /* CONFIG_64BIT */
7407 @@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7408
7409 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7410 end = table + sechdrs[me->arch.unwind_section].sh_size;
7411 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7412 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7413
7414 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7415 me->arch.unwind_section, table, end, gp);
7416 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7417 index e1ffea2..46ed66e 100644
7418 --- a/arch/parisc/kernel/sys_parisc.c
7419 +++ b/arch/parisc/kernel/sys_parisc.c
7420 @@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7421 unsigned long task_size = TASK_SIZE;
7422 int do_color_align, last_mmap;
7423 struct vm_unmapped_area_info info;
7424 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7425
7426 if (len > task_size)
7427 return -ENOMEM;
7428 @@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7429 goto found_addr;
7430 }
7431
7432 +#ifdef CONFIG_PAX_RANDMMAP
7433 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7434 +#endif
7435 +
7436 if (addr) {
7437 if (do_color_align && last_mmap)
7438 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7439 @@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7440 info.high_limit = mmap_upper_limit();
7441 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7442 info.align_offset = shared_align_offset(last_mmap, pgoff);
7443 + info.threadstack_offset = offset;
7444 addr = vm_unmapped_area(&info);
7445
7446 found_addr:
7447 @@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7448 unsigned long addr = addr0;
7449 int do_color_align, last_mmap;
7450 struct vm_unmapped_area_info info;
7451 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7452
7453 #ifdef CONFIG_64BIT
7454 /* This should only ever run for 32-bit processes. */
7455 @@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7456 }
7457
7458 /* requesting a specific address */
7459 +#ifdef CONFIG_PAX_RANDMMAP
7460 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7461 +#endif
7462 +
7463 if (addr) {
7464 if (do_color_align && last_mmap)
7465 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7466 @@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7467 info.high_limit = mm->mmap_base;
7468 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7469 info.align_offset = shared_align_offset(last_mmap, pgoff);
7470 + info.threadstack_offset = offset;
7471 addr = vm_unmapped_area(&info);
7472 if (!(addr & ~PAGE_MASK))
7473 goto found_addr;
7474 @@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7475 mm->mmap_legacy_base = mmap_legacy_base();
7476 mm->mmap_base = mmap_upper_limit();
7477
7478 +#ifdef CONFIG_PAX_RANDMMAP
7479 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
7480 + mm->mmap_legacy_base += mm->delta_mmap;
7481 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7482 + }
7483 +#endif
7484 +
7485 if (mmap_is_legacy()) {
7486 mm->mmap_base = mm->mmap_legacy_base;
7487 mm->get_unmapped_area = arch_get_unmapped_area;
7488 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7489 index 47ee620..1107387 100644
7490 --- a/arch/parisc/kernel/traps.c
7491 +++ b/arch/parisc/kernel/traps.c
7492 @@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7493
7494 down_read(&current->mm->mmap_sem);
7495 vma = find_vma(current->mm,regs->iaoq[0]);
7496 - if (vma && (regs->iaoq[0] >= vma->vm_start)
7497 - && (vma->vm_flags & VM_EXEC)) {
7498 -
7499 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7500 fault_address = regs->iaoq[0];
7501 fault_space = regs->iasq[0];
7502
7503 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7504 index 3ca9c11..d163ef7 100644
7505 --- a/arch/parisc/mm/fault.c
7506 +++ b/arch/parisc/mm/fault.c
7507 @@ -15,6 +15,7 @@
7508 #include <linux/sched.h>
7509 #include <linux/interrupt.h>
7510 #include <linux/module.h>
7511 +#include <linux/unistd.h>
7512
7513 #include <asm/uaccess.h>
7514 #include <asm/traps.h>
7515 @@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7516 static unsigned long
7517 parisc_acctyp(unsigned long code, unsigned int inst)
7518 {
7519 - if (code == 6 || code == 16)
7520 + if (code == 6 || code == 7 || code == 16)
7521 return VM_EXEC;
7522
7523 switch (inst & 0xf0000000) {
7524 @@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7525 }
7526 #endif
7527
7528 +#ifdef CONFIG_PAX_PAGEEXEC
7529 +/*
7530 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7531 + *
7532 + * returns 1 when task should be killed
7533 + * 2 when rt_sigreturn trampoline was detected
7534 + * 3 when unpatched PLT trampoline was detected
7535 + */
7536 +static int pax_handle_fetch_fault(struct pt_regs *regs)
7537 +{
7538 +
7539 +#ifdef CONFIG_PAX_EMUPLT
7540 + int err;
7541 +
7542 + do { /* PaX: unpatched PLT emulation */
7543 + unsigned int bl, depwi;
7544 +
7545 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7546 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7547 +
7548 + if (err)
7549 + break;
7550 +
7551 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7552 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7553 +
7554 + err = get_user(ldw, (unsigned int *)addr);
7555 + err |= get_user(bv, (unsigned int *)(addr+4));
7556 + err |= get_user(ldw2, (unsigned int *)(addr+8));
7557 +
7558 + if (err)
7559 + break;
7560 +
7561 + if (ldw == 0x0E801096U &&
7562 + bv == 0xEAC0C000U &&
7563 + ldw2 == 0x0E881095U)
7564 + {
7565 + unsigned int resolver, map;
7566 +
7567 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7568 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7569 + if (err)
7570 + break;
7571 +
7572 + regs->gr[20] = instruction_pointer(regs)+8;
7573 + regs->gr[21] = map;
7574 + regs->gr[22] = resolver;
7575 + regs->iaoq[0] = resolver | 3UL;
7576 + regs->iaoq[1] = regs->iaoq[0] + 4;
7577 + return 3;
7578 + }
7579 + }
7580 + } while (0);
7581 +#endif
7582 +
7583 +#ifdef CONFIG_PAX_EMUTRAMP
7584 +
7585 +#ifndef CONFIG_PAX_EMUSIGRT
7586 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7587 + return 1;
7588 +#endif
7589 +
7590 + do { /* PaX: rt_sigreturn emulation */
7591 + unsigned int ldi1, ldi2, bel, nop;
7592 +
7593 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7594 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7595 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7596 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7597 +
7598 + if (err)
7599 + break;
7600 +
7601 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7602 + ldi2 == 0x3414015AU &&
7603 + bel == 0xE4008200U &&
7604 + nop == 0x08000240U)
7605 + {
7606 + regs->gr[25] = (ldi1 & 2) >> 1;
7607 + regs->gr[20] = __NR_rt_sigreturn;
7608 + regs->gr[31] = regs->iaoq[1] + 16;
7609 + regs->sr[0] = regs->iasq[1];
7610 + regs->iaoq[0] = 0x100UL;
7611 + regs->iaoq[1] = regs->iaoq[0] + 4;
7612 + regs->iasq[0] = regs->sr[2];
7613 + regs->iasq[1] = regs->sr[2];
7614 + return 2;
7615 + }
7616 + } while (0);
7617 +#endif
7618 +
7619 + return 1;
7620 +}
7621 +
7622 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7623 +{
7624 + unsigned long i;
7625 +
7626 + printk(KERN_ERR "PAX: bytes at PC: ");
7627 + for (i = 0; i < 5; i++) {
7628 + unsigned int c;
7629 + if (get_user(c, (unsigned int *)pc+i))
7630 + printk(KERN_CONT "???????? ");
7631 + else
7632 + printk(KERN_CONT "%08x ", c);
7633 + }
7634 + printk("\n");
7635 +}
7636 +#endif
7637 +
7638 int fixup_exception(struct pt_regs *regs)
7639 {
7640 const struct exception_table_entry *fix;
7641 @@ -234,8 +345,33 @@ retry:
7642
7643 good_area:
7644
7645 - if ((vma->vm_flags & acc_type) != acc_type)
7646 + if ((vma->vm_flags & acc_type) != acc_type) {
7647 +
7648 +#ifdef CONFIG_PAX_PAGEEXEC
7649 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7650 + (address & ~3UL) == instruction_pointer(regs))
7651 + {
7652 + up_read(&mm->mmap_sem);
7653 + switch (pax_handle_fetch_fault(regs)) {
7654 +
7655 +#ifdef CONFIG_PAX_EMUPLT
7656 + case 3:
7657 + return;
7658 +#endif
7659 +
7660 +#ifdef CONFIG_PAX_EMUTRAMP
7661 + case 2:
7662 + return;
7663 +#endif
7664 +
7665 + }
7666 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7667 + do_group_exit(SIGKILL);
7668 + }
7669 +#endif
7670 +
7671 goto bad_area;
7672 + }
7673
7674 /*
7675 * If for any reason at all we couldn't handle the fault, make
7676 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7677 index 88eace4..4ba2591 100644
7678 --- a/arch/powerpc/Kconfig
7679 +++ b/arch/powerpc/Kconfig
7680 @@ -404,6 +404,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7681 config KEXEC
7682 bool "kexec system call"
7683 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7684 + depends on !GRKERNSEC_KMEM
7685 help
7686 kexec is a system call that implements the ability to shutdown your
7687 current kernel, and to start another kernel. It is like a reboot
7688 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7689 index 512d278..d31fadd 100644
7690 --- a/arch/powerpc/include/asm/atomic.h
7691 +++ b/arch/powerpc/include/asm/atomic.h
7692 @@ -12,6 +12,11 @@
7693
7694 #define ATOMIC_INIT(i) { (i) }
7695
7696 +#define _ASM_EXTABLE(from, to) \
7697 +" .section __ex_table,\"a\"\n" \
7698 + PPC_LONG" " #from ", " #to"\n" \
7699 +" .previous\n"
7700 +
7701 static __inline__ int atomic_read(const atomic_t *v)
7702 {
7703 int t;
7704 @@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7705 return t;
7706 }
7707
7708 +static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7709 +{
7710 + int t;
7711 +
7712 + __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7713 +
7714 + return t;
7715 +}
7716 +
7717 static __inline__ void atomic_set(atomic_t *v, int i)
7718 {
7719 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7720 }
7721
7722 -#define ATOMIC_OP(op, asm_op) \
7723 -static __inline__ void atomic_##op(int a, atomic_t *v) \
7724 +static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7725 +{
7726 + __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7727 +}
7728 +
7729 +#ifdef CONFIG_PAX_REFCOUNT
7730 +#define __REFCOUNT_OP(op) op##o.
7731 +#define __OVERFLOW_PRE \
7732 + " mcrxr cr0\n"
7733 +#define __OVERFLOW_POST \
7734 + " bf 4*cr0+so, 3f\n" \
7735 + "2: .long 0x00c00b00\n" \
7736 + "3:\n"
7737 +#define __OVERFLOW_EXTABLE \
7738 + "\n4:\n"
7739 + _ASM_EXTABLE(2b, 4b)
7740 +#else
7741 +#define __REFCOUNT_OP(op) op
7742 +#define __OVERFLOW_PRE
7743 +#define __OVERFLOW_POST
7744 +#define __OVERFLOW_EXTABLE
7745 +#endif
7746 +
7747 +#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7748 +static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7749 { \
7750 int t; \
7751 \
7752 __asm__ __volatile__( \
7753 -"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7754 +"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7755 + pre_op \
7756 #asm_op " %0,%2,%0\n" \
7757 + post_op \
7758 PPC405_ERR77(0,%3) \
7759 " stwcx. %0,0,%3 \n" \
7760 " bne- 1b\n" \
7761 + extable \
7762 : "=&r" (t), "+m" (v->counter) \
7763 : "r" (a), "r" (&v->counter) \
7764 : "cc"); \
7765 } \
7766
7767 -#define ATOMIC_OP_RETURN(op, asm_op) \
7768 -static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7769 +#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7770 + __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7771 +
7772 +#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7773 +static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7774 { \
7775 int t; \
7776 \
7777 __asm__ __volatile__( \
7778 PPC_ATOMIC_ENTRY_BARRIER \
7779 -"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7780 +"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7781 + pre_op \
7782 #asm_op " %0,%1,%0\n" \
7783 + post_op \
7784 PPC405_ERR77(0,%2) \
7785 " stwcx. %0,0,%2 \n" \
7786 " bne- 1b\n" \
7787 + extable \
7788 PPC_ATOMIC_EXIT_BARRIER \
7789 : "=&r" (t) \
7790 : "r" (a), "r" (&v->counter) \
7791 @@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7792 return t; \
7793 }
7794
7795 +#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7796 + __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7797 +
7798 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7799
7800 ATOMIC_OPS(add, add)
7801 @@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7802
7803 #undef ATOMIC_OPS
7804 #undef ATOMIC_OP_RETURN
7805 +#undef __ATOMIC_OP_RETURN
7806 #undef ATOMIC_OP
7807 +#undef __ATOMIC_OP
7808
7809 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7810
7811 -static __inline__ void atomic_inc(atomic_t *v)
7812 -{
7813 - int t;
7814 +/*
7815 + * atomic_inc - increment atomic variable
7816 + * @v: pointer of type atomic_t
7817 + *
7818 + * Automatically increments @v by 1
7819 + */
7820 +#define atomic_inc(v) atomic_add(1, (v))
7821 +#define atomic_inc_return(v) atomic_add_return(1, (v))
7822
7823 - __asm__ __volatile__(
7824 -"1: lwarx %0,0,%2 # atomic_inc\n\
7825 - addic %0,%0,1\n"
7826 - PPC405_ERR77(0,%2)
7827 -" stwcx. %0,0,%2 \n\
7828 - bne- 1b"
7829 - : "=&r" (t), "+m" (v->counter)
7830 - : "r" (&v->counter)
7831 - : "cc", "xer");
7832 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7833 +{
7834 + atomic_add_unchecked(1, v);
7835 }
7836
7837 -static __inline__ int atomic_inc_return(atomic_t *v)
7838 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7839 {
7840 - int t;
7841 -
7842 - __asm__ __volatile__(
7843 - PPC_ATOMIC_ENTRY_BARRIER
7844 -"1: lwarx %0,0,%1 # atomic_inc_return\n\
7845 - addic %0,%0,1\n"
7846 - PPC405_ERR77(0,%1)
7847 -" stwcx. %0,0,%1 \n\
7848 - bne- 1b"
7849 - PPC_ATOMIC_EXIT_BARRIER
7850 - : "=&r" (t)
7851 - : "r" (&v->counter)
7852 - : "cc", "xer", "memory");
7853 -
7854 - return t;
7855 + return atomic_add_return_unchecked(1, v);
7856 }
7857
7858 /*
7859 @@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7860 */
7861 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7862
7863 -static __inline__ void atomic_dec(atomic_t *v)
7864 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7865 {
7866 - int t;
7867 -
7868 - __asm__ __volatile__(
7869 -"1: lwarx %0,0,%2 # atomic_dec\n\
7870 - addic %0,%0,-1\n"
7871 - PPC405_ERR77(0,%2)\
7872 -" stwcx. %0,0,%2\n\
7873 - bne- 1b"
7874 - : "=&r" (t), "+m" (v->counter)
7875 - : "r" (&v->counter)
7876 - : "cc", "xer");
7877 + return atomic_add_return_unchecked(1, v) == 0;
7878 }
7879
7880 -static __inline__ int atomic_dec_return(atomic_t *v)
7881 +/*
7882 + * atomic_dec - decrement atomic variable
7883 + * @v: pointer of type atomic_t
7884 + *
7885 + * Atomically decrements @v by 1
7886 + */
7887 +#define atomic_dec(v) atomic_sub(1, (v))
7888 +#define atomic_dec_return(v) atomic_sub_return(1, (v))
7889 +
7890 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7891 {
7892 - int t;
7893 -
7894 - __asm__ __volatile__(
7895 - PPC_ATOMIC_ENTRY_BARRIER
7896 -"1: lwarx %0,0,%1 # atomic_dec_return\n\
7897 - addic %0,%0,-1\n"
7898 - PPC405_ERR77(0,%1)
7899 -" stwcx. %0,0,%1\n\
7900 - bne- 1b"
7901 - PPC_ATOMIC_EXIT_BARRIER
7902 - : "=&r" (t)
7903 - : "r" (&v->counter)
7904 - : "cc", "xer", "memory");
7905 -
7906 - return t;
7907 + atomic_sub_unchecked(1, v);
7908 }
7909
7910 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7911 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7912
7913 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7914 +{
7915 + return cmpxchg(&(v->counter), old, new);
7916 +}
7917 +
7918 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7919 +{
7920 + return xchg(&(v->counter), new);
7921 +}
7922 +
7923 /**
7924 * __atomic_add_unless - add unless the number is a given value
7925 * @v: pointer of type atomic_t
7926 @@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7927 PPC_ATOMIC_ENTRY_BARRIER
7928 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7929 cmpw 0,%0,%3 \n\
7930 - beq- 2f \n\
7931 - add %0,%2,%0 \n"
7932 + beq- 2f \n"
7933 +
7934 +#ifdef CONFIG_PAX_REFCOUNT
7935 +" mcrxr cr0\n"
7936 +" addo. %0,%2,%0\n"
7937 +" bf 4*cr0+so, 4f\n"
7938 +"3:.long " "0x00c00b00""\n"
7939 +"4:\n"
7940 +#else
7941 + "add %0,%2,%0 \n"
7942 +#endif
7943 +
7944 PPC405_ERR77(0,%2)
7945 " stwcx. %0,0,%1 \n\
7946 bne- 1b \n"
7947 +"5:"
7948 +
7949 +#ifdef CONFIG_PAX_REFCOUNT
7950 + _ASM_EXTABLE(3b, 5b)
7951 +#endif
7952 +
7953 PPC_ATOMIC_EXIT_BARRIER
7954 " subf %0,%2,%0 \n\
7955 2:"
7956 @@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7957 }
7958 #define atomic_dec_if_positive atomic_dec_if_positive
7959
7960 +#define smp_mb__before_atomic_dec() smp_mb()
7961 +#define smp_mb__after_atomic_dec() smp_mb()
7962 +#define smp_mb__before_atomic_inc() smp_mb()
7963 +#define smp_mb__after_atomic_inc() smp_mb()
7964 +
7965 #ifdef __powerpc64__
7966
7967 #define ATOMIC64_INIT(i) { (i) }
7968 @@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7969 return t;
7970 }
7971
7972 +static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7973 +{
7974 + long t;
7975 +
7976 + __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7977 +
7978 + return t;
7979 +}
7980 +
7981 static __inline__ void atomic64_set(atomic64_t *v, long i)
7982 {
7983 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7984 }
7985
7986 -#define ATOMIC64_OP(op, asm_op) \
7987 -static __inline__ void atomic64_##op(long a, atomic64_t *v) \
7988 +static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7989 +{
7990 + __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7991 +}
7992 +
7993 +#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7994 +static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
7995 { \
7996 long t; \
7997 \
7998 __asm__ __volatile__( \
7999 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8000 + pre_op \
8001 #asm_op " %0,%2,%0\n" \
8002 + post_op \
8003 " stdcx. %0,0,%3 \n" \
8004 " bne- 1b\n" \
8005 + extable \
8006 : "=&r" (t), "+m" (v->counter) \
8007 : "r" (a), "r" (&v->counter) \
8008 : "cc"); \
8009 }
8010
8011 -#define ATOMIC64_OP_RETURN(op, asm_op) \
8012 -static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8013 +#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8014 + __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8015 +
8016 +#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8017 +static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8018 { \
8019 long t; \
8020 \
8021 __asm__ __volatile__( \
8022 PPC_ATOMIC_ENTRY_BARRIER \
8023 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8024 + pre_op \
8025 #asm_op " %0,%1,%0\n" \
8026 + post_op \
8027 " stdcx. %0,0,%2 \n" \
8028 " bne- 1b\n" \
8029 + extable \
8030 PPC_ATOMIC_EXIT_BARRIER \
8031 : "=&r" (t) \
8032 : "r" (a), "r" (&v->counter) \
8033 @@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8034 return t; \
8035 }
8036
8037 +#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8038 + __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8039 +
8040 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8041
8042 ATOMIC64_OPS(add, add)
8043 @@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8044
8045 #undef ATOMIC64_OPS
8046 #undef ATOMIC64_OP_RETURN
8047 +#undef __ATOMIC64_OP_RETURN
8048 #undef ATOMIC64_OP
8049 +#undef __ATOMIC64_OP
8050 +#undef __OVERFLOW_EXTABLE
8051 +#undef __OVERFLOW_POST
8052 +#undef __OVERFLOW_PRE
8053 +#undef __REFCOUNT_OP
8054
8055 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8056
8057 -static __inline__ void atomic64_inc(atomic64_t *v)
8058 -{
8059 - long t;
8060 +/*
8061 + * atomic64_inc - increment atomic variable
8062 + * @v: pointer of type atomic64_t
8063 + *
8064 + * Automatically increments @v by 1
8065 + */
8066 +#define atomic64_inc(v) atomic64_add(1, (v))
8067 +#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8068
8069 - __asm__ __volatile__(
8070 -"1: ldarx %0,0,%2 # atomic64_inc\n\
8071 - addic %0,%0,1\n\
8072 - stdcx. %0,0,%2 \n\
8073 - bne- 1b"
8074 - : "=&r" (t), "+m" (v->counter)
8075 - : "r" (&v->counter)
8076 - : "cc", "xer");
8077 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8078 +{
8079 + atomic64_add_unchecked(1, v);
8080 }
8081
8082 -static __inline__ long atomic64_inc_return(atomic64_t *v)
8083 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8084 {
8085 - long t;
8086 -
8087 - __asm__ __volatile__(
8088 - PPC_ATOMIC_ENTRY_BARRIER
8089 -"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8090 - addic %0,%0,1\n\
8091 - stdcx. %0,0,%1 \n\
8092 - bne- 1b"
8093 - PPC_ATOMIC_EXIT_BARRIER
8094 - : "=&r" (t)
8095 - : "r" (&v->counter)
8096 - : "cc", "xer", "memory");
8097 -
8098 - return t;
8099 + return atomic64_add_return_unchecked(1, v);
8100 }
8101
8102 /*
8103 @@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8104 */
8105 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8106
8107 -static __inline__ void atomic64_dec(atomic64_t *v)
8108 +/*
8109 + * atomic64_dec - decrement atomic variable
8110 + * @v: pointer of type atomic64_t
8111 + *
8112 + * Atomically decrements @v by 1
8113 + */
8114 +#define atomic64_dec(v) atomic64_sub(1, (v))
8115 +#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8116 +
8117 +static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8118 {
8119 - long t;
8120 -
8121 - __asm__ __volatile__(
8122 -"1: ldarx %0,0,%2 # atomic64_dec\n\
8123 - addic %0,%0,-1\n\
8124 - stdcx. %0,0,%2\n\
8125 - bne- 1b"
8126 - : "=&r" (t), "+m" (v->counter)
8127 - : "r" (&v->counter)
8128 - : "cc", "xer");
8129 -}
8130 -
8131 -static __inline__ long atomic64_dec_return(atomic64_t *v)
8132 -{
8133 - long t;
8134 -
8135 - __asm__ __volatile__(
8136 - PPC_ATOMIC_ENTRY_BARRIER
8137 -"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8138 - addic %0,%0,-1\n\
8139 - stdcx. %0,0,%1\n\
8140 - bne- 1b"
8141 - PPC_ATOMIC_EXIT_BARRIER
8142 - : "=&r" (t)
8143 - : "r" (&v->counter)
8144 - : "cc", "xer", "memory");
8145 -
8146 - return t;
8147 + atomic64_sub_unchecked(1, v);
8148 }
8149
8150 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8151 @@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8152 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8153 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8154
8155 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8156 +{
8157 + return cmpxchg(&(v->counter), old, new);
8158 +}
8159 +
8160 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8161 +{
8162 + return xchg(&(v->counter), new);
8163 +}
8164 +
8165 /**
8166 * atomic64_add_unless - add unless the number is a given value
8167 * @v: pointer of type atomic64_t
8168 @@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8169
8170 __asm__ __volatile__ (
8171 PPC_ATOMIC_ENTRY_BARRIER
8172 -"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8173 +"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8174 cmpd 0,%0,%3 \n\
8175 - beq- 2f \n\
8176 - add %0,%2,%0 \n"
8177 + beq- 2f \n"
8178 +
8179 +#ifdef CONFIG_PAX_REFCOUNT
8180 +" mcrxr cr0\n"
8181 +" addo. %0,%2,%0\n"
8182 +" bf 4*cr0+so, 4f\n"
8183 +"3:.long " "0x00c00b00""\n"
8184 +"4:\n"
8185 +#else
8186 + "add %0,%2,%0 \n"
8187 +#endif
8188 +
8189 " stdcx. %0,0,%1 \n\
8190 bne- 1b \n"
8191 PPC_ATOMIC_EXIT_BARRIER
8192 +"5:"
8193 +
8194 +#ifdef CONFIG_PAX_REFCOUNT
8195 + _ASM_EXTABLE(3b, 5b)
8196 +#endif
8197 +
8198 " subf %0,%2,%0 \n\
8199 2:"
8200 : "=&r" (t)
8201 diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8202 index bab79a1..4a3eabc 100644
8203 --- a/arch/powerpc/include/asm/barrier.h
8204 +++ b/arch/powerpc/include/asm/barrier.h
8205 @@ -73,7 +73,7 @@
8206 do { \
8207 compiletime_assert_atomic_type(*p); \
8208 __lwsync(); \
8209 - ACCESS_ONCE(*p) = (v); \
8210 + ACCESS_ONCE_RW(*p) = (v); \
8211 } while (0)
8212
8213 #define smp_load_acquire(p) \
8214 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8215 index 34a05a1..a1f2c67 100644
8216 --- a/arch/powerpc/include/asm/cache.h
8217 +++ b/arch/powerpc/include/asm/cache.h
8218 @@ -4,6 +4,7 @@
8219 #ifdef __KERNEL__
8220
8221 #include <asm/reg.h>
8222 +#include <linux/const.h>
8223
8224 /* bytes per L1 cache line */
8225 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8226 @@ -23,7 +24,7 @@
8227 #define L1_CACHE_SHIFT 7
8228 #endif
8229
8230 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8231 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8232
8233 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8234
8235 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8236 index 888d8f3..66f581c 100644
8237 --- a/arch/powerpc/include/asm/elf.h
8238 +++ b/arch/powerpc/include/asm/elf.h
8239 @@ -28,8 +28,19 @@
8240 the loader. We need to make sure that it is out of the way of the program
8241 that it will "exec", and that there is sufficient room for the brk. */
8242
8243 -extern unsigned long randomize_et_dyn(unsigned long base);
8244 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8245 +#define ELF_ET_DYN_BASE (0x20000000)
8246 +
8247 +#ifdef CONFIG_PAX_ASLR
8248 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8249 +
8250 +#ifdef __powerpc64__
8251 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8252 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8253 +#else
8254 +#define PAX_DELTA_MMAP_LEN 15
8255 +#define PAX_DELTA_STACK_LEN 15
8256 +#endif
8257 +#endif
8258
8259 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8260
8261 @@ -129,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8262 (0x7ff >> (PAGE_SHIFT - 12)) : \
8263 (0x3ffff >> (PAGE_SHIFT - 12)))
8264
8265 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8266 -#define arch_randomize_brk arch_randomize_brk
8267 -
8268 -
8269 #ifdef CONFIG_SPU_BASE
8270 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8271 #define NT_SPU 1
8272 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8273 index 8196e9c..d83a9f3 100644
8274 --- a/arch/powerpc/include/asm/exec.h
8275 +++ b/arch/powerpc/include/asm/exec.h
8276 @@ -4,6 +4,6 @@
8277 #ifndef _ASM_POWERPC_EXEC_H
8278 #define _ASM_POWERPC_EXEC_H
8279
8280 -extern unsigned long arch_align_stack(unsigned long sp);
8281 +#define arch_align_stack(x) ((x) & ~0xfUL)
8282
8283 #endif /* _ASM_POWERPC_EXEC_H */
8284 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8285 index 5acabbd..7ea14fa 100644
8286 --- a/arch/powerpc/include/asm/kmap_types.h
8287 +++ b/arch/powerpc/include/asm/kmap_types.h
8288 @@ -10,7 +10,7 @@
8289 * 2 of the License, or (at your option) any later version.
8290 */
8291
8292 -#define KM_TYPE_NR 16
8293 +#define KM_TYPE_NR 17
8294
8295 #endif /* __KERNEL__ */
8296 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8297 diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8298 index b8da913..c02b593 100644
8299 --- a/arch/powerpc/include/asm/local.h
8300 +++ b/arch/powerpc/include/asm/local.h
8301 @@ -9,21 +9,65 @@ typedef struct
8302 atomic_long_t a;
8303 } local_t;
8304
8305 +typedef struct
8306 +{
8307 + atomic_long_unchecked_t a;
8308 +} local_unchecked_t;
8309 +
8310 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8311
8312 #define local_read(l) atomic_long_read(&(l)->a)
8313 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8314 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8315 +#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8316
8317 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8318 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8319 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8320 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8321 #define local_inc(l) atomic_long_inc(&(l)->a)
8322 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8323 #define local_dec(l) atomic_long_dec(&(l)->a)
8324 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8325
8326 static __inline__ long local_add_return(long a, local_t *l)
8327 {
8328 long t;
8329
8330 __asm__ __volatile__(
8331 +"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8332 +
8333 +#ifdef CONFIG_PAX_REFCOUNT
8334 +" mcrxr cr0\n"
8335 +" addo. %0,%1,%0\n"
8336 +" bf 4*cr0+so, 3f\n"
8337 +"2:.long " "0x00c00b00""\n"
8338 +#else
8339 +" add %0,%1,%0\n"
8340 +#endif
8341 +
8342 +"3:\n"
8343 + PPC405_ERR77(0,%2)
8344 + PPC_STLCX "%0,0,%2 \n\
8345 + bne- 1b"
8346 +
8347 +#ifdef CONFIG_PAX_REFCOUNT
8348 +"\n4:\n"
8349 + _ASM_EXTABLE(2b, 4b)
8350 +#endif
8351 +
8352 + : "=&r" (t)
8353 + : "r" (a), "r" (&(l->a.counter))
8354 + : "cc", "memory");
8355 +
8356 + return t;
8357 +}
8358 +
8359 +static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8360 +{
8361 + long t;
8362 +
8363 + __asm__ __volatile__(
8364 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8365 add %0,%1,%0\n"
8366 PPC405_ERR77(0,%2)
8367 @@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8368
8369 #define local_cmpxchg(l, o, n) \
8370 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8371 +#define local_cmpxchg_unchecked(l, o, n) \
8372 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
8373 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8374
8375 /**
8376 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8377 index 8565c25..2865190 100644
8378 --- a/arch/powerpc/include/asm/mman.h
8379 +++ b/arch/powerpc/include/asm/mman.h
8380 @@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8381 }
8382 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8383
8384 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8385 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8386 {
8387 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8388 }
8389 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8390 index 26fe1ae..987ffc5 100644
8391 --- a/arch/powerpc/include/asm/page.h
8392 +++ b/arch/powerpc/include/asm/page.h
8393 @@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8394 * and needs to be executable. This means the whole heap ends
8395 * up being executable.
8396 */
8397 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8398 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8399 +#define VM_DATA_DEFAULT_FLAGS32 \
8400 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8401 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8402
8403 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8404 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8405 @@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8406 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8407 #endif
8408
8409 +#define ktla_ktva(addr) (addr)
8410 +#define ktva_ktla(addr) (addr)
8411 +
8412 #ifndef CONFIG_PPC_BOOK3S_64
8413 /*
8414 * Use the top bit of the higher-level page table entries to indicate whether
8415 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8416 index d908a46..3753f71 100644
8417 --- a/arch/powerpc/include/asm/page_64.h
8418 +++ b/arch/powerpc/include/asm/page_64.h
8419 @@ -172,15 +172,18 @@ do { \
8420 * stack by default, so in the absence of a PT_GNU_STACK program header
8421 * we turn execute permission off.
8422 */
8423 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8424 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8425 +#define VM_STACK_DEFAULT_FLAGS32 \
8426 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8427 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8428
8429 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8430 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8431
8432 +#ifndef CONFIG_PAX_PAGEEXEC
8433 #define VM_STACK_DEFAULT_FLAGS \
8434 (is_32bit_task() ? \
8435 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8436 +#endif
8437
8438 #include <asm-generic/getorder.h>
8439
8440 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8441 index 4b0be20..c15a27d 100644
8442 --- a/arch/powerpc/include/asm/pgalloc-64.h
8443 +++ b/arch/powerpc/include/asm/pgalloc-64.h
8444 @@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8445 #ifndef CONFIG_PPC_64K_PAGES
8446
8447 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8448 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8449
8450 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8451 {
8452 @@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8453 pud_set(pud, (unsigned long)pmd);
8454 }
8455
8456 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8457 +{
8458 + pud_populate(mm, pud, pmd);
8459 +}
8460 +
8461 #define pmd_populate(mm, pmd, pte_page) \
8462 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8463 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8464 @@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8465 #endif
8466
8467 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8468 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8469
8470 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8471 pte_t *pte)
8472 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8473 index 316f9a5..ba05c77 100644
8474 --- a/arch/powerpc/include/asm/pgtable.h
8475 +++ b/arch/powerpc/include/asm/pgtable.h
8476 @@ -2,6 +2,7 @@
8477 #define _ASM_POWERPC_PGTABLE_H
8478 #ifdef __KERNEL__
8479
8480 +#include <linux/const.h>
8481 #ifndef __ASSEMBLY__
8482 #include <linux/mmdebug.h>
8483 #include <linux/mmzone.h>
8484 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8485 index 4aad413..85d86bf 100644
8486 --- a/arch/powerpc/include/asm/pte-hash32.h
8487 +++ b/arch/powerpc/include/asm/pte-hash32.h
8488 @@ -21,6 +21,7 @@
8489 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8490 #define _PAGE_USER 0x004 /* usermode access allowed */
8491 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8492 +#define _PAGE_EXEC _PAGE_GUARDED
8493 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8494 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8495 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8496 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8497 index c998279..d13a9f8 100644
8498 --- a/arch/powerpc/include/asm/reg.h
8499 +++ b/arch/powerpc/include/asm/reg.h
8500 @@ -251,6 +251,7 @@
8501 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8502 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8503 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8504 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8505 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8506 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8507 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8508 diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8509 index 5a6614a..d89995d1 100644
8510 --- a/arch/powerpc/include/asm/smp.h
8511 +++ b/arch/powerpc/include/asm/smp.h
8512 @@ -51,7 +51,7 @@ struct smp_ops_t {
8513 int (*cpu_disable)(void);
8514 void (*cpu_die)(unsigned int nr);
8515 int (*cpu_bootable)(unsigned int nr);
8516 -};
8517 +} __no_const;
8518
8519 extern void smp_send_debugger_break(void);
8520 extern void start_secondary_resume(void);
8521 diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8522 index 4dbe072..b803275 100644
8523 --- a/arch/powerpc/include/asm/spinlock.h
8524 +++ b/arch/powerpc/include/asm/spinlock.h
8525 @@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8526 __asm__ __volatile__(
8527 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8528 __DO_SIGN_EXTEND
8529 -" addic. %0,%0,1\n\
8530 - ble- 2f\n"
8531 +
8532 +#ifdef CONFIG_PAX_REFCOUNT
8533 +" mcrxr cr0\n"
8534 +" addico. %0,%0,1\n"
8535 +" bf 4*cr0+so, 3f\n"
8536 +"2:.long " "0x00c00b00""\n"
8537 +#else
8538 +" addic. %0,%0,1\n"
8539 +#endif
8540 +
8541 +"3:\n"
8542 + "ble- 4f\n"
8543 PPC405_ERR77(0,%1)
8544 " stwcx. %0,0,%1\n\
8545 bne- 1b\n"
8546 PPC_ACQUIRE_BARRIER
8547 -"2:" : "=&r" (tmp)
8548 +"4:"
8549 +
8550 +#ifdef CONFIG_PAX_REFCOUNT
8551 + _ASM_EXTABLE(2b,4b)
8552 +#endif
8553 +
8554 + : "=&r" (tmp)
8555 : "r" (&rw->lock)
8556 : "cr0", "xer", "memory");
8557
8558 @@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8559 __asm__ __volatile__(
8560 "# read_unlock\n\t"
8561 PPC_RELEASE_BARRIER
8562 -"1: lwarx %0,0,%1\n\
8563 - addic %0,%0,-1\n"
8564 +"1: lwarx %0,0,%1\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 PPC405_ERR77(0,%1)
8577 " stwcx. %0,0,%1\n\
8578 bne- 1b"
8579 +
8580 +#ifdef CONFIG_PAX_REFCOUNT
8581 +"\n4:\n"
8582 + _ASM_EXTABLE(2b, 4b)
8583 +#endif
8584 +
8585 : "=&r"(tmp)
8586 : "r"(&rw->lock)
8587 : "cr0", "xer", "memory");
8588 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8589 index b034ecd..af7e31f 100644
8590 --- a/arch/powerpc/include/asm/thread_info.h
8591 +++ b/arch/powerpc/include/asm/thread_info.h
8592 @@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8593 #if defined(CONFIG_PPC64)
8594 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8595 #endif
8596 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8597 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8598
8599 /* as above, but as bit values */
8600 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8601 @@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8602 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8603 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8604 #define _TIF_NOHZ (1<<TIF_NOHZ)
8605 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8606 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8607 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8608 - _TIF_NOHZ)
8609 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
8610
8611 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8612 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8613 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8614 index 9485b43..3bd3c16 100644
8615 --- a/arch/powerpc/include/asm/uaccess.h
8616 +++ b/arch/powerpc/include/asm/uaccess.h
8617 @@ -58,6 +58,7 @@
8618
8619 #endif
8620
8621 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8622 #define access_ok(type, addr, size) \
8623 (__chk_user_ptr(addr), \
8624 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8625 @@ -318,52 +319,6 @@ do { \
8626 extern unsigned long __copy_tofrom_user(void __user *to,
8627 const void __user *from, unsigned long size);
8628
8629 -#ifndef __powerpc64__
8630 -
8631 -static inline unsigned long copy_from_user(void *to,
8632 - const void __user *from, unsigned long n)
8633 -{
8634 - unsigned long over;
8635 -
8636 - if (access_ok(VERIFY_READ, from, n))
8637 - return __copy_tofrom_user((__force void __user *)to, from, n);
8638 - if ((unsigned long)from < TASK_SIZE) {
8639 - over = (unsigned long)from + n - TASK_SIZE;
8640 - return __copy_tofrom_user((__force void __user *)to, from,
8641 - n - over) + over;
8642 - }
8643 - return n;
8644 -}
8645 -
8646 -static inline unsigned long copy_to_user(void __user *to,
8647 - const void *from, unsigned long n)
8648 -{
8649 - unsigned long over;
8650 -
8651 - if (access_ok(VERIFY_WRITE, to, n))
8652 - return __copy_tofrom_user(to, (__force void __user *)from, n);
8653 - if ((unsigned long)to < TASK_SIZE) {
8654 - over = (unsigned long)to + n - TASK_SIZE;
8655 - return __copy_tofrom_user(to, (__force void __user *)from,
8656 - n - over) + over;
8657 - }
8658 - return n;
8659 -}
8660 -
8661 -#else /* __powerpc64__ */
8662 -
8663 -#define __copy_in_user(to, from, size) \
8664 - __copy_tofrom_user((to), (from), (size))
8665 -
8666 -extern unsigned long copy_from_user(void *to, const void __user *from,
8667 - unsigned long n);
8668 -extern unsigned long copy_to_user(void __user *to, const void *from,
8669 - unsigned long n);
8670 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
8671 - unsigned long n);
8672 -
8673 -#endif /* __powerpc64__ */
8674 -
8675 static inline unsigned long __copy_from_user_inatomic(void *to,
8676 const void __user *from, unsigned long n)
8677 {
8678 @@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8679 if (ret == 0)
8680 return 0;
8681 }
8682 +
8683 + if (!__builtin_constant_p(n))
8684 + check_object_size(to, n, false);
8685 +
8686 return __copy_tofrom_user((__force void __user *)to, from, n);
8687 }
8688
8689 @@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8690 if (ret == 0)
8691 return 0;
8692 }
8693 +
8694 + if (!__builtin_constant_p(n))
8695 + check_object_size(from, n, true);
8696 +
8697 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8698 }
8699
8700 @@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8701 return __copy_to_user_inatomic(to, from, size);
8702 }
8703
8704 +#ifndef __powerpc64__
8705 +
8706 +static inline unsigned long __must_check copy_from_user(void *to,
8707 + const void __user *from, unsigned long n)
8708 +{
8709 + unsigned long over;
8710 +
8711 + if ((long)n < 0)
8712 + return n;
8713 +
8714 + if (access_ok(VERIFY_READ, from, n)) {
8715 + if (!__builtin_constant_p(n))
8716 + check_object_size(to, n, false);
8717 + return __copy_tofrom_user((__force void __user *)to, from, n);
8718 + }
8719 + if ((unsigned long)from < TASK_SIZE) {
8720 + over = (unsigned long)from + n - TASK_SIZE;
8721 + if (!__builtin_constant_p(n - over))
8722 + check_object_size(to, n - over, false);
8723 + return __copy_tofrom_user((__force void __user *)to, from,
8724 + n - over) + over;
8725 + }
8726 + return n;
8727 +}
8728 +
8729 +static inline unsigned long __must_check copy_to_user(void __user *to,
8730 + const void *from, unsigned long n)
8731 +{
8732 + unsigned long over;
8733 +
8734 + if ((long)n < 0)
8735 + return n;
8736 +
8737 + if (access_ok(VERIFY_WRITE, to, n)) {
8738 + if (!__builtin_constant_p(n))
8739 + check_object_size(from, n, true);
8740 + return __copy_tofrom_user(to, (__force void __user *)from, n);
8741 + }
8742 + if ((unsigned long)to < TASK_SIZE) {
8743 + over = (unsigned long)to + n - TASK_SIZE;
8744 + if (!__builtin_constant_p(n))
8745 + check_object_size(from, n - over, true);
8746 + return __copy_tofrom_user(to, (__force void __user *)from,
8747 + n - over) + over;
8748 + }
8749 + return n;
8750 +}
8751 +
8752 +#else /* __powerpc64__ */
8753 +
8754 +#define __copy_in_user(to, from, size) \
8755 + __copy_tofrom_user((to), (from), (size))
8756 +
8757 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8758 +{
8759 + if ((long)n < 0 || n > INT_MAX)
8760 + return n;
8761 +
8762 + if (!__builtin_constant_p(n))
8763 + check_object_size(to, n, false);
8764 +
8765 + if (likely(access_ok(VERIFY_READ, from, n)))
8766 + n = __copy_from_user(to, from, n);
8767 + else
8768 + memset(to, 0, n);
8769 + return n;
8770 +}
8771 +
8772 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8773 +{
8774 + if ((long)n < 0 || n > INT_MAX)
8775 + return n;
8776 +
8777 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
8778 + if (!__builtin_constant_p(n))
8779 + check_object_size(from, n, true);
8780 + n = __copy_to_user(to, from, n);
8781 + }
8782 + return n;
8783 +}
8784 +
8785 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
8786 + unsigned long n);
8787 +
8788 +#endif /* __powerpc64__ */
8789 +
8790 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8791
8792 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8793 diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8794 index 502cf69..822e63b 100644
8795 --- a/arch/powerpc/kernel/Makefile
8796 +++ b/arch/powerpc/kernel/Makefile
8797 @@ -27,6 +27,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8798 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8799 endif
8800
8801 +CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8802 +
8803 obj-y := cputable.o ptrace.o syscalls.o \
8804 irq.o align.o signal_32.o pmc.o vdso.o \
8805 process.o systbl.o idle.o \
8806 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8807 index 3e68d1c..72a5ee6 100644
8808 --- a/arch/powerpc/kernel/exceptions-64e.S
8809 +++ b/arch/powerpc/kernel/exceptions-64e.S
8810 @@ -1010,6 +1010,7 @@ storage_fault_common:
8811 std r14,_DAR(r1)
8812 std r15,_DSISR(r1)
8813 addi r3,r1,STACK_FRAME_OVERHEAD
8814 + bl save_nvgprs
8815 mr r4,r14
8816 mr r5,r15
8817 ld r14,PACA_EXGEN+EX_R14(r13)
8818 @@ -1018,8 +1019,7 @@ storage_fault_common:
8819 cmpdi r3,0
8820 bne- 1f
8821 b ret_from_except_lite
8822 -1: bl save_nvgprs
8823 - mr r5,r3
8824 +1: mr r5,r3
8825 addi r3,r1,STACK_FRAME_OVERHEAD
8826 ld r4,_DAR(r1)
8827 bl bad_page_fault
8828 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8829 index 72e783e..fe058e2 100644
8830 --- a/arch/powerpc/kernel/exceptions-64s.S
8831 +++ b/arch/powerpc/kernel/exceptions-64s.S
8832 @@ -1588,10 +1588,10 @@ handle_page_fault:
8833 11: ld r4,_DAR(r1)
8834 ld r5,_DSISR(r1)
8835 addi r3,r1,STACK_FRAME_OVERHEAD
8836 + bl save_nvgprs
8837 bl do_page_fault
8838 cmpdi r3,0
8839 beq+ 12f
8840 - bl save_nvgprs
8841 mr r5,r3
8842 addi r3,r1,STACK_FRAME_OVERHEAD
8843 lwz r4,_DAR(r1)
8844 diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8845 index c143835..5a9697f 100644
8846 --- a/arch/powerpc/kernel/irq.c
8847 +++ b/arch/powerpc/kernel/irq.c
8848 @@ -461,6 +461,8 @@ void migrate_irqs(void)
8849 }
8850 #endif
8851
8852 +extern void gr_handle_kernel_exploit(void);
8853 +
8854 static inline void check_stack_overflow(void)
8855 {
8856 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8857 @@ -473,6 +475,7 @@ static inline void check_stack_overflow(void)
8858 pr_err("do_IRQ: stack overflow: %ld\n",
8859 sp - sizeof(struct thread_info));
8860 dump_stack();
8861 + gr_handle_kernel_exploit();
8862 }
8863 #endif
8864 }
8865 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8866 index c94d2e0..992a9ce 100644
8867 --- a/arch/powerpc/kernel/module_32.c
8868 +++ b/arch/powerpc/kernel/module_32.c
8869 @@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8870 me->arch.core_plt_section = i;
8871 }
8872 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8873 - pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8874 + pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8875 return -ENOEXEC;
8876 }
8877
8878 @@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8879
8880 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8881 /* Init, or core PLT? */
8882 - if (location >= mod->module_core
8883 - && location < mod->module_core + mod->core_size)
8884 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8885 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8886 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8887 - else
8888 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8889 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8890 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8891 + else {
8892 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8893 + return ~0UL;
8894 + }
8895
8896 /* Find this entry, or if that fails, the next avail. entry */
8897 while (entry->jump[0]) {
8898 @@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8899 }
8900 #ifdef CONFIG_DYNAMIC_FTRACE
8901 module->arch.tramp =
8902 - do_plt_call(module->module_core,
8903 + do_plt_call(module->module_core_rx,
8904 (unsigned long)ftrace_caller,
8905 sechdrs, module);
8906 #endif
8907 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8908 index 923cd2d..ae782a9 100644
8909 --- a/arch/powerpc/kernel/process.c
8910 +++ b/arch/powerpc/kernel/process.c
8911 @@ -1040,8 +1040,8 @@ void show_regs(struct pt_regs * regs)
8912 * Lookup NIP late so we have the best change of getting the
8913 * above info out without failing
8914 */
8915 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8916 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8917 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8918 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8919 #endif
8920 show_stack(current, (unsigned long *) regs->gpr[1]);
8921 if (!user_mode(regs))
8922 @@ -1560,10 +1560,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8923 newsp = stack[0];
8924 ip = stack[STACK_FRAME_LR_SAVE];
8925 if (!firstframe || ip != lr) {
8926 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8927 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8928 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8929 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8930 - printk(" (%pS)",
8931 + printk(" (%pA)",
8932 (void *)current->ret_stack[curr_frame].ret);
8933 curr_frame--;
8934 }
8935 @@ -1583,7 +1583,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8936 struct pt_regs *regs = (struct pt_regs *)
8937 (sp + STACK_FRAME_OVERHEAD);
8938 lr = regs->link;
8939 - printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8940 + printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8941 regs->trap, (void *)regs->nip, (void *)lr);
8942 firstframe = 1;
8943 }
8944 @@ -1619,58 +1619,3 @@ void notrace __ppc64_runlatch_off(void)
8945 mtspr(SPRN_CTRLT, ctrl);
8946 }
8947 #endif /* CONFIG_PPC64 */
8948 -
8949 -unsigned long arch_align_stack(unsigned long sp)
8950 -{
8951 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8952 - sp -= get_random_int() & ~PAGE_MASK;
8953 - return sp & ~0xf;
8954 -}
8955 -
8956 -static inline unsigned long brk_rnd(void)
8957 -{
8958 - unsigned long rnd = 0;
8959 -
8960 - /* 8MB for 32bit, 1GB for 64bit */
8961 - if (is_32bit_task())
8962 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8963 - else
8964 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8965 -
8966 - return rnd << PAGE_SHIFT;
8967 -}
8968 -
8969 -unsigned long arch_randomize_brk(struct mm_struct *mm)
8970 -{
8971 - unsigned long base = mm->brk;
8972 - unsigned long ret;
8973 -
8974 -#ifdef CONFIG_PPC_STD_MMU_64
8975 - /*
8976 - * If we are using 1TB segments and we are allowed to randomise
8977 - * the heap, we can put it above 1TB so it is backed by a 1TB
8978 - * segment. Otherwise the heap will be in the bottom 1TB
8979 - * which always uses 256MB segments and this may result in a
8980 - * performance penalty.
8981 - */
8982 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8983 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8984 -#endif
8985 -
8986 - ret = PAGE_ALIGN(base + brk_rnd());
8987 -
8988 - if (ret < mm->brk)
8989 - return mm->brk;
8990 -
8991 - return ret;
8992 -}
8993 -
8994 -unsigned long randomize_et_dyn(unsigned long base)
8995 -{
8996 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8997 -
8998 - if (ret < base)
8999 - return base;
9000 -
9001 - return ret;
9002 -}
9003 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9004 index f21897b..28c0428 100644
9005 --- a/arch/powerpc/kernel/ptrace.c
9006 +++ b/arch/powerpc/kernel/ptrace.c
9007 @@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9008 return ret;
9009 }
9010
9011 +#ifdef CONFIG_GRKERNSEC_SETXID
9012 +extern void gr_delayed_cred_worker(void);
9013 +#endif
9014 +
9015 /*
9016 * We must return the syscall number to actually look up in the table.
9017 * This can be -1L to skip running any syscall at all.
9018 @@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9019
9020 secure_computing_strict(regs->gpr[0]);
9021
9022 +#ifdef CONFIG_GRKERNSEC_SETXID
9023 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9024 + gr_delayed_cred_worker();
9025 +#endif
9026 +
9027 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9028 tracehook_report_syscall_entry(regs))
9029 /*
9030 @@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9031 {
9032 int step;
9033
9034 +#ifdef CONFIG_GRKERNSEC_SETXID
9035 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9036 + gr_delayed_cred_worker();
9037 +#endif
9038 +
9039 audit_syscall_exit(regs);
9040
9041 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9042 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9043 index b171001..4ac7ac5 100644
9044 --- a/arch/powerpc/kernel/signal_32.c
9045 +++ b/arch/powerpc/kernel/signal_32.c
9046 @@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9047 /* Save user registers on the stack */
9048 frame = &rt_sf->uc.uc_mcontext;
9049 addr = frame;
9050 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9051 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9052 sigret = 0;
9053 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9054 } else {
9055 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9056 index 2cb0c94..c0c0bc9 100644
9057 --- a/arch/powerpc/kernel/signal_64.c
9058 +++ b/arch/powerpc/kernel/signal_64.c
9059 @@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9060 current->thread.fp_state.fpscr = 0;
9061
9062 /* Set up to return from userspace. */
9063 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9064 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9065 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9066 } else {
9067 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9068 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9069 index 0dc43f9..a885d33 100644
9070 --- a/arch/powerpc/kernel/traps.c
9071 +++ b/arch/powerpc/kernel/traps.c
9072 @@ -36,6 +36,7 @@
9073 #include <linux/debugfs.h>
9074 #include <linux/ratelimit.h>
9075 #include <linux/context_tracking.h>
9076 +#include <linux/uaccess.h>
9077
9078 #include <asm/emulated_ops.h>
9079 #include <asm/pgtable.h>
9080 @@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9081 return flags;
9082 }
9083
9084 +extern void gr_handle_kernel_exploit(void);
9085 +
9086 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9087 int signr)
9088 {
9089 @@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9090 panic("Fatal exception in interrupt");
9091 if (panic_on_oops)
9092 panic("Fatal exception");
9093 +
9094 + gr_handle_kernel_exploit();
9095 +
9096 do_exit(signr);
9097 }
9098
9099 @@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9100 enum ctx_state prev_state = exception_enter();
9101 unsigned int reason = get_reason(regs);
9102
9103 +#ifdef CONFIG_PAX_REFCOUNT
9104 + unsigned int bkpt;
9105 + const struct exception_table_entry *entry;
9106 +
9107 + if (reason & REASON_ILLEGAL) {
9108 + /* Check if PaX bad instruction */
9109 + if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9110 + current->thread.trap_nr = 0;
9111 + pax_report_refcount_overflow(regs);
9112 + /* fixup_exception() for PowerPC does not exist, simulate its job */
9113 + if ((entry = search_exception_tables(regs->nip)) != NULL) {
9114 + regs->nip = entry->fixup;
9115 + return;
9116 + }
9117 + /* fixup_exception() could not handle */
9118 + goto bail;
9119 + }
9120 + }
9121 +#endif
9122 +
9123 /* We can now get here via a FP Unavailable exception if the core
9124 * has no FPU, in that case the reason flags will be 0 */
9125
9126 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9127 index f174351..5722009 100644
9128 --- a/arch/powerpc/kernel/vdso.c
9129 +++ b/arch/powerpc/kernel/vdso.c
9130 @@ -35,6 +35,7 @@
9131 #include <asm/vdso.h>
9132 #include <asm/vdso_datapage.h>
9133 #include <asm/setup.h>
9134 +#include <asm/mman.h>
9135
9136 #undef DEBUG
9137
9138 @@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9139 vdso_base = VDSO32_MBASE;
9140 #endif
9141
9142 - current->mm->context.vdso_base = 0;
9143 + current->mm->context.vdso_base = ~0UL;
9144
9145 /* vDSO has a problem and was disabled, just don't "enable" it for the
9146 * process
9147 @@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9148 vdso_base = get_unmapped_area(NULL, vdso_base,
9149 (vdso_pages << PAGE_SHIFT) +
9150 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9151 - 0, 0);
9152 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
9153 if (IS_ERR_VALUE(vdso_base)) {
9154 rc = vdso_base;
9155 goto fail_mmapsem;
9156 diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9157 index c1f8f53..71a3b96 100644
9158 --- a/arch/powerpc/kvm/powerpc.c
9159 +++ b/arch/powerpc/kvm/powerpc.c
9160 @@ -1409,7 +1409,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9161 }
9162 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9163
9164 -int kvm_arch_init(void *opaque)
9165 +int kvm_arch_init(const void *opaque)
9166 {
9167 return 0;
9168 }
9169 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9170 index 5eea6f3..5d10396 100644
9171 --- a/arch/powerpc/lib/usercopy_64.c
9172 +++ b/arch/powerpc/lib/usercopy_64.c
9173 @@ -9,22 +9,6 @@
9174 #include <linux/module.h>
9175 #include <asm/uaccess.h>
9176
9177 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9178 -{
9179 - if (likely(access_ok(VERIFY_READ, from, n)))
9180 - n = __copy_from_user(to, from, n);
9181 - else
9182 - memset(to, 0, n);
9183 - return n;
9184 -}
9185 -
9186 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9187 -{
9188 - if (likely(access_ok(VERIFY_WRITE, to, n)))
9189 - n = __copy_to_user(to, from, n);
9190 - return n;
9191 -}
9192 -
9193 unsigned long copy_in_user(void __user *to, const void __user *from,
9194 unsigned long n)
9195 {
9196 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9197 return n;
9198 }
9199
9200 -EXPORT_SYMBOL(copy_from_user);
9201 -EXPORT_SYMBOL(copy_to_user);
9202 EXPORT_SYMBOL(copy_in_user);
9203
9204 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9205 index 08d659a..ab329f4 100644
9206 --- a/arch/powerpc/mm/fault.c
9207 +++ b/arch/powerpc/mm/fault.c
9208 @@ -33,6 +33,10 @@
9209 #include <linux/ratelimit.h>
9210 #include <linux/context_tracking.h>
9211 #include <linux/hugetlb.h>
9212 +#include <linux/slab.h>
9213 +#include <linux/pagemap.h>
9214 +#include <linux/compiler.h>
9215 +#include <linux/unistd.h>
9216
9217 #include <asm/firmware.h>
9218 #include <asm/page.h>
9219 @@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9220 }
9221 #endif
9222
9223 +#ifdef CONFIG_PAX_PAGEEXEC
9224 +/*
9225 + * PaX: decide what to do with offenders (regs->nip = fault address)
9226 + *
9227 + * returns 1 when task should be killed
9228 + */
9229 +static int pax_handle_fetch_fault(struct pt_regs *regs)
9230 +{
9231 + return 1;
9232 +}
9233 +
9234 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9235 +{
9236 + unsigned long i;
9237 +
9238 + printk(KERN_ERR "PAX: bytes at PC: ");
9239 + for (i = 0; i < 5; i++) {
9240 + unsigned int c;
9241 + if (get_user(c, (unsigned int __user *)pc+i))
9242 + printk(KERN_CONT "???????? ");
9243 + else
9244 + printk(KERN_CONT "%08x ", c);
9245 + }
9246 + printk("\n");
9247 +}
9248 +#endif
9249 +
9250 /*
9251 * Check whether the instruction at regs->nip is a store using
9252 * an update addressing form which will update r1.
9253 @@ -228,7 +259,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9254 * indicate errors in DSISR but can validly be set in SRR1.
9255 */
9256 if (trap == 0x400)
9257 - error_code &= 0x48200000;
9258 + error_code &= 0x58200000;
9259 else
9260 is_write = error_code & DSISR_ISSTORE;
9261 #else
9262 @@ -390,7 +421,7 @@ good_area:
9263 * "undefined". Of those that can be set, this is the only
9264 * one which seems bad.
9265 */
9266 - if (error_code & 0x10000000)
9267 + if (error_code & DSISR_GUARDED)
9268 /* Guarded storage error. */
9269 goto bad_area;
9270 #endif /* CONFIG_8xx */
9271 @@ -405,7 +436,7 @@ good_area:
9272 * processors use the same I/D cache coherency mechanism
9273 * as embedded.
9274 */
9275 - if (error_code & DSISR_PROTFAULT)
9276 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
9277 goto bad_area;
9278 #endif /* CONFIG_PPC_STD_MMU */
9279
9280 @@ -495,6 +526,23 @@ bad_area:
9281 bad_area_nosemaphore:
9282 /* User mode accesses cause a SIGSEGV */
9283 if (user_mode(regs)) {
9284 +
9285 +#ifdef CONFIG_PAX_PAGEEXEC
9286 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9287 +#ifdef CONFIG_PPC_STD_MMU
9288 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9289 +#else
9290 + if (is_exec && regs->nip == address) {
9291 +#endif
9292 + switch (pax_handle_fetch_fault(regs)) {
9293 + }
9294 +
9295 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9296 + do_group_exit(SIGKILL);
9297 + }
9298 + }
9299 +#endif
9300 +
9301 _exception(SIGSEGV, regs, code, address);
9302 goto bail;
9303 }
9304 diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9305 index cb8bdbe..cde4bc7 100644
9306 --- a/arch/powerpc/mm/mmap.c
9307 +++ b/arch/powerpc/mm/mmap.c
9308 @@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9309 return sysctl_legacy_va_layout;
9310 }
9311
9312 -static unsigned long mmap_rnd(void)
9313 +static unsigned long mmap_rnd(struct mm_struct *mm)
9314 {
9315 unsigned long rnd = 0;
9316
9317 +#ifdef CONFIG_PAX_RANDMMAP
9318 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9319 +#endif
9320 +
9321 if (current->flags & PF_RANDOMIZE) {
9322 /* 8MB for 32bit, 1GB for 64bit */
9323 if (is_32bit_task())
9324 @@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9325 return rnd << PAGE_SHIFT;
9326 }
9327
9328 -static inline unsigned long mmap_base(void)
9329 +static inline unsigned long mmap_base(struct mm_struct *mm)
9330 {
9331 unsigned long gap = rlimit(RLIMIT_STACK);
9332
9333 @@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9334 else if (gap > MAX_GAP)
9335 gap = MAX_GAP;
9336
9337 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9338 + return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9339 }
9340
9341 /*
9342 @@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9343 */
9344 if (mmap_is_legacy()) {
9345 mm->mmap_base = TASK_UNMAPPED_BASE;
9346 +
9347 +#ifdef CONFIG_PAX_RANDMMAP
9348 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9349 + mm->mmap_base += mm->delta_mmap;
9350 +#endif
9351 +
9352 mm->get_unmapped_area = arch_get_unmapped_area;
9353 } else {
9354 - mm->mmap_base = mmap_base();
9355 + mm->mmap_base = mmap_base(mm);
9356 +
9357 +#ifdef CONFIG_PAX_RANDMMAP
9358 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9359 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9360 +#endif
9361 +
9362 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9363 }
9364 }
9365 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9366 index ded0ea1..f213a9b 100644
9367 --- a/arch/powerpc/mm/slice.c
9368 +++ b/arch/powerpc/mm/slice.c
9369 @@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9370 if ((mm->task_size - len) < addr)
9371 return 0;
9372 vma = find_vma(mm, addr);
9373 - return (!vma || (addr + len) <= vma->vm_start);
9374 + return check_heap_stack_gap(vma, addr, len, 0);
9375 }
9376
9377 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9378 @@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9379 info.align_offset = 0;
9380
9381 addr = TASK_UNMAPPED_BASE;
9382 +
9383 +#ifdef CONFIG_PAX_RANDMMAP
9384 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9385 + addr += mm->delta_mmap;
9386 +#endif
9387 +
9388 while (addr < TASK_SIZE) {
9389 info.low_limit = addr;
9390 if (!slice_scan_available(addr, available, 1, &addr))
9391 @@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9392 if (fixed && addr > (mm->task_size - len))
9393 return -ENOMEM;
9394
9395 +#ifdef CONFIG_PAX_RANDMMAP
9396 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9397 + addr = 0;
9398 +#endif
9399 +
9400 /* If hint, make sure it matches our alignment restrictions */
9401 if (!fixed && addr) {
9402 addr = _ALIGN_UP(addr, 1ul << pshift);
9403 diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9404 index 4278acf..67fd0e6 100644
9405 --- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9406 +++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9407 @@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9408 }
9409
9410 static struct pci_ops scc_pciex_pci_ops = {
9411 - scc_pciex_read_config,
9412 - scc_pciex_write_config,
9413 + .read = scc_pciex_read_config,
9414 + .write = scc_pciex_write_config,
9415 };
9416
9417 static void pciex_clear_intr_all(unsigned int __iomem *base)
9418 diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9419 index d966bbe..372124a 100644
9420 --- a/arch/powerpc/platforms/cell/spufs/file.c
9421 +++ b/arch/powerpc/platforms/cell/spufs/file.c
9422 @@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9423 return VM_FAULT_NOPAGE;
9424 }
9425
9426 -static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9427 +static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9428 unsigned long address,
9429 - void *buf, int len, int write)
9430 + void *buf, size_t len, int write)
9431 {
9432 struct spu_context *ctx = vma->vm_file->private_data;
9433 unsigned long offset = address - vma->vm_start;
9434 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9435 index fa934fe..c296056 100644
9436 --- a/arch/s390/include/asm/atomic.h
9437 +++ b/arch/s390/include/asm/atomic.h
9438 @@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9439 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9440 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9441
9442 +#define atomic64_read_unchecked(v) atomic64_read(v)
9443 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9444 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9445 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9446 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9447 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
9448 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9449 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
9450 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9451 +
9452 #endif /* __ARCH_S390_ATOMIC__ */
9453 diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9454 index b5dce65..8aca09a 100644
9455 --- a/arch/s390/include/asm/barrier.h
9456 +++ b/arch/s390/include/asm/barrier.h
9457 @@ -39,7 +39,7 @@
9458 do { \
9459 compiletime_assert_atomic_type(*p); \
9460 barrier(); \
9461 - ACCESS_ONCE(*p) = (v); \
9462 + ACCESS_ONCE_RW(*p) = (v); \
9463 } while (0)
9464
9465 #define smp_load_acquire(p) \
9466 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9467 index 4d7ccac..d03d0ad 100644
9468 --- a/arch/s390/include/asm/cache.h
9469 +++ b/arch/s390/include/asm/cache.h
9470 @@ -9,8 +9,10 @@
9471 #ifndef __ARCH_S390_CACHE_H
9472 #define __ARCH_S390_CACHE_H
9473
9474 -#define L1_CACHE_BYTES 256
9475 +#include <linux/const.h>
9476 +
9477 #define L1_CACHE_SHIFT 8
9478 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9479 #define NET_SKB_PAD 32
9480
9481 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9482 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9483 index f6e43d3..5f57681 100644
9484 --- a/arch/s390/include/asm/elf.h
9485 +++ b/arch/s390/include/asm/elf.h
9486 @@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9487 the loader. We need to make sure that it is out of the way of the program
9488 that it will "exec", and that there is sufficient room for the brk. */
9489
9490 -extern unsigned long randomize_et_dyn(unsigned long base);
9491 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9492 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9493 +
9494 +#ifdef CONFIG_PAX_ASLR
9495 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9496 +
9497 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9498 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9499 +#endif
9500
9501 /* This yields a mask that user programs can use to figure out what
9502 instruction set this CPU supports. */
9503 @@ -223,9 +229,6 @@ struct linux_binprm;
9504 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9505 int arch_setup_additional_pages(struct linux_binprm *, int);
9506
9507 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9508 -#define arch_randomize_brk arch_randomize_brk
9509 -
9510 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9511
9512 #endif
9513 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9514 index c4a93d6..4d2a9b4 100644
9515 --- a/arch/s390/include/asm/exec.h
9516 +++ b/arch/s390/include/asm/exec.h
9517 @@ -7,6 +7,6 @@
9518 #ifndef __ASM_EXEC_H
9519 #define __ASM_EXEC_H
9520
9521 -extern unsigned long arch_align_stack(unsigned long sp);
9522 +#define arch_align_stack(x) ((x) & ~0xfUL)
9523
9524 #endif /* __ASM_EXEC_H */
9525 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9526 index cd4c68e..6764641 100644
9527 --- a/arch/s390/include/asm/uaccess.h
9528 +++ b/arch/s390/include/asm/uaccess.h
9529 @@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9530 __range_ok((unsigned long)(addr), (size)); \
9531 })
9532
9533 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9534 #define access_ok(type, addr, size) __access_ok(addr, size)
9535
9536 /*
9537 @@ -275,6 +276,10 @@ static inline unsigned long __must_check
9538 copy_to_user(void __user *to, const void *from, unsigned long n)
9539 {
9540 might_fault();
9541 +
9542 + if ((long)n < 0)
9543 + return n;
9544 +
9545 return __copy_to_user(to, from, n);
9546 }
9547
9548 @@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9549 static inline unsigned long __must_check
9550 copy_from_user(void *to, const void __user *from, unsigned long n)
9551 {
9552 - unsigned int sz = __compiletime_object_size(to);
9553 + size_t sz = __compiletime_object_size(to);
9554
9555 might_fault();
9556 - if (unlikely(sz != -1 && sz < n)) {
9557 +
9558 + if ((long)n < 0)
9559 + return n;
9560 +
9561 + if (unlikely(sz != (size_t)-1 && sz < n)) {
9562 copy_from_user_overflow();
9563 return n;
9564 }
9565 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9566 index b89b591..fd9609d 100644
9567 --- a/arch/s390/kernel/module.c
9568 +++ b/arch/s390/kernel/module.c
9569 @@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9570
9571 /* Increase core size by size of got & plt and set start
9572 offsets for got and plt. */
9573 - me->core_size = ALIGN(me->core_size, 4);
9574 - me->arch.got_offset = me->core_size;
9575 - me->core_size += me->arch.got_size;
9576 - me->arch.plt_offset = me->core_size;
9577 - me->core_size += me->arch.plt_size;
9578 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
9579 + me->arch.got_offset = me->core_size_rw;
9580 + me->core_size_rw += me->arch.got_size;
9581 + me->arch.plt_offset = me->core_size_rx;
9582 + me->core_size_rx += me->arch.plt_size;
9583 return 0;
9584 }
9585
9586 @@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9587 if (info->got_initialized == 0) {
9588 Elf_Addr *gotent;
9589
9590 - gotent = me->module_core + me->arch.got_offset +
9591 + gotent = me->module_core_rw + me->arch.got_offset +
9592 info->got_offset;
9593 *gotent = val;
9594 info->got_initialized = 1;
9595 @@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9596 rc = apply_rela_bits(loc, val, 0, 64, 0);
9597 else if (r_type == R_390_GOTENT ||
9598 r_type == R_390_GOTPLTENT) {
9599 - val += (Elf_Addr) me->module_core - loc;
9600 + val += (Elf_Addr) me->module_core_rw - loc;
9601 rc = apply_rela_bits(loc, val, 1, 32, 1);
9602 }
9603 break;
9604 @@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9605 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9606 if (info->plt_initialized == 0) {
9607 unsigned int *ip;
9608 - ip = me->module_core + me->arch.plt_offset +
9609 + ip = me->module_core_rx + me->arch.plt_offset +
9610 info->plt_offset;
9611 #ifndef CONFIG_64BIT
9612 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9613 @@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9614 val - loc + 0xffffUL < 0x1ffffeUL) ||
9615 (r_type == R_390_PLT32DBL &&
9616 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9617 - val = (Elf_Addr) me->module_core +
9618 + val = (Elf_Addr) me->module_core_rx +
9619 me->arch.plt_offset +
9620 info->plt_offset;
9621 val += rela->r_addend - loc;
9622 @@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9623 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9624 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9625 val = val + rela->r_addend -
9626 - ((Elf_Addr) me->module_core + me->arch.got_offset);
9627 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9628 if (r_type == R_390_GOTOFF16)
9629 rc = apply_rela_bits(loc, val, 0, 16, 0);
9630 else if (r_type == R_390_GOTOFF32)
9631 @@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9632 break;
9633 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9634 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9635 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
9636 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9637 rela->r_addend - loc;
9638 if (r_type == R_390_GOTPC)
9639 rc = apply_rela_bits(loc, val, 1, 32, 0);
9640 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9641 index ed84cc2..c05a9d2 100644
9642 --- a/arch/s390/kernel/process.c
9643 +++ b/arch/s390/kernel/process.c
9644 @@ -218,37 +218,3 @@ unsigned long get_wchan(struct task_struct *p)
9645 }
9646 return 0;
9647 }
9648 -
9649 -unsigned long arch_align_stack(unsigned long sp)
9650 -{
9651 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9652 - sp -= get_random_int() & ~PAGE_MASK;
9653 - return sp & ~0xf;
9654 -}
9655 -
9656 -static inline unsigned long brk_rnd(void)
9657 -{
9658 - /* 8MB for 32bit, 1GB for 64bit */
9659 - if (is_32bit_task())
9660 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9661 - else
9662 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9663 -}
9664 -
9665 -unsigned long arch_randomize_brk(struct mm_struct *mm)
9666 -{
9667 - unsigned long ret;
9668 -
9669 - ret = PAGE_ALIGN(mm->brk + brk_rnd());
9670 - return (ret > mm->brk) ? ret : mm->brk;
9671 -}
9672 -
9673 -unsigned long randomize_et_dyn(unsigned long base)
9674 -{
9675 - unsigned long ret;
9676 -
9677 - if (!(current->flags & PF_RANDOMIZE))
9678 - return base;
9679 - ret = PAGE_ALIGN(base + brk_rnd());
9680 - return (ret > base) ? ret : base;
9681 -}
9682 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9683 index 9b436c2..54fbf0a 100644
9684 --- a/arch/s390/mm/mmap.c
9685 +++ b/arch/s390/mm/mmap.c
9686 @@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9687 */
9688 if (mmap_is_legacy()) {
9689 mm->mmap_base = mmap_base_legacy();
9690 +
9691 +#ifdef CONFIG_PAX_RANDMMAP
9692 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9693 + mm->mmap_base += mm->delta_mmap;
9694 +#endif
9695 +
9696 mm->get_unmapped_area = arch_get_unmapped_area;
9697 } else {
9698 mm->mmap_base = mmap_base();
9699 +
9700 +#ifdef CONFIG_PAX_RANDMMAP
9701 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9702 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9703 +#endif
9704 +
9705 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9706 }
9707 }
9708 @@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9709 */
9710 if (mmap_is_legacy()) {
9711 mm->mmap_base = mmap_base_legacy();
9712 +
9713 +#ifdef CONFIG_PAX_RANDMMAP
9714 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9715 + mm->mmap_base += mm->delta_mmap;
9716 +#endif
9717 +
9718 mm->get_unmapped_area = s390_get_unmapped_area;
9719 } else {
9720 mm->mmap_base = mmap_base();
9721 +
9722 +#ifdef CONFIG_PAX_RANDMMAP
9723 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9724 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9725 +#endif
9726 +
9727 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9728 }
9729 }
9730 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9731 index ae3d59f..f65f075 100644
9732 --- a/arch/score/include/asm/cache.h
9733 +++ b/arch/score/include/asm/cache.h
9734 @@ -1,7 +1,9 @@
9735 #ifndef _ASM_SCORE_CACHE_H
9736 #define _ASM_SCORE_CACHE_H
9737
9738 +#include <linux/const.h>
9739 +
9740 #define L1_CACHE_SHIFT 4
9741 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9742 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9743
9744 #endif /* _ASM_SCORE_CACHE_H */
9745 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9746 index f9f3cd5..58ff438 100644
9747 --- a/arch/score/include/asm/exec.h
9748 +++ b/arch/score/include/asm/exec.h
9749 @@ -1,6 +1,6 @@
9750 #ifndef _ASM_SCORE_EXEC_H
9751 #define _ASM_SCORE_EXEC_H
9752
9753 -extern unsigned long arch_align_stack(unsigned long sp);
9754 +#define arch_align_stack(x) (x)
9755
9756 #endif /* _ASM_SCORE_EXEC_H */
9757 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9758 index a1519ad3..e8ac1ff 100644
9759 --- a/arch/score/kernel/process.c
9760 +++ b/arch/score/kernel/process.c
9761 @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9762
9763 return task_pt_regs(task)->cp0_epc;
9764 }
9765 -
9766 -unsigned long arch_align_stack(unsigned long sp)
9767 -{
9768 - return sp;
9769 -}
9770 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9771 index ef9e555..331bd29 100644
9772 --- a/arch/sh/include/asm/cache.h
9773 +++ b/arch/sh/include/asm/cache.h
9774 @@ -9,10 +9,11 @@
9775 #define __ASM_SH_CACHE_H
9776 #ifdef __KERNEL__
9777
9778 +#include <linux/const.h>
9779 #include <linux/init.h>
9780 #include <cpu/cache.h>
9781
9782 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9783 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9784
9785 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9786
9787 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9788 index 6777177..cb5e44f 100644
9789 --- a/arch/sh/mm/mmap.c
9790 +++ b/arch/sh/mm/mmap.c
9791 @@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9792 struct mm_struct *mm = current->mm;
9793 struct vm_area_struct *vma;
9794 int do_colour_align;
9795 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9796 struct vm_unmapped_area_info info;
9797
9798 if (flags & MAP_FIXED) {
9799 @@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9800 if (filp || (flags & MAP_SHARED))
9801 do_colour_align = 1;
9802
9803 +#ifdef CONFIG_PAX_RANDMMAP
9804 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9805 +#endif
9806 +
9807 if (addr) {
9808 if (do_colour_align)
9809 addr = COLOUR_ALIGN(addr, pgoff);
9810 @@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9811 addr = PAGE_ALIGN(addr);
9812
9813 vma = find_vma(mm, addr);
9814 - if (TASK_SIZE - len >= addr &&
9815 - (!vma || addr + len <= vma->vm_start))
9816 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9817 return addr;
9818 }
9819
9820 info.flags = 0;
9821 info.length = len;
9822 - info.low_limit = TASK_UNMAPPED_BASE;
9823 + info.low_limit = mm->mmap_base;
9824 info.high_limit = TASK_SIZE;
9825 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9826 info.align_offset = pgoff << PAGE_SHIFT;
9827 @@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9828 struct mm_struct *mm = current->mm;
9829 unsigned long addr = addr0;
9830 int do_colour_align;
9831 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9832 struct vm_unmapped_area_info info;
9833
9834 if (flags & MAP_FIXED) {
9835 @@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9836 if (filp || (flags & MAP_SHARED))
9837 do_colour_align = 1;
9838
9839 +#ifdef CONFIG_PAX_RANDMMAP
9840 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9841 +#endif
9842 +
9843 /* requesting a specific address */
9844 if (addr) {
9845 if (do_colour_align)
9846 @@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9847 addr = PAGE_ALIGN(addr);
9848
9849 vma = find_vma(mm, addr);
9850 - if (TASK_SIZE - len >= addr &&
9851 - (!vma || addr + len <= vma->vm_start))
9852 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9853 return addr;
9854 }
9855
9856 @@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9857 VM_BUG_ON(addr != -ENOMEM);
9858 info.flags = 0;
9859 info.low_limit = TASK_UNMAPPED_BASE;
9860 +
9861 +#ifdef CONFIG_PAX_RANDMMAP
9862 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9863 + info.low_limit += mm->delta_mmap;
9864 +#endif
9865 +
9866 info.high_limit = TASK_SIZE;
9867 addr = vm_unmapped_area(&info);
9868 }
9869 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9870 index 4082749..fd97781 100644
9871 --- a/arch/sparc/include/asm/atomic_64.h
9872 +++ b/arch/sparc/include/asm/atomic_64.h
9873 @@ -15,18 +15,38 @@
9874 #define ATOMIC64_INIT(i) { (i) }
9875
9876 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9877 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9878 +{
9879 + return ACCESS_ONCE(v->counter);
9880 +}
9881 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9882 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9883 +{
9884 + return ACCESS_ONCE(v->counter);
9885 +}
9886
9887 #define atomic_set(v, i) (((v)->counter) = i)
9888 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9889 +{
9890 + v->counter = i;
9891 +}
9892 #define atomic64_set(v, i) (((v)->counter) = i)
9893 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9894 +{
9895 + v->counter = i;
9896 +}
9897
9898 -#define ATOMIC_OP(op) \
9899 -void atomic_##op(int, atomic_t *); \
9900 -void atomic64_##op(long, atomic64_t *);
9901 +#define __ATOMIC_OP(op, suffix) \
9902 +void atomic_##op##suffix(int, atomic##suffix##_t *); \
9903 +void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9904
9905 -#define ATOMIC_OP_RETURN(op) \
9906 -int atomic_##op##_return(int, atomic_t *); \
9907 -long atomic64_##op##_return(long, atomic64_t *);
9908 +#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9909 +
9910 +#define __ATOMIC_OP_RETURN(op, suffix) \
9911 +int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9912 +long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9913 +
9914 +#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9915
9916 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9917
9918 @@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9919
9920 #undef ATOMIC_OPS
9921 #undef ATOMIC_OP_RETURN
9922 +#undef __ATOMIC_OP_RETURN
9923 #undef ATOMIC_OP
9924 +#undef __ATOMIC_OP
9925
9926 #define atomic_dec_return(v) atomic_sub_return(1, v)
9927 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9928
9929 #define atomic_inc_return(v) atomic_add_return(1, v)
9930 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9931 +{
9932 + return atomic_add_return_unchecked(1, v);
9933 +}
9934 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9935 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9936 +{
9937 + return atomic64_add_return_unchecked(1, v);
9938 +}
9939
9940 /*
9941 * atomic_inc_and_test - increment and test
9942 @@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9943 * other cases.
9944 */
9945 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9946 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9947 +{
9948 + return atomic_inc_return_unchecked(v) == 0;
9949 +}
9950 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9951
9952 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9953 @@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9954 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9955
9956 #define atomic_inc(v) atomic_add(1, v)
9957 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9958 +{
9959 + atomic_add_unchecked(1, v);
9960 +}
9961 #define atomic64_inc(v) atomic64_add(1, v)
9962 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9963 +{
9964 + atomic64_add_unchecked(1, v);
9965 +}
9966
9967 #define atomic_dec(v) atomic_sub(1, v)
9968 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9969 +{
9970 + atomic_sub_unchecked(1, v);
9971 +}
9972 #define atomic64_dec(v) atomic64_sub(1, v)
9973 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9974 +{
9975 + atomic64_sub_unchecked(1, v);
9976 +}
9977
9978 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9979 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9980
9981 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9982 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9983 +{
9984 + return cmpxchg(&v->counter, old, new);
9985 +}
9986 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9987 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9988 +{
9989 + return xchg(&v->counter, new);
9990 +}
9991
9992 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9993 {
9994 - int c, old;
9995 + int c, old, new;
9996 c = atomic_read(v);
9997 for (;;) {
9998 - if (unlikely(c == (u)))
9999 + if (unlikely(c == u))
10000 break;
10001 - old = atomic_cmpxchg((v), c, c + (a));
10002 +
10003 + asm volatile("addcc %2, %0, %0\n"
10004 +
10005 +#ifdef CONFIG_PAX_REFCOUNT
10006 + "tvs %%icc, 6\n"
10007 +#endif
10008 +
10009 + : "=r" (new)
10010 + : "0" (c), "ir" (a)
10011 + : "cc");
10012 +
10013 + old = atomic_cmpxchg(v, c, new);
10014 if (likely(old == c))
10015 break;
10016 c = old;
10017 @@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10018 #define atomic64_cmpxchg(v, o, n) \
10019 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10020 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10021 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10022 +{
10023 + return xchg(&v->counter, new);
10024 +}
10025
10026 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10027 {
10028 - long c, old;
10029 + long c, old, new;
10030 c = atomic64_read(v);
10031 for (;;) {
10032 - if (unlikely(c == (u)))
10033 + if (unlikely(c == u))
10034 break;
10035 - old = atomic64_cmpxchg((v), c, c + (a));
10036 +
10037 + asm volatile("addcc %2, %0, %0\n"
10038 +
10039 +#ifdef CONFIG_PAX_REFCOUNT
10040 + "tvs %%xcc, 6\n"
10041 +#endif
10042 +
10043 + : "=r" (new)
10044 + : "0" (c), "ir" (a)
10045 + : "cc");
10046 +
10047 + old = atomic64_cmpxchg(v, c, new);
10048 if (likely(old == c))
10049 break;
10050 c = old;
10051 }
10052 - return c != (u);
10053 + return c != u;
10054 }
10055
10056 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10057 diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10058 index 305dcc3..7835030 100644
10059 --- a/arch/sparc/include/asm/barrier_64.h
10060 +++ b/arch/sparc/include/asm/barrier_64.h
10061 @@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10062 do { \
10063 compiletime_assert_atomic_type(*p); \
10064 barrier(); \
10065 - ACCESS_ONCE(*p) = (v); \
10066 + ACCESS_ONCE_RW(*p) = (v); \
10067 } while (0)
10068
10069 #define smp_load_acquire(p) \
10070 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10071 index 5bb6991..5c2132e 100644
10072 --- a/arch/sparc/include/asm/cache.h
10073 +++ b/arch/sparc/include/asm/cache.h
10074 @@ -7,10 +7,12 @@
10075 #ifndef _SPARC_CACHE_H
10076 #define _SPARC_CACHE_H
10077
10078 +#include <linux/const.h>
10079 +
10080 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10081
10082 #define L1_CACHE_SHIFT 5
10083 -#define L1_CACHE_BYTES 32
10084 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10085
10086 #ifdef CONFIG_SPARC32
10087 #define SMP_CACHE_BYTES_SHIFT 5
10088 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10089 index a24e41f..47677ff 100644
10090 --- a/arch/sparc/include/asm/elf_32.h
10091 +++ b/arch/sparc/include/asm/elf_32.h
10092 @@ -114,6 +114,13 @@ typedef struct {
10093
10094 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10095
10096 +#ifdef CONFIG_PAX_ASLR
10097 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
10098 +
10099 +#define PAX_DELTA_MMAP_LEN 16
10100 +#define PAX_DELTA_STACK_LEN 16
10101 +#endif
10102 +
10103 /* This yields a mask that user programs can use to figure out what
10104 instruction set this cpu supports. This can NOT be done in userspace
10105 on Sparc. */
10106 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10107 index 370ca1e..d4f4a98 100644
10108 --- a/arch/sparc/include/asm/elf_64.h
10109 +++ b/arch/sparc/include/asm/elf_64.h
10110 @@ -189,6 +189,13 @@ typedef struct {
10111 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10112 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10113
10114 +#ifdef CONFIG_PAX_ASLR
10115 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10116 +
10117 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10118 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10119 +#endif
10120 +
10121 extern unsigned long sparc64_elf_hwcap;
10122 #define ELF_HWCAP sparc64_elf_hwcap
10123
10124 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10125 index a3890da..f6a408e 100644
10126 --- a/arch/sparc/include/asm/pgalloc_32.h
10127 +++ b/arch/sparc/include/asm/pgalloc_32.h
10128 @@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10129 }
10130
10131 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10132 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10133
10134 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10135 unsigned long address)
10136 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10137 index 5e31871..13469c6 100644
10138 --- a/arch/sparc/include/asm/pgalloc_64.h
10139 +++ b/arch/sparc/include/asm/pgalloc_64.h
10140 @@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10141 }
10142
10143 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10144 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10145
10146 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10147 {
10148 @@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10149 }
10150
10151 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10152 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10153
10154 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10155 {
10156 diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10157 index 59ba6f6..4518128 100644
10158 --- a/arch/sparc/include/asm/pgtable.h
10159 +++ b/arch/sparc/include/asm/pgtable.h
10160 @@ -5,4 +5,8 @@
10161 #else
10162 #include <asm/pgtable_32.h>
10163 #endif
10164 +
10165 +#define ktla_ktva(addr) (addr)
10166 +#define ktva_ktla(addr) (addr)
10167 +
10168 #endif
10169 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10170 index b9b91ae..950b91e 100644
10171 --- a/arch/sparc/include/asm/pgtable_32.h
10172 +++ b/arch/sparc/include/asm/pgtable_32.h
10173 @@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10174 #define PAGE_SHARED SRMMU_PAGE_SHARED
10175 #define PAGE_COPY SRMMU_PAGE_COPY
10176 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10177 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10178 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10179 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10180 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10181
10182 /* Top-level page directory - dummy used by init-mm.
10183 @@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10184
10185 /* xwr */
10186 #define __P000 PAGE_NONE
10187 -#define __P001 PAGE_READONLY
10188 -#define __P010 PAGE_COPY
10189 -#define __P011 PAGE_COPY
10190 +#define __P001 PAGE_READONLY_NOEXEC
10191 +#define __P010 PAGE_COPY_NOEXEC
10192 +#define __P011 PAGE_COPY_NOEXEC
10193 #define __P100 PAGE_READONLY
10194 #define __P101 PAGE_READONLY
10195 #define __P110 PAGE_COPY
10196 #define __P111 PAGE_COPY
10197
10198 #define __S000 PAGE_NONE
10199 -#define __S001 PAGE_READONLY
10200 -#define __S010 PAGE_SHARED
10201 -#define __S011 PAGE_SHARED
10202 +#define __S001 PAGE_READONLY_NOEXEC
10203 +#define __S010 PAGE_SHARED_NOEXEC
10204 +#define __S011 PAGE_SHARED_NOEXEC
10205 #define __S100 PAGE_READONLY
10206 #define __S101 PAGE_READONLY
10207 #define __S110 PAGE_SHARED
10208 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10209 index 79da178..c2eede8 100644
10210 --- a/arch/sparc/include/asm/pgtsrmmu.h
10211 +++ b/arch/sparc/include/asm/pgtsrmmu.h
10212 @@ -115,6 +115,11 @@
10213 SRMMU_EXEC | SRMMU_REF)
10214 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10215 SRMMU_EXEC | SRMMU_REF)
10216 +
10217 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10218 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10219 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10220 +
10221 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10222 SRMMU_DIRTY | SRMMU_REF)
10223
10224 diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10225 index 29d64b1..4272fe8 100644
10226 --- a/arch/sparc/include/asm/setup.h
10227 +++ b/arch/sparc/include/asm/setup.h
10228 @@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10229 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10230
10231 /* init_64.c */
10232 -extern atomic_t dcpage_flushes;
10233 -extern atomic_t dcpage_flushes_xcall;
10234 +extern atomic_unchecked_t dcpage_flushes;
10235 +extern atomic_unchecked_t dcpage_flushes_xcall;
10236
10237 extern int sysctl_tsb_ratio;
10238 #endif
10239 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10240 index 9689176..63c18ea 100644
10241 --- a/arch/sparc/include/asm/spinlock_64.h
10242 +++ b/arch/sparc/include/asm/spinlock_64.h
10243 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10244
10245 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10246
10247 -static void inline arch_read_lock(arch_rwlock_t *lock)
10248 +static inline void arch_read_lock(arch_rwlock_t *lock)
10249 {
10250 unsigned long tmp1, tmp2;
10251
10252 __asm__ __volatile__ (
10253 "1: ldsw [%2], %0\n"
10254 " brlz,pn %0, 2f\n"
10255 -"4: add %0, 1, %1\n"
10256 +"4: addcc %0, 1, %1\n"
10257 +
10258 +#ifdef CONFIG_PAX_REFCOUNT
10259 +" tvs %%icc, 6\n"
10260 +#endif
10261 +
10262 " cas [%2], %0, %1\n"
10263 " cmp %0, %1\n"
10264 " bne,pn %%icc, 1b\n"
10265 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10266 " .previous"
10267 : "=&r" (tmp1), "=&r" (tmp2)
10268 : "r" (lock)
10269 - : "memory");
10270 + : "memory", "cc");
10271 }
10272
10273 -static int inline arch_read_trylock(arch_rwlock_t *lock)
10274 +static inline int arch_read_trylock(arch_rwlock_t *lock)
10275 {
10276 int tmp1, tmp2;
10277
10278 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10279 "1: ldsw [%2], %0\n"
10280 " brlz,a,pn %0, 2f\n"
10281 " mov 0, %0\n"
10282 -" add %0, 1, %1\n"
10283 +" addcc %0, 1, %1\n"
10284 +
10285 +#ifdef CONFIG_PAX_REFCOUNT
10286 +" tvs %%icc, 6\n"
10287 +#endif
10288 +
10289 " cas [%2], %0, %1\n"
10290 " cmp %0, %1\n"
10291 " bne,pn %%icc, 1b\n"
10292 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10293 return tmp1;
10294 }
10295
10296 -static void inline arch_read_unlock(arch_rwlock_t *lock)
10297 +static inline void arch_read_unlock(arch_rwlock_t *lock)
10298 {
10299 unsigned long tmp1, tmp2;
10300
10301 __asm__ __volatile__(
10302 "1: lduw [%2], %0\n"
10303 -" sub %0, 1, %1\n"
10304 +" subcc %0, 1, %1\n"
10305 +
10306 +#ifdef CONFIG_PAX_REFCOUNT
10307 +" tvs %%icc, 6\n"
10308 +#endif
10309 +
10310 " cas [%2], %0, %1\n"
10311 " cmp %0, %1\n"
10312 " bne,pn %%xcc, 1b\n"
10313 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10314 : "memory");
10315 }
10316
10317 -static void inline arch_write_lock(arch_rwlock_t *lock)
10318 +static inline void arch_write_lock(arch_rwlock_t *lock)
10319 {
10320 unsigned long mask, tmp1, tmp2;
10321
10322 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10323 : "memory");
10324 }
10325
10326 -static void inline arch_write_unlock(arch_rwlock_t *lock)
10327 +static inline void arch_write_unlock(arch_rwlock_t *lock)
10328 {
10329 __asm__ __volatile__(
10330 " stw %%g0, [%0]"
10331 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10332 : "memory");
10333 }
10334
10335 -static int inline arch_write_trylock(arch_rwlock_t *lock)
10336 +static inline int arch_write_trylock(arch_rwlock_t *lock)
10337 {
10338 unsigned long mask, tmp1, tmp2, result;
10339
10340 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10341 index 025c984..a216504 100644
10342 --- a/arch/sparc/include/asm/thread_info_32.h
10343 +++ b/arch/sparc/include/asm/thread_info_32.h
10344 @@ -49,6 +49,8 @@ struct thread_info {
10345 unsigned long w_saved;
10346
10347 struct restart_block restart_block;
10348 +
10349 + unsigned long lowest_stack;
10350 };
10351
10352 /*
10353 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10354 index 798f027..b009941 100644
10355 --- a/arch/sparc/include/asm/thread_info_64.h
10356 +++ b/arch/sparc/include/asm/thread_info_64.h
10357 @@ -63,6 +63,8 @@ struct thread_info {
10358 struct pt_regs *kern_una_regs;
10359 unsigned int kern_una_insn;
10360
10361 + unsigned long lowest_stack;
10362 +
10363 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10364 __attribute__ ((aligned(64)));
10365 };
10366 @@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10367 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10368 /* flag bit 4 is available */
10369 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10370 -/* flag bit 6 is available */
10371 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10372 #define TIF_32BIT 7 /* 32-bit binary */
10373 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10374 #define TIF_SECCOMP 9 /* secure computing */
10375 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10376 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10377 +
10378 /* NOTE: Thread flags >= 12 should be ones we have no interest
10379 * in using in assembly, else we can't use the mask as
10380 * an immediate value in instructions such as andcc.
10381 @@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10382 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10383 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10384 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10385 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10386
10387 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10388 _TIF_DO_NOTIFY_RESUME_MASK | \
10389 _TIF_NEED_RESCHED)
10390 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10391
10392 +#define _TIF_WORK_SYSCALL \
10393 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10394 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10395 +
10396 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10397
10398 /*
10399 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10400 index bd56c28..4b63d83 100644
10401 --- a/arch/sparc/include/asm/uaccess.h
10402 +++ b/arch/sparc/include/asm/uaccess.h
10403 @@ -1,5 +1,6 @@
10404 #ifndef ___ASM_SPARC_UACCESS_H
10405 #define ___ASM_SPARC_UACCESS_H
10406 +
10407 #if defined(__sparc__) && defined(__arch64__)
10408 #include <asm/uaccess_64.h>
10409 #else
10410 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10411 index 9634d08..f55fe4f 100644
10412 --- a/arch/sparc/include/asm/uaccess_32.h
10413 +++ b/arch/sparc/include/asm/uaccess_32.h
10414 @@ -250,27 +250,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10415
10416 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10417 {
10418 - if (n && __access_ok((unsigned long) to, n))
10419 + if ((long)n < 0)
10420 + return n;
10421 +
10422 + if (n && __access_ok((unsigned long) to, n)) {
10423 + if (!__builtin_constant_p(n))
10424 + check_object_size(from, n, true);
10425 return __copy_user(to, (__force void __user *) from, n);
10426 - else
10427 + } else
10428 return n;
10429 }
10430
10431 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10432 {
10433 + if ((long)n < 0)
10434 + return n;
10435 +
10436 + if (!__builtin_constant_p(n))
10437 + check_object_size(from, n, true);
10438 +
10439 return __copy_user(to, (__force void __user *) from, n);
10440 }
10441
10442 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10443 {
10444 - if (n && __access_ok((unsigned long) from, n))
10445 + if ((long)n < 0)
10446 + return n;
10447 +
10448 + if (n && __access_ok((unsigned long) from, n)) {
10449 + if (!__builtin_constant_p(n))
10450 + check_object_size(to, n, false);
10451 return __copy_user((__force void __user *) to, from, n);
10452 - else
10453 + } else
10454 return n;
10455 }
10456
10457 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10458 {
10459 + if ((long)n < 0)
10460 + return n;
10461 +
10462 return __copy_user((__force void __user *) to, from, n);
10463 }
10464
10465 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10466 index c990a5e..f17b9c1 100644
10467 --- a/arch/sparc/include/asm/uaccess_64.h
10468 +++ b/arch/sparc/include/asm/uaccess_64.h
10469 @@ -10,6 +10,7 @@
10470 #include <linux/compiler.h>
10471 #include <linux/string.h>
10472 #include <linux/thread_info.h>
10473 +#include <linux/kernel.h>
10474 #include <asm/asi.h>
10475 #include <asm/spitfire.h>
10476 #include <asm-generic/uaccess-unaligned.h>
10477 @@ -214,8 +215,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10478 static inline unsigned long __must_check
10479 copy_from_user(void *to, const void __user *from, unsigned long size)
10480 {
10481 - unsigned long ret = ___copy_from_user(to, from, size);
10482 + unsigned long ret;
10483
10484 + if ((long)size < 0 || size > INT_MAX)
10485 + return size;
10486 +
10487 + if (!__builtin_constant_p(size))
10488 + check_object_size(to, size, false);
10489 +
10490 + ret = ___copy_from_user(to, from, size);
10491 if (unlikely(ret))
10492 ret = copy_from_user_fixup(to, from, size);
10493
10494 @@ -231,8 +239,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10495 static inline unsigned long __must_check
10496 copy_to_user(void __user *to, const void *from, unsigned long size)
10497 {
10498 - unsigned long ret = ___copy_to_user(to, from, size);
10499 + unsigned long ret;
10500
10501 + if ((long)size < 0 || size > INT_MAX)
10502 + return size;
10503 +
10504 + if (!__builtin_constant_p(size))
10505 + check_object_size(from, size, true);
10506 +
10507 + ret = ___copy_to_user(to, from, size);
10508 if (unlikely(ret))
10509 ret = copy_to_user_fixup(to, from, size);
10510 return ret;
10511 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10512 index 7cf9c6e..6206648 100644
10513 --- a/arch/sparc/kernel/Makefile
10514 +++ b/arch/sparc/kernel/Makefile
10515 @@ -4,7 +4,7 @@
10516 #
10517
10518 asflags-y := -ansi
10519 -ccflags-y := -Werror
10520 +#ccflags-y := -Werror
10521
10522 extra-y := head_$(BITS).o
10523
10524 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10525 index 50e7b62..79fae35 100644
10526 --- a/arch/sparc/kernel/process_32.c
10527 +++ b/arch/sparc/kernel/process_32.c
10528 @@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10529
10530 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10531 r->psr, r->pc, r->npc, r->y, print_tainted());
10532 - printk("PC: <%pS>\n", (void *) r->pc);
10533 + printk("PC: <%pA>\n", (void *) r->pc);
10534 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10535 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10536 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10537 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10538 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10539 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10540 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10541 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10542
10543 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10544 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10545 @@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10546 rw = (struct reg_window32 *) fp;
10547 pc = rw->ins[7];
10548 printk("[%08lx : ", pc);
10549 - printk("%pS ] ", (void *) pc);
10550 + printk("%pA ] ", (void *) pc);
10551 fp = rw->ins[6];
10552 } while (++count < 16);
10553 printk("\n");
10554 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10555 index 0be7bf9..2b1cba8 100644
10556 --- a/arch/sparc/kernel/process_64.c
10557 +++ b/arch/sparc/kernel/process_64.c
10558 @@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10559 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10560 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10561 if (regs->tstate & TSTATE_PRIV)
10562 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10563 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10564 }
10565
10566 void show_regs(struct pt_regs *regs)
10567 @@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10568
10569 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10570 regs->tpc, regs->tnpc, regs->y, print_tainted());
10571 - printk("TPC: <%pS>\n", (void *) regs->tpc);
10572 + printk("TPC: <%pA>\n", (void *) regs->tpc);
10573 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10574 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10575 regs->u_regs[3]);
10576 @@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10577 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10578 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10579 regs->u_regs[15]);
10580 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10581 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10582 show_regwindow(regs);
10583 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10584 }
10585 @@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10586 ((tp && tp->task) ? tp->task->pid : -1));
10587
10588 if (gp->tstate & TSTATE_PRIV) {
10589 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10590 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10591 (void *) gp->tpc,
10592 (void *) gp->o7,
10593 (void *) gp->i7,
10594 diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10595 index 79cc0d1..ec62734 100644
10596 --- a/arch/sparc/kernel/prom_common.c
10597 +++ b/arch/sparc/kernel/prom_common.c
10598 @@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10599
10600 unsigned int prom_early_allocated __initdata;
10601
10602 -static struct of_pdt_ops prom_sparc_ops __initdata = {
10603 +static struct of_pdt_ops prom_sparc_ops __initconst = {
10604 .nextprop = prom_common_nextprop,
10605 .getproplen = prom_getproplen,
10606 .getproperty = prom_getproperty,
10607 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10608 index 9ddc492..27a5619 100644
10609 --- a/arch/sparc/kernel/ptrace_64.c
10610 +++ b/arch/sparc/kernel/ptrace_64.c
10611 @@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10612 return ret;
10613 }
10614
10615 +#ifdef CONFIG_GRKERNSEC_SETXID
10616 +extern void gr_delayed_cred_worker(void);
10617 +#endif
10618 +
10619 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10620 {
10621 int ret = 0;
10622 @@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10623 if (test_thread_flag(TIF_NOHZ))
10624 user_exit();
10625
10626 +#ifdef CONFIG_GRKERNSEC_SETXID
10627 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10628 + gr_delayed_cred_worker();
10629 +#endif
10630 +
10631 if (test_thread_flag(TIF_SYSCALL_TRACE))
10632 ret = tracehook_report_syscall_entry(regs);
10633
10634 @@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10635 if (test_thread_flag(TIF_NOHZ))
10636 user_exit();
10637
10638 +#ifdef CONFIG_GRKERNSEC_SETXID
10639 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10640 + gr_delayed_cred_worker();
10641 +#endif
10642 +
10643 audit_syscall_exit(regs);
10644
10645 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10646 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10647 index da6f1a7..e5dea8f 100644
10648 --- a/arch/sparc/kernel/smp_64.c
10649 +++ b/arch/sparc/kernel/smp_64.c
10650 @@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10651 return;
10652
10653 #ifdef CONFIG_DEBUG_DCFLUSH
10654 - atomic_inc(&dcpage_flushes);
10655 + atomic_inc_unchecked(&dcpage_flushes);
10656 #endif
10657
10658 this_cpu = get_cpu();
10659 @@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10660 xcall_deliver(data0, __pa(pg_addr),
10661 (u64) pg_addr, cpumask_of(cpu));
10662 #ifdef CONFIG_DEBUG_DCFLUSH
10663 - atomic_inc(&dcpage_flushes_xcall);
10664 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10665 #endif
10666 }
10667 }
10668 @@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10669 preempt_disable();
10670
10671 #ifdef CONFIG_DEBUG_DCFLUSH
10672 - atomic_inc(&dcpage_flushes);
10673 + atomic_inc_unchecked(&dcpage_flushes);
10674 #endif
10675 data0 = 0;
10676 pg_addr = page_address(page);
10677 @@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10678 xcall_deliver(data0, __pa(pg_addr),
10679 (u64) pg_addr, cpu_online_mask);
10680 #ifdef CONFIG_DEBUG_DCFLUSH
10681 - atomic_inc(&dcpage_flushes_xcall);
10682 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10683 #endif
10684 }
10685 __local_flush_dcache_page(page);
10686 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10687 index 646988d..b88905f 100644
10688 --- a/arch/sparc/kernel/sys_sparc_32.c
10689 +++ b/arch/sparc/kernel/sys_sparc_32.c
10690 @@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10691 if (len > TASK_SIZE - PAGE_SIZE)
10692 return -ENOMEM;
10693 if (!addr)
10694 - addr = TASK_UNMAPPED_BASE;
10695 + addr = current->mm->mmap_base;
10696
10697 info.flags = 0;
10698 info.length = len;
10699 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10700 index c85403d..6af95c9 100644
10701 --- a/arch/sparc/kernel/sys_sparc_64.c
10702 +++ b/arch/sparc/kernel/sys_sparc_64.c
10703 @@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10704 struct vm_area_struct * vma;
10705 unsigned long task_size = TASK_SIZE;
10706 int do_color_align;
10707 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10708 struct vm_unmapped_area_info info;
10709
10710 if (flags & MAP_FIXED) {
10711 /* We do not accept a shared mapping if it would violate
10712 * cache aliasing constraints.
10713 */
10714 - if ((flags & MAP_SHARED) &&
10715 + if ((filp || (flags & MAP_SHARED)) &&
10716 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10717 return -EINVAL;
10718 return addr;
10719 @@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10720 if (filp || (flags & MAP_SHARED))
10721 do_color_align = 1;
10722
10723 +#ifdef CONFIG_PAX_RANDMMAP
10724 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10725 +#endif
10726 +
10727 if (addr) {
10728 if (do_color_align)
10729 addr = COLOR_ALIGN(addr, pgoff);
10730 @@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10731 addr = PAGE_ALIGN(addr);
10732
10733 vma = find_vma(mm, addr);
10734 - if (task_size - len >= addr &&
10735 - (!vma || addr + len <= vma->vm_start))
10736 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10737 return addr;
10738 }
10739
10740 info.flags = 0;
10741 info.length = len;
10742 - info.low_limit = TASK_UNMAPPED_BASE;
10743 + info.low_limit = mm->mmap_base;
10744 info.high_limit = min(task_size, VA_EXCLUDE_START);
10745 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10746 info.align_offset = pgoff << PAGE_SHIFT;
10747 + info.threadstack_offset = offset;
10748 addr = vm_unmapped_area(&info);
10749
10750 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10751 VM_BUG_ON(addr != -ENOMEM);
10752 info.low_limit = VA_EXCLUDE_END;
10753 +
10754 +#ifdef CONFIG_PAX_RANDMMAP
10755 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10756 + info.low_limit += mm->delta_mmap;
10757 +#endif
10758 +
10759 info.high_limit = task_size;
10760 addr = vm_unmapped_area(&info);
10761 }
10762 @@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10763 unsigned long task_size = STACK_TOP32;
10764 unsigned long addr = addr0;
10765 int do_color_align;
10766 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10767 struct vm_unmapped_area_info info;
10768
10769 /* This should only ever run for 32-bit processes. */
10770 @@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10771 /* We do not accept a shared mapping if it would violate
10772 * cache aliasing constraints.
10773 */
10774 - if ((flags & MAP_SHARED) &&
10775 + if ((filp || (flags & MAP_SHARED)) &&
10776 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10777 return -EINVAL;
10778 return addr;
10779 @@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10780 if (filp || (flags & MAP_SHARED))
10781 do_color_align = 1;
10782
10783 +#ifdef CONFIG_PAX_RANDMMAP
10784 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10785 +#endif
10786 +
10787 /* requesting a specific address */
10788 if (addr) {
10789 if (do_color_align)
10790 @@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10791 addr = PAGE_ALIGN(addr);
10792
10793 vma = find_vma(mm, addr);
10794 - if (task_size - len >= addr &&
10795 - (!vma || addr + len <= vma->vm_start))
10796 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10797 return addr;
10798 }
10799
10800 @@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10801 info.high_limit = mm->mmap_base;
10802 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10803 info.align_offset = pgoff << PAGE_SHIFT;
10804 + info.threadstack_offset = offset;
10805 addr = vm_unmapped_area(&info);
10806
10807 /*
10808 @@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10809 VM_BUG_ON(addr != -ENOMEM);
10810 info.flags = 0;
10811 info.low_limit = TASK_UNMAPPED_BASE;
10812 +
10813 +#ifdef CONFIG_PAX_RANDMMAP
10814 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10815 + info.low_limit += mm->delta_mmap;
10816 +#endif
10817 +
10818 info.high_limit = STACK_TOP32;
10819 addr = vm_unmapped_area(&info);
10820 }
10821 @@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10822 EXPORT_SYMBOL(get_fb_unmapped_area);
10823
10824 /* Essentially the same as PowerPC. */
10825 -static unsigned long mmap_rnd(void)
10826 +static unsigned long mmap_rnd(struct mm_struct *mm)
10827 {
10828 unsigned long rnd = 0UL;
10829
10830 +#ifdef CONFIG_PAX_RANDMMAP
10831 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10832 +#endif
10833 +
10834 if (current->flags & PF_RANDOMIZE) {
10835 unsigned long val = get_random_int();
10836 if (test_thread_flag(TIF_32BIT))
10837 @@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10838
10839 void arch_pick_mmap_layout(struct mm_struct *mm)
10840 {
10841 - unsigned long random_factor = mmap_rnd();
10842 + unsigned long random_factor = mmap_rnd(mm);
10843 unsigned long gap;
10844
10845 /*
10846 @@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10847 gap == RLIM_INFINITY ||
10848 sysctl_legacy_va_layout) {
10849 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10850 +
10851 +#ifdef CONFIG_PAX_RANDMMAP
10852 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10853 + mm->mmap_base += mm->delta_mmap;
10854 +#endif
10855 +
10856 mm->get_unmapped_area = arch_get_unmapped_area;
10857 } else {
10858 /* We know it's 32-bit */
10859 @@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10860 gap = (task_size / 6 * 5);
10861
10862 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10863 +
10864 +#ifdef CONFIG_PAX_RANDMMAP
10865 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10866 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10867 +#endif
10868 +
10869 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10870 }
10871 }
10872 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10873 index 33a17e7..d87fb1f 100644
10874 --- a/arch/sparc/kernel/syscalls.S
10875 +++ b/arch/sparc/kernel/syscalls.S
10876 @@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10877 #endif
10878 .align 32
10879 1: ldx [%g6 + TI_FLAGS], %l5
10880 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10881 + andcc %l5, _TIF_WORK_SYSCALL, %g0
10882 be,pt %icc, rtrap
10883 nop
10884 call syscall_trace_leave
10885 @@ -184,7 +184,7 @@ linux_sparc_syscall32:
10886
10887 srl %i3, 0, %o3 ! IEU0
10888 srl %i2, 0, %o2 ! IEU0 Group
10889 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10890 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10891 bne,pn %icc, linux_syscall_trace32 ! CTI
10892 mov %i0, %l5 ! IEU1
10893 5: call %l7 ! CTI Group brk forced
10894 @@ -208,7 +208,7 @@ linux_sparc_syscall:
10895
10896 mov %i3, %o3 ! IEU1
10897 mov %i4, %o4 ! IEU0 Group
10898 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10899 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10900 bne,pn %icc, linux_syscall_trace ! CTI Group
10901 mov %i0, %l5 ! IEU0
10902 2: call %l7 ! CTI Group brk forced
10903 @@ -223,7 +223,7 @@ ret_sys_call:
10904
10905 cmp %o0, -ERESTART_RESTARTBLOCK
10906 bgeu,pn %xcc, 1f
10907 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10908 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10909 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10910
10911 2:
10912 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10913 index 6fd386c5..6907d81 100644
10914 --- a/arch/sparc/kernel/traps_32.c
10915 +++ b/arch/sparc/kernel/traps_32.c
10916 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10917 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10918 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10919
10920 +extern void gr_handle_kernel_exploit(void);
10921 +
10922 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10923 {
10924 static int die_counter;
10925 @@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10926 count++ < 30 &&
10927 (((unsigned long) rw) >= PAGE_OFFSET) &&
10928 !(((unsigned long) rw) & 0x7)) {
10929 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
10930 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
10931 (void *) rw->ins[7]);
10932 rw = (struct reg_window32 *)rw->ins[6];
10933 }
10934 }
10935 printk("Instruction DUMP:");
10936 instruction_dump ((unsigned long *) regs->pc);
10937 - if(regs->psr & PSR_PS)
10938 + if(regs->psr & PSR_PS) {
10939 + gr_handle_kernel_exploit();
10940 do_exit(SIGKILL);
10941 + }
10942 do_exit(SIGSEGV);
10943 }
10944
10945 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10946 index 981a769..d906eda 100644
10947 --- a/arch/sparc/kernel/traps_64.c
10948 +++ b/arch/sparc/kernel/traps_64.c
10949 @@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10950 i + 1,
10951 p->trapstack[i].tstate, p->trapstack[i].tpc,
10952 p->trapstack[i].tnpc, p->trapstack[i].tt);
10953 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10954 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10955 }
10956 }
10957
10958 @@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10959
10960 lvl -= 0x100;
10961 if (regs->tstate & TSTATE_PRIV) {
10962 +
10963 +#ifdef CONFIG_PAX_REFCOUNT
10964 + if (lvl == 6)
10965 + pax_report_refcount_overflow(regs);
10966 +#endif
10967 +
10968 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10969 die_if_kernel(buffer, regs);
10970 }
10971 @@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10972 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10973 {
10974 char buffer[32];
10975 -
10976 +
10977 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10978 0, lvl, SIGTRAP) == NOTIFY_STOP)
10979 return;
10980
10981 +#ifdef CONFIG_PAX_REFCOUNT
10982 + if (lvl == 6)
10983 + pax_report_refcount_overflow(regs);
10984 +#endif
10985 +
10986 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10987
10988 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10989 @@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10990 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10991 printk("%s" "ERROR(%d): ",
10992 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10993 - printk("TPC<%pS>\n", (void *) regs->tpc);
10994 + printk("TPC<%pA>\n", (void *) regs->tpc);
10995 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10996 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10997 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10998 @@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10999 smp_processor_id(),
11000 (type & 0x1) ? 'I' : 'D',
11001 regs->tpc);
11002 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11003 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11004 panic("Irrecoverable Cheetah+ parity error.");
11005 }
11006
11007 @@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11008 smp_processor_id(),
11009 (type & 0x1) ? 'I' : 'D',
11010 regs->tpc);
11011 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11012 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11013 }
11014
11015 struct sun4v_error_entry {
11016 @@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11017 /*0x38*/u64 reserved_5;
11018 };
11019
11020 -static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11021 -static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11022 +static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11023 +static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11024
11025 static const char *sun4v_err_type_to_str(u8 type)
11026 {
11027 @@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11028 }
11029
11030 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11031 - int cpu, const char *pfx, atomic_t *ocnt)
11032 + int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11033 {
11034 u64 *raw_ptr = (u64 *) ent;
11035 u32 attrs;
11036 @@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11037
11038 show_regs(regs);
11039
11040 - if ((cnt = atomic_read(ocnt)) != 0) {
11041 - atomic_set(ocnt, 0);
11042 + if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11043 + atomic_set_unchecked(ocnt, 0);
11044 wmb();
11045 printk("%s: Queue overflowed %d times.\n",
11046 pfx, cnt);
11047 @@ -2048,7 +2059,7 @@ out:
11048 */
11049 void sun4v_resum_overflow(struct pt_regs *regs)
11050 {
11051 - atomic_inc(&sun4v_resum_oflow_cnt);
11052 + atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11053 }
11054
11055 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11056 @@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11057 /* XXX Actually even this can make not that much sense. Perhaps
11058 * XXX we should just pull the plug and panic directly from here?
11059 */
11060 - atomic_inc(&sun4v_nonresum_oflow_cnt);
11061 + atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11062 }
11063
11064 static void sun4v_tlb_error(struct pt_regs *regs)
11065 @@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11066
11067 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11068 regs->tpc, tl);
11069 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11070 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11071 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11072 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11073 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11074 (void *) regs->u_regs[UREG_I7]);
11075 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11076 "pte[%lx] error[%lx]\n",
11077 @@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11078
11079 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11080 regs->tpc, tl);
11081 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11082 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11083 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11084 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11085 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11086 (void *) regs->u_regs[UREG_I7]);
11087 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11088 "pte[%lx] error[%lx]\n",
11089 @@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11090 fp = (unsigned long)sf->fp + STACK_BIAS;
11091 }
11092
11093 - printk(" [%016lx] %pS\n", pc, (void *) pc);
11094 + printk(" [%016lx] %pA\n", pc, (void *) pc);
11095 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11096 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11097 int index = tsk->curr_ret_stack;
11098 if (tsk->ret_stack && index >= graph) {
11099 pc = tsk->ret_stack[index - graph].ret;
11100 - printk(" [%016lx] %pS\n", pc, (void *) pc);
11101 + printk(" [%016lx] %pA\n", pc, (void *) pc);
11102 graph++;
11103 }
11104 }
11105 @@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11106 return (struct reg_window *) (fp + STACK_BIAS);
11107 }
11108
11109 +extern void gr_handle_kernel_exploit(void);
11110 +
11111 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11112 {
11113 static int die_counter;
11114 @@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11115 while (rw &&
11116 count++ < 30 &&
11117 kstack_valid(tp, (unsigned long) rw)) {
11118 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
11119 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
11120 (void *) rw->ins[7]);
11121
11122 rw = kernel_stack_up(rw);
11123 @@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11124 }
11125 user_instruction_dump ((unsigned int __user *) regs->tpc);
11126 }
11127 - if (regs->tstate & TSTATE_PRIV)
11128 + if (regs->tstate & TSTATE_PRIV) {
11129 + gr_handle_kernel_exploit();
11130 do_exit(SIGKILL);
11131 + }
11132 do_exit(SIGSEGV);
11133 }
11134 EXPORT_SYMBOL(die_if_kernel);
11135 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11136 index 62098a8..547ab2c 100644
11137 --- a/arch/sparc/kernel/unaligned_64.c
11138 +++ b/arch/sparc/kernel/unaligned_64.c
11139 @@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11140 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11141
11142 if (__ratelimit(&ratelimit)) {
11143 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
11144 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
11145 regs->tpc, (void *) regs->tpc);
11146 }
11147 }
11148 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11149 index 3269b02..64f5231 100644
11150 --- a/arch/sparc/lib/Makefile
11151 +++ b/arch/sparc/lib/Makefile
11152 @@ -2,7 +2,7 @@
11153 #
11154
11155 asflags-y := -ansi -DST_DIV0=0x02
11156 -ccflags-y := -Werror
11157 +#ccflags-y := -Werror
11158
11159 lib-$(CONFIG_SPARC32) += ashrdi3.o
11160 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11161 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11162 index 05dac43..76f8ed4 100644
11163 --- a/arch/sparc/lib/atomic_64.S
11164 +++ b/arch/sparc/lib/atomic_64.S
11165 @@ -15,11 +15,22 @@
11166 * a value and does the barriers.
11167 */
11168
11169 -#define ATOMIC_OP(op) \
11170 -ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11171 +#ifdef CONFIG_PAX_REFCOUNT
11172 +#define __REFCOUNT_OP(op) op##cc
11173 +#define __OVERFLOW_IOP tvs %icc, 6;
11174 +#define __OVERFLOW_XOP tvs %xcc, 6;
11175 +#else
11176 +#define __REFCOUNT_OP(op) op
11177 +#define __OVERFLOW_IOP
11178 +#define __OVERFLOW_XOP
11179 +#endif
11180 +
11181 +#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11182 +ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11183 BACKOFF_SETUP(%o2); \
11184 1: lduw [%o1], %g1; \
11185 - op %g1, %o0, %g7; \
11186 + asm_op %g1, %o0, %g7; \
11187 + post_op \
11188 cas [%o1], %g1, %g7; \
11189 cmp %g1, %g7; \
11190 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11191 @@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11192 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11193 ENDPROC(atomic_##op); \
11194
11195 -#define ATOMIC_OP_RETURN(op) \
11196 -ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11197 +#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11198 + __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11199 +
11200 +#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11201 +ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11202 BACKOFF_SETUP(%o2); \
11203 1: lduw [%o1], %g1; \
11204 - op %g1, %o0, %g7; \
11205 + asm_op %g1, %o0, %g7; \
11206 + post_op \
11207 cas [%o1], %g1, %g7; \
11208 cmp %g1, %g7; \
11209 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11210 @@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11211 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11212 ENDPROC(atomic_##op##_return);
11213
11214 +#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11215 + __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11216 +
11217 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11218
11219 ATOMIC_OPS(add)
11220 @@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11221
11222 #undef ATOMIC_OPS
11223 #undef ATOMIC_OP_RETURN
11224 +#undef __ATOMIC_OP_RETURN
11225 #undef ATOMIC_OP
11226 +#undef __ATOMIC_OP
11227
11228 -#define ATOMIC64_OP(op) \
11229 -ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11230 +#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11231 +ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11232 BACKOFF_SETUP(%o2); \
11233 1: ldx [%o1], %g1; \
11234 - op %g1, %o0, %g7; \
11235 + asm_op %g1, %o0, %g7; \
11236 + post_op \
11237 casx [%o1], %g1, %g7; \
11238 cmp %g1, %g7; \
11239 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11240 @@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11241 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11242 ENDPROC(atomic64_##op); \
11243
11244 -#define ATOMIC64_OP_RETURN(op) \
11245 -ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11246 +#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11247 + __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11248 +
11249 +#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11250 +ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11251 BACKOFF_SETUP(%o2); \
11252 1: ldx [%o1], %g1; \
11253 - op %g1, %o0, %g7; \
11254 + asm_op %g1, %o0, %g7; \
11255 + post_op \
11256 casx [%o1], %g1, %g7; \
11257 cmp %g1, %g7; \
11258 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11259 @@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11260 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11261 ENDPROC(atomic64_##op##_return);
11262
11263 +#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11264 +i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11265 +
11266 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11267
11268 ATOMIC64_OPS(add)
11269 @@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11270
11271 #undef ATOMIC64_OPS
11272 #undef ATOMIC64_OP_RETURN
11273 +#undef __ATOMIC64_OP_RETURN
11274 #undef ATOMIC64_OP
11275 +#undef __ATOMIC64_OP
11276 +#undef __OVERFLOW_XOP
11277 +#undef __OVERFLOW_IOP
11278 +#undef __REFCOUNT_OP
11279
11280 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11281 BACKOFF_SETUP(%o2)
11282 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11283 index 1d649a9..fbc5bfc 100644
11284 --- a/arch/sparc/lib/ksyms.c
11285 +++ b/arch/sparc/lib/ksyms.c
11286 @@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11287 /* Atomic counter implementation. */
11288 #define ATOMIC_OP(op) \
11289 EXPORT_SYMBOL(atomic_##op); \
11290 -EXPORT_SYMBOL(atomic64_##op);
11291 +EXPORT_SYMBOL(atomic_##op##_unchecked); \
11292 +EXPORT_SYMBOL(atomic64_##op); \
11293 +EXPORT_SYMBOL(atomic64_##op##_unchecked);
11294
11295 #define ATOMIC_OP_RETURN(op) \
11296 EXPORT_SYMBOL(atomic_##op##_return); \
11297 @@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11298 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11299
11300 ATOMIC_OPS(add)
11301 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
11302 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11303 ATOMIC_OPS(sub)
11304
11305 #undef ATOMIC_OPS
11306 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11307 index 30c3ecc..736f015 100644
11308 --- a/arch/sparc/mm/Makefile
11309 +++ b/arch/sparc/mm/Makefile
11310 @@ -2,7 +2,7 @@
11311 #
11312
11313 asflags-y := -ansi
11314 -ccflags-y := -Werror
11315 +#ccflags-y := -Werror
11316
11317 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11318 obj-y += fault_$(BITS).o
11319 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11320 index 908e8c1..1524793 100644
11321 --- a/arch/sparc/mm/fault_32.c
11322 +++ b/arch/sparc/mm/fault_32.c
11323 @@ -21,6 +21,9 @@
11324 #include <linux/perf_event.h>
11325 #include <linux/interrupt.h>
11326 #include <linux/kdebug.h>
11327 +#include <linux/slab.h>
11328 +#include <linux/pagemap.h>
11329 +#include <linux/compiler.h>
11330
11331 #include <asm/page.h>
11332 #include <asm/pgtable.h>
11333 @@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11334 return safe_compute_effective_address(regs, insn);
11335 }
11336
11337 +#ifdef CONFIG_PAX_PAGEEXEC
11338 +#ifdef CONFIG_PAX_DLRESOLVE
11339 +static void pax_emuplt_close(struct vm_area_struct *vma)
11340 +{
11341 + vma->vm_mm->call_dl_resolve = 0UL;
11342 +}
11343 +
11344 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11345 +{
11346 + unsigned int *kaddr;
11347 +
11348 + vmf->page = alloc_page(GFP_HIGHUSER);
11349 + if (!vmf->page)
11350 + return VM_FAULT_OOM;
11351 +
11352 + kaddr = kmap(vmf->page);
11353 + memset(kaddr, 0, PAGE_SIZE);
11354 + kaddr[0] = 0x9DE3BFA8U; /* save */
11355 + flush_dcache_page(vmf->page);
11356 + kunmap(vmf->page);
11357 + return VM_FAULT_MAJOR;
11358 +}
11359 +
11360 +static const struct vm_operations_struct pax_vm_ops = {
11361 + .close = pax_emuplt_close,
11362 + .fault = pax_emuplt_fault
11363 +};
11364 +
11365 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11366 +{
11367 + int ret;
11368 +
11369 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11370 + vma->vm_mm = current->mm;
11371 + vma->vm_start = addr;
11372 + vma->vm_end = addr + PAGE_SIZE;
11373 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11374 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11375 + vma->vm_ops = &pax_vm_ops;
11376 +
11377 + ret = insert_vm_struct(current->mm, vma);
11378 + if (ret)
11379 + return ret;
11380 +
11381 + ++current->mm->total_vm;
11382 + return 0;
11383 +}
11384 +#endif
11385 +
11386 +/*
11387 + * PaX: decide what to do with offenders (regs->pc = fault address)
11388 + *
11389 + * returns 1 when task should be killed
11390 + * 2 when patched PLT trampoline was detected
11391 + * 3 when unpatched PLT trampoline was detected
11392 + */
11393 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11394 +{
11395 +
11396 +#ifdef CONFIG_PAX_EMUPLT
11397 + int err;
11398 +
11399 + do { /* PaX: patched PLT emulation #1 */
11400 + unsigned int sethi1, sethi2, jmpl;
11401 +
11402 + err = get_user(sethi1, (unsigned int *)regs->pc);
11403 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11404 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11405 +
11406 + if (err)
11407 + break;
11408 +
11409 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11410 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11411 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11412 + {
11413 + unsigned int addr;
11414 +
11415 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11416 + addr = regs->u_regs[UREG_G1];
11417 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11418 + regs->pc = addr;
11419 + regs->npc = addr+4;
11420 + return 2;
11421 + }
11422 + } while (0);
11423 +
11424 + do { /* PaX: patched PLT emulation #2 */
11425 + unsigned int ba;
11426 +
11427 + err = get_user(ba, (unsigned int *)regs->pc);
11428 +
11429 + if (err)
11430 + break;
11431 +
11432 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11433 + unsigned int addr;
11434 +
11435 + if ((ba & 0xFFC00000U) == 0x30800000U)
11436 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11437 + else
11438 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11439 + regs->pc = addr;
11440 + regs->npc = addr+4;
11441 + return 2;
11442 + }
11443 + } while (0);
11444 +
11445 + do { /* PaX: patched PLT emulation #3 */
11446 + unsigned int sethi, bajmpl, nop;
11447 +
11448 + err = get_user(sethi, (unsigned int *)regs->pc);
11449 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11450 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11451 +
11452 + if (err)
11453 + break;
11454 +
11455 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11456 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11457 + nop == 0x01000000U)
11458 + {
11459 + unsigned int addr;
11460 +
11461 + addr = (sethi & 0x003FFFFFU) << 10;
11462 + regs->u_regs[UREG_G1] = addr;
11463 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11464 + addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11465 + else
11466 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11467 + regs->pc = addr;
11468 + regs->npc = addr+4;
11469 + return 2;
11470 + }
11471 + } while (0);
11472 +
11473 + do { /* PaX: unpatched PLT emulation step 1 */
11474 + unsigned int sethi, ba, nop;
11475 +
11476 + err = get_user(sethi, (unsigned int *)regs->pc);
11477 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
11478 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11479 +
11480 + if (err)
11481 + break;
11482 +
11483 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11484 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11485 + nop == 0x01000000U)
11486 + {
11487 + unsigned int addr, save, call;
11488 +
11489 + if ((ba & 0xFFC00000U) == 0x30800000U)
11490 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11491 + else
11492 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11493 +
11494 + err = get_user(save, (unsigned int *)addr);
11495 + err |= get_user(call, (unsigned int *)(addr+4));
11496 + err |= get_user(nop, (unsigned int *)(addr+8));
11497 + if (err)
11498 + break;
11499 +
11500 +#ifdef CONFIG_PAX_DLRESOLVE
11501 + if (save == 0x9DE3BFA8U &&
11502 + (call & 0xC0000000U) == 0x40000000U &&
11503 + nop == 0x01000000U)
11504 + {
11505 + struct vm_area_struct *vma;
11506 + unsigned long call_dl_resolve;
11507 +
11508 + down_read(&current->mm->mmap_sem);
11509 + call_dl_resolve = current->mm->call_dl_resolve;
11510 + up_read(&current->mm->mmap_sem);
11511 + if (likely(call_dl_resolve))
11512 + goto emulate;
11513 +
11514 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11515 +
11516 + down_write(&current->mm->mmap_sem);
11517 + if (current->mm->call_dl_resolve) {
11518 + call_dl_resolve = current->mm->call_dl_resolve;
11519 + up_write(&current->mm->mmap_sem);
11520 + if (vma)
11521 + kmem_cache_free(vm_area_cachep, vma);
11522 + goto emulate;
11523 + }
11524 +
11525 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11526 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11527 + up_write(&current->mm->mmap_sem);
11528 + if (vma)
11529 + kmem_cache_free(vm_area_cachep, vma);
11530 + return 1;
11531 + }
11532 +
11533 + if (pax_insert_vma(vma, call_dl_resolve)) {
11534 + up_write(&current->mm->mmap_sem);
11535 + kmem_cache_free(vm_area_cachep, vma);
11536 + return 1;
11537 + }
11538 +
11539 + current->mm->call_dl_resolve = call_dl_resolve;
11540 + up_write(&current->mm->mmap_sem);
11541 +
11542 +emulate:
11543 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11544 + regs->pc = call_dl_resolve;
11545 + regs->npc = addr+4;
11546 + return 3;
11547 + }
11548 +#endif
11549 +
11550 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11551 + if ((save & 0xFFC00000U) == 0x05000000U &&
11552 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11553 + nop == 0x01000000U)
11554 + {
11555 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11556 + regs->u_regs[UREG_G2] = addr + 4;
11557 + addr = (save & 0x003FFFFFU) << 10;
11558 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11559 + regs->pc = addr;
11560 + regs->npc = addr+4;
11561 + return 3;
11562 + }
11563 + }
11564 + } while (0);
11565 +
11566 + do { /* PaX: unpatched PLT emulation step 2 */
11567 + unsigned int save, call, nop;
11568 +
11569 + err = get_user(save, (unsigned int *)(regs->pc-4));
11570 + err |= get_user(call, (unsigned int *)regs->pc);
11571 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
11572 + if (err)
11573 + break;
11574 +
11575 + if (save == 0x9DE3BFA8U &&
11576 + (call & 0xC0000000U) == 0x40000000U &&
11577 + nop == 0x01000000U)
11578 + {
11579 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11580 +
11581 + regs->u_regs[UREG_RETPC] = regs->pc;
11582 + regs->pc = dl_resolve;
11583 + regs->npc = dl_resolve+4;
11584 + return 3;
11585 + }
11586 + } while (0);
11587 +#endif
11588 +
11589 + return 1;
11590 +}
11591 +
11592 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11593 +{
11594 + unsigned long i;
11595 +
11596 + printk(KERN_ERR "PAX: bytes at PC: ");
11597 + for (i = 0; i < 8; i++) {
11598 + unsigned int c;
11599 + if (get_user(c, (unsigned int *)pc+i))
11600 + printk(KERN_CONT "???????? ");
11601 + else
11602 + printk(KERN_CONT "%08x ", c);
11603 + }
11604 + printk("\n");
11605 +}
11606 +#endif
11607 +
11608 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11609 int text_fault)
11610 {
11611 @@ -226,6 +500,24 @@ good_area:
11612 if (!(vma->vm_flags & VM_WRITE))
11613 goto bad_area;
11614 } else {
11615 +
11616 +#ifdef CONFIG_PAX_PAGEEXEC
11617 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11618 + up_read(&mm->mmap_sem);
11619 + switch (pax_handle_fetch_fault(regs)) {
11620 +
11621 +#ifdef CONFIG_PAX_EMUPLT
11622 + case 2:
11623 + case 3:
11624 + return;
11625 +#endif
11626 +
11627 + }
11628 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11629 + do_group_exit(SIGKILL);
11630 + }
11631 +#endif
11632 +
11633 /* Allow reads even for write-only mappings */
11634 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11635 goto bad_area;
11636 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11637 index 18fcd71..e4fe821 100644
11638 --- a/arch/sparc/mm/fault_64.c
11639 +++ b/arch/sparc/mm/fault_64.c
11640 @@ -22,6 +22,9 @@
11641 #include <linux/kdebug.h>
11642 #include <linux/percpu.h>
11643 #include <linux/context_tracking.h>
11644 +#include <linux/slab.h>
11645 +#include <linux/pagemap.h>
11646 +#include <linux/compiler.h>
11647
11648 #include <asm/page.h>
11649 #include <asm/pgtable.h>
11650 @@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11651 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11652 regs->tpc);
11653 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11654 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11655 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11656 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11657 dump_stack();
11658 unhandled_fault(regs->tpc, current, regs);
11659 @@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11660 show_regs(regs);
11661 }
11662
11663 +#ifdef CONFIG_PAX_PAGEEXEC
11664 +#ifdef CONFIG_PAX_DLRESOLVE
11665 +static void pax_emuplt_close(struct vm_area_struct *vma)
11666 +{
11667 + vma->vm_mm->call_dl_resolve = 0UL;
11668 +}
11669 +
11670 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11671 +{
11672 + unsigned int *kaddr;
11673 +
11674 + vmf->page = alloc_page(GFP_HIGHUSER);
11675 + if (!vmf->page)
11676 + return VM_FAULT_OOM;
11677 +
11678 + kaddr = kmap(vmf->page);
11679 + memset(kaddr, 0, PAGE_SIZE);
11680 + kaddr[0] = 0x9DE3BFA8U; /* save */
11681 + flush_dcache_page(vmf->page);
11682 + kunmap(vmf->page);
11683 + return VM_FAULT_MAJOR;
11684 +}
11685 +
11686 +static const struct vm_operations_struct pax_vm_ops = {
11687 + .close = pax_emuplt_close,
11688 + .fault = pax_emuplt_fault
11689 +};
11690 +
11691 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11692 +{
11693 + int ret;
11694 +
11695 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11696 + vma->vm_mm = current->mm;
11697 + vma->vm_start = addr;
11698 + vma->vm_end = addr + PAGE_SIZE;
11699 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11700 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11701 + vma->vm_ops = &pax_vm_ops;
11702 +
11703 + ret = insert_vm_struct(current->mm, vma);
11704 + if (ret)
11705 + return ret;
11706 +
11707 + ++current->mm->total_vm;
11708 + return 0;
11709 +}
11710 +#endif
11711 +
11712 +/*
11713 + * PaX: decide what to do with offenders (regs->tpc = fault address)
11714 + *
11715 + * returns 1 when task should be killed
11716 + * 2 when patched PLT trampoline was detected
11717 + * 3 when unpatched PLT trampoline was detected
11718 + */
11719 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11720 +{
11721 +
11722 +#ifdef CONFIG_PAX_EMUPLT
11723 + int err;
11724 +
11725 + do { /* PaX: patched PLT emulation #1 */
11726 + unsigned int sethi1, sethi2, jmpl;
11727 +
11728 + err = get_user(sethi1, (unsigned int *)regs->tpc);
11729 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11730 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11731 +
11732 + if (err)
11733 + break;
11734 +
11735 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11736 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11737 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11738 + {
11739 + unsigned long addr;
11740 +
11741 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11742 + addr = regs->u_regs[UREG_G1];
11743 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11744 +
11745 + if (test_thread_flag(TIF_32BIT))
11746 + addr &= 0xFFFFFFFFUL;
11747 +
11748 + regs->tpc = addr;
11749 + regs->tnpc = addr+4;
11750 + return 2;
11751 + }
11752 + } while (0);
11753 +
11754 + do { /* PaX: patched PLT emulation #2 */
11755 + unsigned int ba;
11756 +
11757 + err = get_user(ba, (unsigned int *)regs->tpc);
11758 +
11759 + if (err)
11760 + break;
11761 +
11762 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11763 + unsigned long addr;
11764 +
11765 + if ((ba & 0xFFC00000U) == 0x30800000U)
11766 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11767 + else
11768 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11769 +
11770 + if (test_thread_flag(TIF_32BIT))
11771 + addr &= 0xFFFFFFFFUL;
11772 +
11773 + regs->tpc = addr;
11774 + regs->tnpc = addr+4;
11775 + return 2;
11776 + }
11777 + } while (0);
11778 +
11779 + do { /* PaX: patched PLT emulation #3 */
11780 + unsigned int sethi, bajmpl, nop;
11781 +
11782 + err = get_user(sethi, (unsigned int *)regs->tpc);
11783 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11784 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11785 +
11786 + if (err)
11787 + break;
11788 +
11789 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11790 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11791 + nop == 0x01000000U)
11792 + {
11793 + unsigned long addr;
11794 +
11795 + addr = (sethi & 0x003FFFFFU) << 10;
11796 + regs->u_regs[UREG_G1] = addr;
11797 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11798 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11799 + else
11800 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11801 +
11802 + if (test_thread_flag(TIF_32BIT))
11803 + addr &= 0xFFFFFFFFUL;
11804 +
11805 + regs->tpc = addr;
11806 + regs->tnpc = addr+4;
11807 + return 2;
11808 + }
11809 + } while (0);
11810 +
11811 + do { /* PaX: patched PLT emulation #4 */
11812 + unsigned int sethi, mov1, call, mov2;
11813 +
11814 + err = get_user(sethi, (unsigned int *)regs->tpc);
11815 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11816 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
11817 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11818 +
11819 + if (err)
11820 + break;
11821 +
11822 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11823 + mov1 == 0x8210000FU &&
11824 + (call & 0xC0000000U) == 0x40000000U &&
11825 + mov2 == 0x9E100001U)
11826 + {
11827 + unsigned long addr;
11828 +
11829 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11830 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11831 +
11832 + if (test_thread_flag(TIF_32BIT))
11833 + addr &= 0xFFFFFFFFUL;
11834 +
11835 + regs->tpc = addr;
11836 + regs->tnpc = addr+4;
11837 + return 2;
11838 + }
11839 + } while (0);
11840 +
11841 + do { /* PaX: patched PLT emulation #5 */
11842 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11843 +
11844 + err = get_user(sethi, (unsigned int *)regs->tpc);
11845 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11846 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11847 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11848 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11849 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11850 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11851 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11852 +
11853 + if (err)
11854 + break;
11855 +
11856 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11857 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11858 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11859 + (or1 & 0xFFFFE000U) == 0x82106000U &&
11860 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11861 + sllx == 0x83287020U &&
11862 + jmpl == 0x81C04005U &&
11863 + nop == 0x01000000U)
11864 + {
11865 + unsigned long addr;
11866 +
11867 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11868 + regs->u_regs[UREG_G1] <<= 32;
11869 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11870 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11871 + regs->tpc = addr;
11872 + regs->tnpc = addr+4;
11873 + return 2;
11874 + }
11875 + } while (0);
11876 +
11877 + do { /* PaX: patched PLT emulation #6 */
11878 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11879 +
11880 + err = get_user(sethi, (unsigned int *)regs->tpc);
11881 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11882 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11883 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11884 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
11885 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11886 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11887 +
11888 + if (err)
11889 + break;
11890 +
11891 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11892 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11893 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11894 + sllx == 0x83287020U &&
11895 + (or & 0xFFFFE000U) == 0x8A116000U &&
11896 + jmpl == 0x81C04005U &&
11897 + nop == 0x01000000U)
11898 + {
11899 + unsigned long addr;
11900 +
11901 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11902 + regs->u_regs[UREG_G1] <<= 32;
11903 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
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: unpatched PLT emulation step 1 */
11912 + unsigned int sethi, ba, nop;
11913 +
11914 + err = get_user(sethi, (unsigned int *)regs->tpc);
11915 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11916 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11917 +
11918 + if (err)
11919 + break;
11920 +
11921 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11922 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11923 + nop == 0x01000000U)
11924 + {
11925 + unsigned long addr;
11926 + unsigned int save, call;
11927 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11928 +
11929 + if ((ba & 0xFFC00000U) == 0x30800000U)
11930 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11931 + else
11932 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11933 +
11934 + if (test_thread_flag(TIF_32BIT))
11935 + addr &= 0xFFFFFFFFUL;
11936 +
11937 + err = get_user(save, (unsigned int *)addr);
11938 + err |= get_user(call, (unsigned int *)(addr+4));
11939 + err |= get_user(nop, (unsigned int *)(addr+8));
11940 + if (err)
11941 + break;
11942 +
11943 +#ifdef CONFIG_PAX_DLRESOLVE
11944 + if (save == 0x9DE3BFA8U &&
11945 + (call & 0xC0000000U) == 0x40000000U &&
11946 + nop == 0x01000000U)
11947 + {
11948 + struct vm_area_struct *vma;
11949 + unsigned long call_dl_resolve;
11950 +
11951 + down_read(&current->mm->mmap_sem);
11952 + call_dl_resolve = current->mm->call_dl_resolve;
11953 + up_read(&current->mm->mmap_sem);
11954 + if (likely(call_dl_resolve))
11955 + goto emulate;
11956 +
11957 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11958 +
11959 + down_write(&current->mm->mmap_sem);
11960 + if (current->mm->call_dl_resolve) {
11961 + call_dl_resolve = current->mm->call_dl_resolve;
11962 + up_write(&current->mm->mmap_sem);
11963 + if (vma)
11964 + kmem_cache_free(vm_area_cachep, vma);
11965 + goto emulate;
11966 + }
11967 +
11968 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11969 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11970 + up_write(&current->mm->mmap_sem);
11971 + if (vma)
11972 + kmem_cache_free(vm_area_cachep, vma);
11973 + return 1;
11974 + }
11975 +
11976 + if (pax_insert_vma(vma, call_dl_resolve)) {
11977 + up_write(&current->mm->mmap_sem);
11978 + kmem_cache_free(vm_area_cachep, vma);
11979 + return 1;
11980 + }
11981 +
11982 + current->mm->call_dl_resolve = call_dl_resolve;
11983 + up_write(&current->mm->mmap_sem);
11984 +
11985 +emulate:
11986 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11987 + regs->tpc = call_dl_resolve;
11988 + regs->tnpc = addr+4;
11989 + return 3;
11990 + }
11991 +#endif
11992 +
11993 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11994 + if ((save & 0xFFC00000U) == 0x05000000U &&
11995 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11996 + nop == 0x01000000U)
11997 + {
11998 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11999 + regs->u_regs[UREG_G2] = addr + 4;
12000 + addr = (save & 0x003FFFFFU) << 10;
12001 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12002 +
12003 + if (test_thread_flag(TIF_32BIT))
12004 + addr &= 0xFFFFFFFFUL;
12005 +
12006 + regs->tpc = addr;
12007 + regs->tnpc = addr+4;
12008 + return 3;
12009 + }
12010 +
12011 + /* PaX: 64-bit PLT stub */
12012 + err = get_user(sethi1, (unsigned int *)addr);
12013 + err |= get_user(sethi2, (unsigned int *)(addr+4));
12014 + err |= get_user(or1, (unsigned int *)(addr+8));
12015 + err |= get_user(or2, (unsigned int *)(addr+12));
12016 + err |= get_user(sllx, (unsigned int *)(addr+16));
12017 + err |= get_user(add, (unsigned int *)(addr+20));
12018 + err |= get_user(jmpl, (unsigned int *)(addr+24));
12019 + err |= get_user(nop, (unsigned int *)(addr+28));
12020 + if (err)
12021 + break;
12022 +
12023 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12024 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12025 + (or1 & 0xFFFFE000U) == 0x88112000U &&
12026 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
12027 + sllx == 0x89293020U &&
12028 + add == 0x8A010005U &&
12029 + jmpl == 0x89C14000U &&
12030 + nop == 0x01000000U)
12031 + {
12032 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12033 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12034 + regs->u_regs[UREG_G4] <<= 32;
12035 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12036 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12037 + regs->u_regs[UREG_G4] = addr + 24;
12038 + addr = regs->u_regs[UREG_G5];
12039 + regs->tpc = addr;
12040 + regs->tnpc = addr+4;
12041 + return 3;
12042 + }
12043 + }
12044 + } while (0);
12045 +
12046 +#ifdef CONFIG_PAX_DLRESOLVE
12047 + do { /* PaX: unpatched PLT emulation step 2 */
12048 + unsigned int save, call, nop;
12049 +
12050 + err = get_user(save, (unsigned int *)(regs->tpc-4));
12051 + err |= get_user(call, (unsigned int *)regs->tpc);
12052 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12053 + if (err)
12054 + break;
12055 +
12056 + if (save == 0x9DE3BFA8U &&
12057 + (call & 0xC0000000U) == 0x40000000U &&
12058 + nop == 0x01000000U)
12059 + {
12060 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12061 +
12062 + if (test_thread_flag(TIF_32BIT))
12063 + dl_resolve &= 0xFFFFFFFFUL;
12064 +
12065 + regs->u_regs[UREG_RETPC] = regs->tpc;
12066 + regs->tpc = dl_resolve;
12067 + regs->tnpc = dl_resolve+4;
12068 + return 3;
12069 + }
12070 + } while (0);
12071 +#endif
12072 +
12073 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12074 + unsigned int sethi, ba, nop;
12075 +
12076 + err = get_user(sethi, (unsigned int *)regs->tpc);
12077 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12078 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12079 +
12080 + if (err)
12081 + break;
12082 +
12083 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
12084 + (ba & 0xFFF00000U) == 0x30600000U &&
12085 + nop == 0x01000000U)
12086 + {
12087 + unsigned long addr;
12088 +
12089 + addr = (sethi & 0x003FFFFFU) << 10;
12090 + regs->u_regs[UREG_G1] = addr;
12091 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12092 +
12093 + if (test_thread_flag(TIF_32BIT))
12094 + addr &= 0xFFFFFFFFUL;
12095 +
12096 + regs->tpc = addr;
12097 + regs->tnpc = addr+4;
12098 + return 2;
12099 + }
12100 + } while (0);
12101 +
12102 +#endif
12103 +
12104 + return 1;
12105 +}
12106 +
12107 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12108 +{
12109 + unsigned long i;
12110 +
12111 + printk(KERN_ERR "PAX: bytes at PC: ");
12112 + for (i = 0; i < 8; i++) {
12113 + unsigned int c;
12114 + if (get_user(c, (unsigned int *)pc+i))
12115 + printk(KERN_CONT "???????? ");
12116 + else
12117 + printk(KERN_CONT "%08x ", c);
12118 + }
12119 + printk("\n");
12120 +}
12121 +#endif
12122 +
12123 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12124 {
12125 enum ctx_state prev_state = exception_enter();
12126 @@ -353,6 +816,29 @@ retry:
12127 if (!vma)
12128 goto bad_area;
12129
12130 +#ifdef CONFIG_PAX_PAGEEXEC
12131 + /* PaX: detect ITLB misses on non-exec pages */
12132 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12133 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12134 + {
12135 + if (address != regs->tpc)
12136 + goto good_area;
12137 +
12138 + up_read(&mm->mmap_sem);
12139 + switch (pax_handle_fetch_fault(regs)) {
12140 +
12141 +#ifdef CONFIG_PAX_EMUPLT
12142 + case 2:
12143 + case 3:
12144 + return;
12145 +#endif
12146 +
12147 + }
12148 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12149 + do_group_exit(SIGKILL);
12150 + }
12151 +#endif
12152 +
12153 /* Pure DTLB misses do not tell us whether the fault causing
12154 * load/store/atomic was a write or not, it only says that there
12155 * was no match. So in such a case we (carefully) read the
12156 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12157 index d329537..2c3746a 100644
12158 --- a/arch/sparc/mm/hugetlbpage.c
12159 +++ b/arch/sparc/mm/hugetlbpage.c
12160 @@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12161 unsigned long addr,
12162 unsigned long len,
12163 unsigned long pgoff,
12164 - unsigned long flags)
12165 + unsigned long flags,
12166 + unsigned long offset)
12167 {
12168 + struct mm_struct *mm = current->mm;
12169 unsigned long task_size = TASK_SIZE;
12170 struct vm_unmapped_area_info info;
12171
12172 @@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12173
12174 info.flags = 0;
12175 info.length = len;
12176 - info.low_limit = TASK_UNMAPPED_BASE;
12177 + info.low_limit = mm->mmap_base;
12178 info.high_limit = min(task_size, VA_EXCLUDE_START);
12179 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12180 info.align_offset = 0;
12181 + info.threadstack_offset = offset;
12182 addr = vm_unmapped_area(&info);
12183
12184 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12185 VM_BUG_ON(addr != -ENOMEM);
12186 info.low_limit = VA_EXCLUDE_END;
12187 +
12188 +#ifdef CONFIG_PAX_RANDMMAP
12189 + if (mm->pax_flags & MF_PAX_RANDMMAP)
12190 + info.low_limit += mm->delta_mmap;
12191 +#endif
12192 +
12193 info.high_limit = task_size;
12194 addr = vm_unmapped_area(&info);
12195 }
12196 @@ -55,7 +64,8 @@ static unsigned long
12197 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12198 const unsigned long len,
12199 const unsigned long pgoff,
12200 - const unsigned long flags)
12201 + const unsigned long flags,
12202 + const unsigned long offset)
12203 {
12204 struct mm_struct *mm = current->mm;
12205 unsigned long addr = addr0;
12206 @@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12207 info.high_limit = mm->mmap_base;
12208 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12209 info.align_offset = 0;
12210 + info.threadstack_offset = offset;
12211 addr = vm_unmapped_area(&info);
12212
12213 /*
12214 @@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12215 VM_BUG_ON(addr != -ENOMEM);
12216 info.flags = 0;
12217 info.low_limit = TASK_UNMAPPED_BASE;
12218 +
12219 +#ifdef CONFIG_PAX_RANDMMAP
12220 + if (mm->pax_flags & MF_PAX_RANDMMAP)
12221 + info.low_limit += mm->delta_mmap;
12222 +#endif
12223 +
12224 info.high_limit = STACK_TOP32;
12225 addr = vm_unmapped_area(&info);
12226 }
12227 @@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12228 struct mm_struct *mm = current->mm;
12229 struct vm_area_struct *vma;
12230 unsigned long task_size = TASK_SIZE;
12231 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12232
12233 if (test_thread_flag(TIF_32BIT))
12234 task_size = STACK_TOP32;
12235 @@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12236 return addr;
12237 }
12238
12239 +#ifdef CONFIG_PAX_RANDMMAP
12240 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12241 +#endif
12242 +
12243 if (addr) {
12244 addr = ALIGN(addr, HPAGE_SIZE);
12245 vma = find_vma(mm, addr);
12246 - if (task_size - len >= addr &&
12247 - (!vma || addr + len <= vma->vm_start))
12248 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12249 return addr;
12250 }
12251 if (mm->get_unmapped_area == arch_get_unmapped_area)
12252 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12253 - pgoff, flags);
12254 + pgoff, flags, offset);
12255 else
12256 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12257 - pgoff, flags);
12258 + pgoff, flags, offset);
12259 }
12260
12261 pte_t *huge_pte_alloc(struct mm_struct *mm,
12262 diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12263 index 2d91c62..17a8fff 100644
12264 --- a/arch/sparc/mm/init_64.c
12265 +++ b/arch/sparc/mm/init_64.c
12266 @@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12267 int num_kernel_image_mappings;
12268
12269 #ifdef CONFIG_DEBUG_DCFLUSH
12270 -atomic_t dcpage_flushes = ATOMIC_INIT(0);
12271 +atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12272 #ifdef CONFIG_SMP
12273 -atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12274 +atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12275 #endif
12276 #endif
12277
12278 @@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12279 {
12280 BUG_ON(tlb_type == hypervisor);
12281 #ifdef CONFIG_DEBUG_DCFLUSH
12282 - atomic_inc(&dcpage_flushes);
12283 + atomic_inc_unchecked(&dcpage_flushes);
12284 #endif
12285
12286 #ifdef DCACHE_ALIASING_POSSIBLE
12287 @@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12288
12289 #ifdef CONFIG_DEBUG_DCFLUSH
12290 seq_printf(m, "DCPageFlushes\t: %d\n",
12291 - atomic_read(&dcpage_flushes));
12292 + atomic_read_unchecked(&dcpage_flushes));
12293 #ifdef CONFIG_SMP
12294 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12295 - atomic_read(&dcpage_flushes_xcall));
12296 + atomic_read_unchecked(&dcpage_flushes_xcall));
12297 #endif /* CONFIG_SMP */
12298 #endif /* CONFIG_DEBUG_DCFLUSH */
12299 }
12300 diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12301 index 7cca418..53fc030 100644
12302 --- a/arch/tile/Kconfig
12303 +++ b/arch/tile/Kconfig
12304 @@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12305
12306 config KEXEC
12307 bool "kexec system call"
12308 + depends on !GRKERNSEC_KMEM
12309 ---help---
12310 kexec is a system call that implements the ability to shutdown your
12311 current kernel, and to start another kernel. It is like a reboot
12312 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12313 index 7b11c5f..755a026 100644
12314 --- a/arch/tile/include/asm/atomic_64.h
12315 +++ b/arch/tile/include/asm/atomic_64.h
12316 @@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12317
12318 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12319
12320 +#define atomic64_read_unchecked(v) atomic64_read(v)
12321 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12322 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12323 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12324 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12325 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
12326 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12327 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
12328 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12329 +
12330 /* Define this to indicate that cmpxchg is an efficient operation. */
12331 #define __HAVE_ARCH_CMPXCHG
12332
12333 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12334 index 6160761..00cac88 100644
12335 --- a/arch/tile/include/asm/cache.h
12336 +++ b/arch/tile/include/asm/cache.h
12337 @@ -15,11 +15,12 @@
12338 #ifndef _ASM_TILE_CACHE_H
12339 #define _ASM_TILE_CACHE_H
12340
12341 +#include <linux/const.h>
12342 #include <arch/chip.h>
12343
12344 /* bytes per L1 data cache line */
12345 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12346 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12347 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12348
12349 /* bytes per L2 cache line */
12350 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12351 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12352 index b6cde32..c0cb736 100644
12353 --- a/arch/tile/include/asm/uaccess.h
12354 +++ b/arch/tile/include/asm/uaccess.h
12355 @@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12356 const void __user *from,
12357 unsigned long n)
12358 {
12359 - int sz = __compiletime_object_size(to);
12360 + size_t sz = __compiletime_object_size(to);
12361
12362 - if (likely(sz == -1 || sz >= n))
12363 + if (likely(sz == (size_t)-1 || sz >= n))
12364 n = _copy_from_user(to, from, n);
12365 else
12366 copy_from_user_overflow();
12367 diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12368 index e514899..f8743c4 100644
12369 --- a/arch/tile/mm/hugetlbpage.c
12370 +++ b/arch/tile/mm/hugetlbpage.c
12371 @@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12372 info.high_limit = TASK_SIZE;
12373 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12374 info.align_offset = 0;
12375 + info.threadstack_offset = 0;
12376 return vm_unmapped_area(&info);
12377 }
12378
12379 @@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12380 info.high_limit = current->mm->mmap_base;
12381 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12382 info.align_offset = 0;
12383 + info.threadstack_offset = 0;
12384 addr = vm_unmapped_area(&info);
12385
12386 /*
12387 diff --git a/arch/um/Makefile b/arch/um/Makefile
12388 index e4b1a96..16162f8 100644
12389 --- a/arch/um/Makefile
12390 +++ b/arch/um/Makefile
12391 @@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12392 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12393 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12394
12395 +ifdef CONSTIFY_PLUGIN
12396 +USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12397 +endif
12398 +
12399 #This will adjust *FLAGS accordingly to the platform.
12400 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12401
12402 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12403 index 19e1bdd..3665b77 100644
12404 --- a/arch/um/include/asm/cache.h
12405 +++ b/arch/um/include/asm/cache.h
12406 @@ -1,6 +1,7 @@
12407 #ifndef __UM_CACHE_H
12408 #define __UM_CACHE_H
12409
12410 +#include <linux/const.h>
12411
12412 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12413 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12414 @@ -12,6 +13,6 @@
12415 # define L1_CACHE_SHIFT 5
12416 #endif
12417
12418 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12419 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12420
12421 #endif
12422 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12423 index 2e0a6b1..a64d0f5 100644
12424 --- a/arch/um/include/asm/kmap_types.h
12425 +++ b/arch/um/include/asm/kmap_types.h
12426 @@ -8,6 +8,6 @@
12427
12428 /* No more #include "asm/arch/kmap_types.h" ! */
12429
12430 -#define KM_TYPE_NR 14
12431 +#define KM_TYPE_NR 15
12432
12433 #endif
12434 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12435 index 71c5d13..4c7b9f1 100644
12436 --- a/arch/um/include/asm/page.h
12437 +++ b/arch/um/include/asm/page.h
12438 @@ -14,6 +14,9 @@
12439 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12440 #define PAGE_MASK (~(PAGE_SIZE-1))
12441
12442 +#define ktla_ktva(addr) (addr)
12443 +#define ktva_ktla(addr) (addr)
12444 +
12445 #ifndef __ASSEMBLY__
12446
12447 struct page;
12448 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12449 index 0032f92..cd151e0 100644
12450 --- a/arch/um/include/asm/pgtable-3level.h
12451 +++ b/arch/um/include/asm/pgtable-3level.h
12452 @@ -58,6 +58,7 @@
12453 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12454 #define pud_populate(mm, pud, pmd) \
12455 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12456 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12457
12458 #ifdef CONFIG_64BIT
12459 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12460 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12461 index f17bca8..48adb87 100644
12462 --- a/arch/um/kernel/process.c
12463 +++ b/arch/um/kernel/process.c
12464 @@ -356,22 +356,6 @@ int singlestepping(void * t)
12465 return 2;
12466 }
12467
12468 -/*
12469 - * Only x86 and x86_64 have an arch_align_stack().
12470 - * All other arches have "#define arch_align_stack(x) (x)"
12471 - * in their asm/exec.h
12472 - * As this is included in UML from asm-um/system-generic.h,
12473 - * we can use it to behave as the subarch does.
12474 - */
12475 -#ifndef arch_align_stack
12476 -unsigned long arch_align_stack(unsigned long sp)
12477 -{
12478 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12479 - sp -= get_random_int() % 8192;
12480 - return sp & ~0xf;
12481 -}
12482 -#endif
12483 -
12484 unsigned long get_wchan(struct task_struct *p)
12485 {
12486 unsigned long stack_page, sp, ip;
12487 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12488 index ad8f795..2c7eec6 100644
12489 --- a/arch/unicore32/include/asm/cache.h
12490 +++ b/arch/unicore32/include/asm/cache.h
12491 @@ -12,8 +12,10 @@
12492 #ifndef __UNICORE_CACHE_H__
12493 #define __UNICORE_CACHE_H__
12494
12495 -#define L1_CACHE_SHIFT (5)
12496 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12497 +#include <linux/const.h>
12498 +
12499 +#define L1_CACHE_SHIFT 5
12500 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12501
12502 /*
12503 * Memory returned by kmalloc() may be used for DMA, so we must make
12504 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12505 index 41a503c..cf98b04 100644
12506 --- a/arch/x86/Kconfig
12507 +++ b/arch/x86/Kconfig
12508 @@ -129,7 +129,7 @@ config X86
12509 select RTC_LIB
12510 select HAVE_DEBUG_STACKOVERFLOW
12511 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12512 - select HAVE_CC_STACKPROTECTOR
12513 + select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12514 select GENERIC_CPU_AUTOPROBE
12515 select HAVE_ARCH_AUDITSYSCALL
12516 select ARCH_SUPPORTS_ATOMIC_RMW
12517 @@ -262,7 +262,7 @@ config X86_HT
12518
12519 config X86_32_LAZY_GS
12520 def_bool y
12521 - depends on X86_32 && !CC_STACKPROTECTOR
12522 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12523
12524 config ARCH_HWEIGHT_CFLAGS
12525 string
12526 @@ -600,6 +600,7 @@ config SCHED_OMIT_FRAME_POINTER
12527
12528 menuconfig HYPERVISOR_GUEST
12529 bool "Linux guest support"
12530 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12531 ---help---
12532 Say Y here to enable options for running Linux under various hyper-
12533 visors. This option enables basic hypervisor detection and platform
12534 @@ -973,6 +974,7 @@ config VM86
12535
12536 config X86_16BIT
12537 bool "Enable support for 16-bit segments" if EXPERT
12538 + depends on !GRKERNSEC
12539 default y
12540 ---help---
12541 This option is required by programs like Wine to run 16-bit
12542 @@ -1128,6 +1130,7 @@ choice
12543
12544 config NOHIGHMEM
12545 bool "off"
12546 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12547 ---help---
12548 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12549 However, the address space of 32-bit x86 processors is only 4
12550 @@ -1164,6 +1167,7 @@ config NOHIGHMEM
12551
12552 config HIGHMEM4G
12553 bool "4GB"
12554 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12555 ---help---
12556 Select this if you have a 32-bit processor and between 1 and 4
12557 gigabytes of physical RAM.
12558 @@ -1216,7 +1220,7 @@ config PAGE_OFFSET
12559 hex
12560 default 0xB0000000 if VMSPLIT_3G_OPT
12561 default 0x80000000 if VMSPLIT_2G
12562 - default 0x78000000 if VMSPLIT_2G_OPT
12563 + default 0x70000000 if VMSPLIT_2G_OPT
12564 default 0x40000000 if VMSPLIT_1G
12565 default 0xC0000000
12566 depends on X86_32
12567 @@ -1631,6 +1635,7 @@ source kernel/Kconfig.hz
12568
12569 config KEXEC
12570 bool "kexec system call"
12571 + depends on !GRKERNSEC_KMEM
12572 ---help---
12573 kexec is a system call that implements the ability to shutdown your
12574 current kernel, and to start another kernel. It is like a reboot
12575 @@ -1816,7 +1821,9 @@ config X86_NEED_RELOCS
12576
12577 config PHYSICAL_ALIGN
12578 hex "Alignment value to which kernel should be aligned"
12579 - default "0x200000"
12580 + default "0x1000000"
12581 + range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12582 + range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12583 range 0x2000 0x1000000 if X86_32
12584 range 0x200000 0x1000000 if X86_64
12585 ---help---
12586 @@ -1899,6 +1906,7 @@ config COMPAT_VDSO
12587 def_bool n
12588 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12589 depends on X86_32 || IA32_EMULATION
12590 + depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12591 ---help---
12592 Certain buggy versions of glibc will crash if they are
12593 presented with a 32-bit vDSO that is not mapped at the address
12594 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12595 index 6983314..54ad7e8 100644
12596 --- a/arch/x86/Kconfig.cpu
12597 +++ b/arch/x86/Kconfig.cpu
12598 @@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12599
12600 config X86_F00F_BUG
12601 def_bool y
12602 - depends on M586MMX || M586TSC || M586 || M486
12603 + depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12604
12605 config X86_INVD_BUG
12606 def_bool y
12607 @@ -327,7 +327,7 @@ config X86_INVD_BUG
12608
12609 config X86_ALIGNMENT_16
12610 def_bool y
12611 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12612 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12613
12614 config X86_INTEL_USERCOPY
12615 def_bool y
12616 @@ -369,7 +369,7 @@ config X86_CMPXCHG64
12617 # generates cmov.
12618 config X86_CMOV
12619 def_bool y
12620 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12621 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12622
12623 config X86_MINIMUM_CPU_FAMILY
12624 int
12625 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12626 index 61bd2ad..50b625d 100644
12627 --- a/arch/x86/Kconfig.debug
12628 +++ b/arch/x86/Kconfig.debug
12629 @@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12630 config DEBUG_RODATA
12631 bool "Write protect kernel read-only data structures"
12632 default y
12633 - depends on DEBUG_KERNEL
12634 + depends on DEBUG_KERNEL && BROKEN
12635 ---help---
12636 Mark the kernel read-only data as write-protected in the pagetables,
12637 in order to catch accidental (and incorrect) writes to such const
12638 @@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12639
12640 config DEBUG_SET_MODULE_RONX
12641 bool "Set loadable kernel module data as NX and text as RO"
12642 - depends on MODULES
12643 + depends on MODULES && BROKEN
12644 ---help---
12645 This option helps catch unintended modifications to loadable
12646 kernel module's text and read-only data. It also prevents execution
12647 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12648 index 920e616..ac3d4df 100644
12649 --- a/arch/x86/Makefile
12650 +++ b/arch/x86/Makefile
12651 @@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12652 # CPU-specific tuning. Anything which can be shared with UML should go here.
12653 include $(srctree)/arch/x86/Makefile_32.cpu
12654 KBUILD_CFLAGS += $(cflags-y)
12655 -
12656 - # temporary until string.h is fixed
12657 - KBUILD_CFLAGS += -ffreestanding
12658 else
12659 BITS := 64
12660 UTS_MACHINE := x86_64
12661 @@ -107,6 +104,9 @@ else
12662 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12663 endif
12664
12665 +# temporary until string.h is fixed
12666 +KBUILD_CFLAGS += -ffreestanding
12667 +
12668 # Make sure compiler does not have buggy stack-protector support.
12669 ifdef CONFIG_CC_STACKPROTECTOR
12670 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12671 @@ -180,6 +180,7 @@ archheaders:
12672 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12673
12674 archprepare:
12675 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12676 ifeq ($(CONFIG_KEXEC_FILE),y)
12677 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12678 endif
12679 @@ -263,3 +264,9 @@ define archhelp
12680 echo ' FDARGS="..." arguments for the booted kernel'
12681 echo ' FDINITRD=file initrd for the booted kernel'
12682 endef
12683 +
12684 +define OLD_LD
12685 +
12686 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12687 +*** Please upgrade your binutils to 2.18 or newer
12688 +endef
12689 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12690 index 5b016e2..04ef69c 100644
12691 --- a/arch/x86/boot/Makefile
12692 +++ b/arch/x86/boot/Makefile
12693 @@ -55,6 +55,9 @@ endif
12694 # ---------------------------------------------------------------------------
12695
12696 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12697 +ifdef CONSTIFY_PLUGIN
12698 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12699 +endif
12700 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12701 GCOV_PROFILE := n
12702
12703 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12704 index 878e4b9..20537ab 100644
12705 --- a/arch/x86/boot/bitops.h
12706 +++ b/arch/x86/boot/bitops.h
12707 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12708 u8 v;
12709 const u32 *p = (const u32 *)addr;
12710
12711 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12712 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12713 return v;
12714 }
12715
12716 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12717
12718 static inline void set_bit(int nr, void *addr)
12719 {
12720 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12721 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12722 }
12723
12724 #endif /* BOOT_BITOPS_H */
12725 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12726 index bd49ec6..94c7f58 100644
12727 --- a/arch/x86/boot/boot.h
12728 +++ b/arch/x86/boot/boot.h
12729 @@ -84,7 +84,7 @@ static inline void io_delay(void)
12730 static inline u16 ds(void)
12731 {
12732 u16 seg;
12733 - asm("movw %%ds,%0" : "=rm" (seg));
12734 + asm volatile("movw %%ds,%0" : "=rm" (seg));
12735 return seg;
12736 }
12737
12738 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12739 index 45abc36..97bea2d 100644
12740 --- a/arch/x86/boot/compressed/Makefile
12741 +++ b/arch/x86/boot/compressed/Makefile
12742 @@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12743 KBUILD_CFLAGS += -mno-mmx -mno-sse
12744 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12745 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12746 +ifdef CONSTIFY_PLUGIN
12747 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12748 +endif
12749
12750 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12751 GCOV_PROFILE := n
12752 diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12753 index a53440e..c3dbf1e 100644
12754 --- a/arch/x86/boot/compressed/efi_stub_32.S
12755 +++ b/arch/x86/boot/compressed/efi_stub_32.S
12756 @@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12757 * parameter 2, ..., param n. To make things easy, we save the return
12758 * address of efi_call_phys in a global variable.
12759 */
12760 - popl %ecx
12761 - movl %ecx, saved_return_addr(%edx)
12762 - /* get the function pointer into ECX*/
12763 - popl %ecx
12764 - movl %ecx, efi_rt_function_ptr(%edx)
12765 + popl saved_return_addr(%edx)
12766 + popl efi_rt_function_ptr(%edx)
12767
12768 /*
12769 * 3. Call the physical function.
12770 */
12771 - call *%ecx
12772 + call *efi_rt_function_ptr(%edx)
12773
12774 /*
12775 * 4. Balance the stack. And because EAX contain the return value,
12776 @@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12777 1: popl %edx
12778 subl $1b, %edx
12779
12780 - movl efi_rt_function_ptr(%edx), %ecx
12781 - pushl %ecx
12782 + pushl efi_rt_function_ptr(%edx)
12783
12784 /*
12785 * 10. Push the saved return address onto the stack and return.
12786 */
12787 - movl saved_return_addr(%edx), %ecx
12788 - pushl %ecx
12789 - ret
12790 + jmpl *saved_return_addr(%edx)
12791 ENDPROC(efi_call_phys)
12792 .previous
12793
12794 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12795 index 1d7fbbc..36ecd58 100644
12796 --- a/arch/x86/boot/compressed/head_32.S
12797 +++ b/arch/x86/boot/compressed/head_32.S
12798 @@ -140,10 +140,10 @@ preferred_addr:
12799 addl %eax, %ebx
12800 notl %eax
12801 andl %eax, %ebx
12802 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12803 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12804 jge 1f
12805 #endif
12806 - movl $LOAD_PHYSICAL_ADDR, %ebx
12807 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12808 1:
12809
12810 /* Target address to relocate to for decompression */
12811 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12812 index 6b1766c..ad465c9 100644
12813 --- a/arch/x86/boot/compressed/head_64.S
12814 +++ b/arch/x86/boot/compressed/head_64.S
12815 @@ -94,10 +94,10 @@ ENTRY(startup_32)
12816 addl %eax, %ebx
12817 notl %eax
12818 andl %eax, %ebx
12819 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12820 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12821 jge 1f
12822 #endif
12823 - movl $LOAD_PHYSICAL_ADDR, %ebx
12824 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12825 1:
12826
12827 /* Target address to relocate to for decompression */
12828 @@ -322,10 +322,10 @@ preferred_addr:
12829 addq %rax, %rbp
12830 notq %rax
12831 andq %rax, %rbp
12832 - cmpq $LOAD_PHYSICAL_ADDR, %rbp
12833 + cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12834 jge 1f
12835 #endif
12836 - movq $LOAD_PHYSICAL_ADDR, %rbp
12837 + movq $____LOAD_PHYSICAL_ADDR, %rbp
12838 1:
12839
12840 /* Target address to relocate to for decompression */
12841 @@ -434,8 +434,8 @@ gdt:
12842 .long gdt
12843 .word 0
12844 .quad 0x0000000000000000 /* NULL descriptor */
12845 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
12846 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
12847 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
12848 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
12849 .quad 0x0080890000000000 /* TS descriptor */
12850 .quad 0x0000000000000000 /* TS continued */
12851 gdt_end:
12852 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12853 index 30dd59a..cd9edc3 100644
12854 --- a/arch/x86/boot/compressed/misc.c
12855 +++ b/arch/x86/boot/compressed/misc.c
12856 @@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12857 * Calculate the delta between where vmlinux was linked to load
12858 * and where it was actually loaded.
12859 */
12860 - delta = min_addr - LOAD_PHYSICAL_ADDR;
12861 + delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12862 if (!delta) {
12863 debug_putstr("No relocation needed... ");
12864 return;
12865 @@ -312,7 +312,7 @@ static void parse_elf(void *output)
12866 Elf32_Ehdr ehdr;
12867 Elf32_Phdr *phdrs, *phdr;
12868 #endif
12869 - void *dest;
12870 + void *dest, *prev;
12871 int i;
12872
12873 memcpy(&ehdr, output, sizeof(ehdr));
12874 @@ -339,13 +339,16 @@ static void parse_elf(void *output)
12875 case PT_LOAD:
12876 #ifdef CONFIG_RELOCATABLE
12877 dest = output;
12878 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12879 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12880 #else
12881 dest = (void *)(phdr->p_paddr);
12882 #endif
12883 memcpy(dest,
12884 output + phdr->p_offset,
12885 phdr->p_filesz);
12886 + if (i)
12887 + memset(prev, 0xff, dest - prev);
12888 + prev = dest + phdr->p_filesz;
12889 break;
12890 default: /* Ignore other PT_* */ break;
12891 }
12892 @@ -402,7 +405,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12893 error("Destination address too large");
12894 #endif
12895 #ifndef CONFIG_RELOCATABLE
12896 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12897 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12898 error("Wrong destination address");
12899 #endif
12900
12901 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12902 index 1fd7d57..0f7d096 100644
12903 --- a/arch/x86/boot/cpucheck.c
12904 +++ b/arch/x86/boot/cpucheck.c
12905 @@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12906 u32 ecx = MSR_K7_HWCR;
12907 u32 eax, edx;
12908
12909 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12910 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12911 eax &= ~(1 << 15);
12912 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12913 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12914
12915 get_cpuflags(); /* Make sure it really did something */
12916 err = check_cpuflags();
12917 @@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12918 u32 ecx = MSR_VIA_FCR;
12919 u32 eax, edx;
12920
12921 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12922 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12923 eax |= (1<<1)|(1<<7);
12924 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12925 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12926
12927 set_bit(X86_FEATURE_CX8, cpu.flags);
12928 err = check_cpuflags();
12929 @@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12930 u32 eax, edx;
12931 u32 level = 1;
12932
12933 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12934 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12935 - asm("cpuid"
12936 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12937 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12938 + asm volatile("cpuid"
12939 : "+a" (level), "=d" (cpu.flags[0])
12940 : : "ecx", "ebx");
12941 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12942 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12943
12944 err = check_cpuflags();
12945 } else if (err == 0x01 &&
12946 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12947 index 16ef025..91e033b 100644
12948 --- a/arch/x86/boot/header.S
12949 +++ b/arch/x86/boot/header.S
12950 @@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12951 # single linked list of
12952 # struct setup_data
12953
12954 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12955 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12956
12957 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12958 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12959 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12960 +#else
12961 #define VO_INIT_SIZE (VO__end - VO__text)
12962 +#endif
12963 #if ZO_INIT_SIZE > VO_INIT_SIZE
12964 #define INIT_SIZE ZO_INIT_SIZE
12965 #else
12966 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12967 index db75d07..8e6d0af 100644
12968 --- a/arch/x86/boot/memory.c
12969 +++ b/arch/x86/boot/memory.c
12970 @@ -19,7 +19,7 @@
12971
12972 static int detect_memory_e820(void)
12973 {
12974 - int count = 0;
12975 + unsigned int count = 0;
12976 struct biosregs ireg, oreg;
12977 struct e820entry *desc = boot_params.e820_map;
12978 static struct e820entry buf; /* static so it is zeroed */
12979 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12980 index ba3e100..6501b8f 100644
12981 --- a/arch/x86/boot/video-vesa.c
12982 +++ b/arch/x86/boot/video-vesa.c
12983 @@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
12984
12985 boot_params.screen_info.vesapm_seg = oreg.es;
12986 boot_params.screen_info.vesapm_off = oreg.di;
12987 + boot_params.screen_info.vesapm_size = oreg.cx;
12988 }
12989
12990 /*
12991 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
12992 index 43eda28..5ab5fdb 100644
12993 --- a/arch/x86/boot/video.c
12994 +++ b/arch/x86/boot/video.c
12995 @@ -96,7 +96,7 @@ static void store_mode_params(void)
12996 static unsigned int get_entry(void)
12997 {
12998 char entry_buf[4];
12999 - int i, len = 0;
13000 + unsigned int i, len = 0;
13001 int key;
13002 unsigned int v;
13003
13004 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13005 index 9105655..41779c1 100644
13006 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
13007 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13008 @@ -8,6 +8,8 @@
13009 * including this sentence is retained in full.
13010 */
13011
13012 +#include <asm/alternative-asm.h>
13013 +
13014 .extern crypto_ft_tab
13015 .extern crypto_it_tab
13016 .extern crypto_fl_tab
13017 @@ -70,6 +72,8 @@
13018 je B192; \
13019 leaq 32(r9),r9;
13020
13021 +#define ret pax_force_retaddr; ret
13022 +
13023 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13024 movq r1,r2; \
13025 movq r3,r4; \
13026 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13027 index 477e9d7..c92c7d8 100644
13028 --- a/arch/x86/crypto/aesni-intel_asm.S
13029 +++ b/arch/x86/crypto/aesni-intel_asm.S
13030 @@ -31,6 +31,7 @@
13031
13032 #include <linux/linkage.h>
13033 #include <asm/inst.h>
13034 +#include <asm/alternative-asm.h>
13035
13036 #ifdef __x86_64__
13037 .data
13038 @@ -205,7 +206,7 @@ enc: .octa 0x2
13039 * num_initial_blocks = b mod 4
13040 * encrypt the initial num_initial_blocks blocks and apply ghash on
13041 * the ciphertext
13042 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13043 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13044 * are clobbered
13045 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13046 */
13047 @@ -214,8 +215,8 @@ enc: .octa 0x2
13048 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13049 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13050 mov arg7, %r10 # %r10 = AAD
13051 - mov arg8, %r12 # %r12 = aadLen
13052 - mov %r12, %r11
13053 + mov arg8, %r15 # %r15 = aadLen
13054 + mov %r15, %r11
13055 pxor %xmm\i, %xmm\i
13056 _get_AAD_loop\num_initial_blocks\operation:
13057 movd (%r10), \TMP1
13058 @@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13059 psrldq $4, %xmm\i
13060 pxor \TMP1, %xmm\i
13061 add $4, %r10
13062 - sub $4, %r12
13063 + sub $4, %r15
13064 jne _get_AAD_loop\num_initial_blocks\operation
13065 cmp $16, %r11
13066 je _get_AAD_loop2_done\num_initial_blocks\operation
13067 - mov $16, %r12
13068 + mov $16, %r15
13069 _get_AAD_loop2\num_initial_blocks\operation:
13070 psrldq $4, %xmm\i
13071 - sub $4, %r12
13072 - cmp %r11, %r12
13073 + sub $4, %r15
13074 + cmp %r11, %r15
13075 jne _get_AAD_loop2\num_initial_blocks\operation
13076 _get_AAD_loop2_done\num_initial_blocks\operation:
13077 movdqa SHUF_MASK(%rip), %xmm14
13078 @@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13079 * num_initial_blocks = b mod 4
13080 * encrypt the initial num_initial_blocks blocks and apply ghash on
13081 * the ciphertext
13082 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13083 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13084 * are clobbered
13085 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13086 */
13087 @@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13088 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13089 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13090 mov arg7, %r10 # %r10 = AAD
13091 - mov arg8, %r12 # %r12 = aadLen
13092 - mov %r12, %r11
13093 + mov arg8, %r15 # %r15 = aadLen
13094 + mov %r15, %r11
13095 pxor %xmm\i, %xmm\i
13096 _get_AAD_loop\num_initial_blocks\operation:
13097 movd (%r10), \TMP1
13098 @@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13099 psrldq $4, %xmm\i
13100 pxor \TMP1, %xmm\i
13101 add $4, %r10
13102 - sub $4, %r12
13103 + sub $4, %r15
13104 jne _get_AAD_loop\num_initial_blocks\operation
13105 cmp $16, %r11
13106 je _get_AAD_loop2_done\num_initial_blocks\operation
13107 - mov $16, %r12
13108 + mov $16, %r15
13109 _get_AAD_loop2\num_initial_blocks\operation:
13110 psrldq $4, %xmm\i
13111 - sub $4, %r12
13112 - cmp %r11, %r12
13113 + sub $4, %r15
13114 + cmp %r11, %r15
13115 jne _get_AAD_loop2\num_initial_blocks\operation
13116 _get_AAD_loop2_done\num_initial_blocks\operation:
13117 movdqa SHUF_MASK(%rip), %xmm14
13118 @@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
13119 *
13120 *****************************************************************************/
13121 ENTRY(aesni_gcm_dec)
13122 - push %r12
13123 + push %r15
13124 push %r13
13125 push %r14
13126 mov %rsp, %r14
13127 @@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
13128 */
13129 sub $VARIABLE_OFFSET, %rsp
13130 and $~63, %rsp # align rsp to 64 bytes
13131 - mov %arg6, %r12
13132 - movdqu (%r12), %xmm13 # %xmm13 = HashKey
13133 + mov %arg6, %r15
13134 + movdqu (%r15), %xmm13 # %xmm13 = HashKey
13135 movdqa SHUF_MASK(%rip), %xmm2
13136 PSHUFB_XMM %xmm2, %xmm13
13137
13138 @@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
13139 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13140 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13141 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13142 - mov %r13, %r12
13143 - and $(3<<4), %r12
13144 + mov %r13, %r15
13145 + and $(3<<4), %r15
13146 jz _initial_num_blocks_is_0_decrypt
13147 - cmp $(2<<4), %r12
13148 + cmp $(2<<4), %r15
13149 jb _initial_num_blocks_is_1_decrypt
13150 je _initial_num_blocks_is_2_decrypt
13151 _initial_num_blocks_is_3_decrypt:
13152 @@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
13153 sub $16, %r11
13154 add %r13, %r11
13155 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13156 - lea SHIFT_MASK+16(%rip), %r12
13157 - sub %r13, %r12
13158 + lea SHIFT_MASK+16(%rip), %r15
13159 + sub %r13, %r15
13160 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13161 # (%r13 is the number of bytes in plaintext mod 16)
13162 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13163 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13164 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13165
13166 movdqa %xmm1, %xmm2
13167 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13168 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13169 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13170 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13171 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13172 pand %xmm1, %xmm2
13173 @@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
13174 sub $1, %r13
13175 jne _less_than_8_bytes_left_decrypt
13176 _multiple_of_16_bytes_decrypt:
13177 - mov arg8, %r12 # %r13 = aadLen (number of bytes)
13178 - shl $3, %r12 # convert into number of bits
13179 - movd %r12d, %xmm15 # len(A) in %xmm15
13180 + mov arg8, %r15 # %r13 = aadLen (number of bytes)
13181 + shl $3, %r15 # convert into number of bits
13182 + movd %r15d, %xmm15 # len(A) in %xmm15
13183 shl $3, %arg4 # len(C) in bits (*128)
13184 MOVQ_R64_XMM %arg4, %xmm1
13185 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13186 @@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
13187 mov %r14, %rsp
13188 pop %r14
13189 pop %r13
13190 - pop %r12
13191 + pop %r15
13192 + pax_force_retaddr
13193 ret
13194 ENDPROC(aesni_gcm_dec)
13195
13196 @@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
13197 * poly = x^128 + x^127 + x^126 + x^121 + 1
13198 ***************************************************************************/
13199 ENTRY(aesni_gcm_enc)
13200 - push %r12
13201 + push %r15
13202 push %r13
13203 push %r14
13204 mov %rsp, %r14
13205 @@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
13206 #
13207 sub $VARIABLE_OFFSET, %rsp
13208 and $~63, %rsp
13209 - mov %arg6, %r12
13210 - movdqu (%r12), %xmm13
13211 + mov %arg6, %r15
13212 + movdqu (%r15), %xmm13
13213 movdqa SHUF_MASK(%rip), %xmm2
13214 PSHUFB_XMM %xmm2, %xmm13
13215
13216 @@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
13217 movdqa %xmm13, HashKey(%rsp)
13218 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13219 and $-16, %r13
13220 - mov %r13, %r12
13221 + mov %r13, %r15
13222
13223 # Encrypt first few blocks
13224
13225 - and $(3<<4), %r12
13226 + and $(3<<4), %r15
13227 jz _initial_num_blocks_is_0_encrypt
13228 - cmp $(2<<4), %r12
13229 + cmp $(2<<4), %r15
13230 jb _initial_num_blocks_is_1_encrypt
13231 je _initial_num_blocks_is_2_encrypt
13232 _initial_num_blocks_is_3_encrypt:
13233 @@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13234 sub $16, %r11
13235 add %r13, %r11
13236 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13237 - lea SHIFT_MASK+16(%rip), %r12
13238 - sub %r13, %r12
13239 + lea SHIFT_MASK+16(%rip), %r15
13240 + sub %r13, %r15
13241 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13242 # (%r13 is the number of bytes in plaintext mod 16)
13243 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13244 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13245 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13246 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13247 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13248 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13249 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13250 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13251 movdqa SHUF_MASK(%rip), %xmm10
13252 @@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13253 sub $1, %r13
13254 jne _less_than_8_bytes_left_encrypt
13255 _multiple_of_16_bytes_encrypt:
13256 - mov arg8, %r12 # %r12 = addLen (number of bytes)
13257 - shl $3, %r12
13258 - movd %r12d, %xmm15 # len(A) in %xmm15
13259 + mov arg8, %r15 # %r15 = addLen (number of bytes)
13260 + shl $3, %r15
13261 + movd %r15d, %xmm15 # len(A) in %xmm15
13262 shl $3, %arg4 # len(C) in bits (*128)
13263 MOVQ_R64_XMM %arg4, %xmm1
13264 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13265 @@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13266 mov %r14, %rsp
13267 pop %r14
13268 pop %r13
13269 - pop %r12
13270 + pop %r15
13271 + pax_force_retaddr
13272 ret
13273 ENDPROC(aesni_gcm_enc)
13274
13275 @@ -1722,6 +1725,7 @@ _key_expansion_256a:
13276 pxor %xmm1, %xmm0
13277 movaps %xmm0, (TKEYP)
13278 add $0x10, TKEYP
13279 + pax_force_retaddr
13280 ret
13281 ENDPROC(_key_expansion_128)
13282 ENDPROC(_key_expansion_256a)
13283 @@ -1748,6 +1752,7 @@ _key_expansion_192a:
13284 shufps $0b01001110, %xmm2, %xmm1
13285 movaps %xmm1, 0x10(TKEYP)
13286 add $0x20, TKEYP
13287 + pax_force_retaddr
13288 ret
13289 ENDPROC(_key_expansion_192a)
13290
13291 @@ -1768,6 +1773,7 @@ _key_expansion_192b:
13292
13293 movaps %xmm0, (TKEYP)
13294 add $0x10, TKEYP
13295 + pax_force_retaddr
13296 ret
13297 ENDPROC(_key_expansion_192b)
13298
13299 @@ -1781,6 +1787,7 @@ _key_expansion_256b:
13300 pxor %xmm1, %xmm2
13301 movaps %xmm2, (TKEYP)
13302 add $0x10, TKEYP
13303 + pax_force_retaddr
13304 ret
13305 ENDPROC(_key_expansion_256b)
13306
13307 @@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13308 #ifndef __x86_64__
13309 popl KEYP
13310 #endif
13311 + pax_force_retaddr
13312 ret
13313 ENDPROC(aesni_set_key)
13314
13315 @@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13316 popl KLEN
13317 popl KEYP
13318 #endif
13319 + pax_force_retaddr
13320 ret
13321 ENDPROC(aesni_enc)
13322
13323 @@ -1974,6 +1983,7 @@ _aesni_enc1:
13324 AESENC KEY STATE
13325 movaps 0x70(TKEYP), KEY
13326 AESENCLAST KEY STATE
13327 + pax_force_retaddr
13328 ret
13329 ENDPROC(_aesni_enc1)
13330
13331 @@ -2083,6 +2093,7 @@ _aesni_enc4:
13332 AESENCLAST KEY STATE2
13333 AESENCLAST KEY STATE3
13334 AESENCLAST KEY STATE4
13335 + pax_force_retaddr
13336 ret
13337 ENDPROC(_aesni_enc4)
13338
13339 @@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13340 popl KLEN
13341 popl KEYP
13342 #endif
13343 + pax_force_retaddr
13344 ret
13345 ENDPROC(aesni_dec)
13346
13347 @@ -2164,6 +2176,7 @@ _aesni_dec1:
13348 AESDEC KEY STATE
13349 movaps 0x70(TKEYP), KEY
13350 AESDECLAST KEY STATE
13351 + pax_force_retaddr
13352 ret
13353 ENDPROC(_aesni_dec1)
13354
13355 @@ -2273,6 +2286,7 @@ _aesni_dec4:
13356 AESDECLAST KEY STATE2
13357 AESDECLAST KEY STATE3
13358 AESDECLAST KEY STATE4
13359 + pax_force_retaddr
13360 ret
13361 ENDPROC(_aesni_dec4)
13362
13363 @@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13364 popl KEYP
13365 popl LEN
13366 #endif
13367 + pax_force_retaddr
13368 ret
13369 ENDPROC(aesni_ecb_enc)
13370
13371 @@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13372 popl KEYP
13373 popl LEN
13374 #endif
13375 + pax_force_retaddr
13376 ret
13377 ENDPROC(aesni_ecb_dec)
13378
13379 @@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13380 popl LEN
13381 popl IVP
13382 #endif
13383 + pax_force_retaddr
13384 ret
13385 ENDPROC(aesni_cbc_enc)
13386
13387 @@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13388 popl LEN
13389 popl IVP
13390 #endif
13391 + pax_force_retaddr
13392 ret
13393 ENDPROC(aesni_cbc_dec)
13394
13395 @@ -2550,6 +2568,7 @@ _aesni_inc_init:
13396 mov $1, TCTR_LOW
13397 MOVQ_R64_XMM TCTR_LOW INC
13398 MOVQ_R64_XMM CTR TCTR_LOW
13399 + pax_force_retaddr
13400 ret
13401 ENDPROC(_aesni_inc_init)
13402
13403 @@ -2579,6 +2598,7 @@ _aesni_inc:
13404 .Linc_low:
13405 movaps CTR, IV
13406 PSHUFB_XMM BSWAP_MASK IV
13407 + pax_force_retaddr
13408 ret
13409 ENDPROC(_aesni_inc)
13410
13411 @@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13412 .Lctr_enc_ret:
13413 movups IV, (IVP)
13414 .Lctr_enc_just_ret:
13415 + pax_force_retaddr
13416 ret
13417 ENDPROC(aesni_ctr_enc)
13418
13419 @@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13420 pxor INC, STATE4
13421 movdqu STATE4, 0x70(OUTP)
13422
13423 + pax_force_retaddr
13424 ret
13425 ENDPROC(aesni_xts_crypt8)
13426
13427 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13428 index 246c670..466e2d6 100644
13429 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13430 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13431 @@ -21,6 +21,7 @@
13432 */
13433
13434 #include <linux/linkage.h>
13435 +#include <asm/alternative-asm.h>
13436
13437 .file "blowfish-x86_64-asm.S"
13438 .text
13439 @@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13440 jnz .L__enc_xor;
13441
13442 write_block();
13443 + pax_force_retaddr
13444 ret;
13445 .L__enc_xor:
13446 xor_block();
13447 + pax_force_retaddr
13448 ret;
13449 ENDPROC(__blowfish_enc_blk)
13450
13451 @@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13452
13453 movq %r11, %rbp;
13454
13455 + pax_force_retaddr
13456 ret;
13457 ENDPROC(blowfish_dec_blk)
13458
13459 @@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13460
13461 popq %rbx;
13462 popq %rbp;
13463 + pax_force_retaddr
13464 ret;
13465
13466 .L__enc_xor4:
13467 @@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13468
13469 popq %rbx;
13470 popq %rbp;
13471 + pax_force_retaddr
13472 ret;
13473 ENDPROC(__blowfish_enc_blk_4way)
13474
13475 @@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13476 popq %rbx;
13477 popq %rbp;
13478
13479 + pax_force_retaddr
13480 ret;
13481 ENDPROC(blowfish_dec_blk_4way)
13482 diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13483 index ce71f92..1dce7ec 100644
13484 --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13485 +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13486 @@ -16,6 +16,7 @@
13487 */
13488
13489 #include <linux/linkage.h>
13490 +#include <asm/alternative-asm.h>
13491
13492 #define CAMELLIA_TABLE_BYTE_LEN 272
13493
13494 @@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13495 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13496 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13497 %rcx, (%r9));
13498 + pax_force_retaddr
13499 ret;
13500 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13501
13502 @@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13503 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13504 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13505 %rax, (%r9));
13506 + pax_force_retaddr
13507 ret;
13508 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13509
13510 @@ -780,6 +783,7 @@ __camellia_enc_blk16:
13511 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13512 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13513
13514 + pax_force_retaddr
13515 ret;
13516
13517 .align 8
13518 @@ -865,6 +869,7 @@ __camellia_dec_blk16:
13519 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13520 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13521
13522 + pax_force_retaddr
13523 ret;
13524
13525 .align 8
13526 @@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13527 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13528 %xmm8, %rsi);
13529
13530 + pax_force_retaddr
13531 ret;
13532 ENDPROC(camellia_ecb_enc_16way)
13533
13534 @@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13535 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13536 %xmm8, %rsi);
13537
13538 + pax_force_retaddr
13539 ret;
13540 ENDPROC(camellia_ecb_dec_16way)
13541
13542 @@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13543 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13544 %xmm8, %rsi);
13545
13546 + pax_force_retaddr
13547 ret;
13548 ENDPROC(camellia_cbc_dec_16way)
13549
13550 @@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13551 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13552 %xmm8, %rsi);
13553
13554 + pax_force_retaddr
13555 ret;
13556 ENDPROC(camellia_ctr_16way)
13557
13558 @@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13559 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13560 %xmm8, %rsi);
13561
13562 + pax_force_retaddr
13563 ret;
13564 ENDPROC(camellia_xts_crypt_16way)
13565
13566 diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13567 index 0e0b886..5a3123c 100644
13568 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13569 +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13570 @@ -11,6 +11,7 @@
13571 */
13572
13573 #include <linux/linkage.h>
13574 +#include <asm/alternative-asm.h>
13575
13576 #define CAMELLIA_TABLE_BYTE_LEN 272
13577
13578 @@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13579 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13580 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13581 %rcx, (%r9));
13582 + pax_force_retaddr
13583 ret;
13584 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13585
13586 @@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13587 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13588 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13589 %rax, (%r9));
13590 + pax_force_retaddr
13591 ret;
13592 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13593
13594 @@ -820,6 +823,7 @@ __camellia_enc_blk32:
13595 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13596 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13597
13598 + pax_force_retaddr
13599 ret;
13600
13601 .align 8
13602 @@ -905,6 +909,7 @@ __camellia_dec_blk32:
13603 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13604 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13605
13606 + pax_force_retaddr
13607 ret;
13608
13609 .align 8
13610 @@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13611
13612 vzeroupper;
13613
13614 + pax_force_retaddr
13615 ret;
13616 ENDPROC(camellia_ecb_enc_32way)
13617
13618 @@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13619
13620 vzeroupper;
13621
13622 + pax_force_retaddr
13623 ret;
13624 ENDPROC(camellia_ecb_dec_32way)
13625
13626 @@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13627
13628 vzeroupper;
13629
13630 + pax_force_retaddr
13631 ret;
13632 ENDPROC(camellia_cbc_dec_32way)
13633
13634 @@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13635
13636 vzeroupper;
13637
13638 + pax_force_retaddr
13639 ret;
13640 ENDPROC(camellia_ctr_32way)
13641
13642 @@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13643
13644 vzeroupper;
13645
13646 + pax_force_retaddr
13647 ret;
13648 ENDPROC(camellia_xts_crypt_32way)
13649
13650 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13651 index 310319c..db3d7b5 100644
13652 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13653 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13654 @@ -21,6 +21,7 @@
13655 */
13656
13657 #include <linux/linkage.h>
13658 +#include <asm/alternative-asm.h>
13659
13660 .file "camellia-x86_64-asm_64.S"
13661 .text
13662 @@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13663 enc_outunpack(mov, RT1);
13664
13665 movq RRBP, %rbp;
13666 + pax_force_retaddr
13667 ret;
13668
13669 .L__enc_xor:
13670 enc_outunpack(xor, RT1);
13671
13672 movq RRBP, %rbp;
13673 + pax_force_retaddr
13674 ret;
13675 ENDPROC(__camellia_enc_blk)
13676
13677 @@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13678 dec_outunpack();
13679
13680 movq RRBP, %rbp;
13681 + pax_force_retaddr
13682 ret;
13683 ENDPROC(camellia_dec_blk)
13684
13685 @@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13686
13687 movq RRBP, %rbp;
13688 popq %rbx;
13689 + pax_force_retaddr
13690 ret;
13691
13692 .L__enc2_xor:
13693 @@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13694
13695 movq RRBP, %rbp;
13696 popq %rbx;
13697 + pax_force_retaddr
13698 ret;
13699 ENDPROC(__camellia_enc_blk_2way)
13700
13701 @@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13702
13703 movq RRBP, %rbp;
13704 movq RXOR, %rbx;
13705 + pax_force_retaddr
13706 ret;
13707 ENDPROC(camellia_dec_blk_2way)
13708 diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13709 index c35fd5d..2d8c7db 100644
13710 --- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13711 +++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13712 @@ -24,6 +24,7 @@
13713 */
13714
13715 #include <linux/linkage.h>
13716 +#include <asm/alternative-asm.h>
13717
13718 .file "cast5-avx-x86_64-asm_64.S"
13719
13720 @@ -281,6 +282,7 @@ __cast5_enc_blk16:
13721 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13722 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13723
13724 + pax_force_retaddr
13725 ret;
13726 ENDPROC(__cast5_enc_blk16)
13727
13728 @@ -352,6 +354,7 @@ __cast5_dec_blk16:
13729 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13730 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13731
13732 + pax_force_retaddr
13733 ret;
13734
13735 .L__skip_dec:
13736 @@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13737 vmovdqu RR4, (6*4*4)(%r11);
13738 vmovdqu RL4, (7*4*4)(%r11);
13739
13740 + pax_force_retaddr
13741 ret;
13742 ENDPROC(cast5_ecb_enc_16way)
13743
13744 @@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13745 vmovdqu RR4, (6*4*4)(%r11);
13746 vmovdqu RL4, (7*4*4)(%r11);
13747
13748 + pax_force_retaddr
13749 ret;
13750 ENDPROC(cast5_ecb_dec_16way)
13751
13752 @@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13753 * %rdx: src
13754 */
13755
13756 - pushq %r12;
13757 + pushq %r14;
13758
13759 movq %rsi, %r11;
13760 - movq %rdx, %r12;
13761 + movq %rdx, %r14;
13762
13763 vmovdqu (0*16)(%rdx), RL1;
13764 vmovdqu (1*16)(%rdx), RR1;
13765 @@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13766 call __cast5_dec_blk16;
13767
13768 /* xor with src */
13769 - vmovq (%r12), RX;
13770 + vmovq (%r14), RX;
13771 vpshufd $0x4f, RX, RX;
13772 vpxor RX, RR1, RR1;
13773 - vpxor 0*16+8(%r12), RL1, RL1;
13774 - vpxor 1*16+8(%r12), RR2, RR2;
13775 - vpxor 2*16+8(%r12), RL2, RL2;
13776 - vpxor 3*16+8(%r12), RR3, RR3;
13777 - vpxor 4*16+8(%r12), RL3, RL3;
13778 - vpxor 5*16+8(%r12), RR4, RR4;
13779 - vpxor 6*16+8(%r12), RL4, RL4;
13780 + vpxor 0*16+8(%r14), RL1, RL1;
13781 + vpxor 1*16+8(%r14), RR2, RR2;
13782 + vpxor 2*16+8(%r14), RL2, RL2;
13783 + vpxor 3*16+8(%r14), RR3, RR3;
13784 + vpxor 4*16+8(%r14), RL3, RL3;
13785 + vpxor 5*16+8(%r14), RR4, RR4;
13786 + vpxor 6*16+8(%r14), RL4, RL4;
13787
13788 vmovdqu RR1, (0*16)(%r11);
13789 vmovdqu RL1, (1*16)(%r11);
13790 @@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13791 vmovdqu RR4, (6*16)(%r11);
13792 vmovdqu RL4, (7*16)(%r11);
13793
13794 - popq %r12;
13795 + popq %r14;
13796
13797 + pax_force_retaddr
13798 ret;
13799 ENDPROC(cast5_cbc_dec_16way)
13800
13801 @@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13802 * %rcx: iv (big endian, 64bit)
13803 */
13804
13805 - pushq %r12;
13806 + pushq %r14;
13807
13808 movq %rsi, %r11;
13809 - movq %rdx, %r12;
13810 + movq %rdx, %r14;
13811
13812 vpcmpeqd RTMP, RTMP, RTMP;
13813 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13814 @@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13815 call __cast5_enc_blk16;
13816
13817 /* dst = src ^ iv */
13818 - vpxor (0*16)(%r12), RR1, RR1;
13819 - vpxor (1*16)(%r12), RL1, RL1;
13820 - vpxor (2*16)(%r12), RR2, RR2;
13821 - vpxor (3*16)(%r12), RL2, RL2;
13822 - vpxor (4*16)(%r12), RR3, RR3;
13823 - vpxor (5*16)(%r12), RL3, RL3;
13824 - vpxor (6*16)(%r12), RR4, RR4;
13825 - vpxor (7*16)(%r12), RL4, RL4;
13826 + vpxor (0*16)(%r14), RR1, RR1;
13827 + vpxor (1*16)(%r14), RL1, RL1;
13828 + vpxor (2*16)(%r14), RR2, RR2;
13829 + vpxor (3*16)(%r14), RL2, RL2;
13830 + vpxor (4*16)(%r14), RR3, RR3;
13831 + vpxor (5*16)(%r14), RL3, RL3;
13832 + vpxor (6*16)(%r14), RR4, RR4;
13833 + vpxor (7*16)(%r14), RL4, RL4;
13834 vmovdqu RR1, (0*16)(%r11);
13835 vmovdqu RL1, (1*16)(%r11);
13836 vmovdqu RR2, (2*16)(%r11);
13837 @@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13838 vmovdqu RR4, (6*16)(%r11);
13839 vmovdqu RL4, (7*16)(%r11);
13840
13841 - popq %r12;
13842 + popq %r14;
13843
13844 + pax_force_retaddr
13845 ret;
13846 ENDPROC(cast5_ctr_16way)
13847 diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13848 index e3531f8..e123f35 100644
13849 --- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13850 +++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13851 @@ -24,6 +24,7 @@
13852 */
13853
13854 #include <linux/linkage.h>
13855 +#include <asm/alternative-asm.h>
13856 #include "glue_helper-asm-avx.S"
13857
13858 .file "cast6-avx-x86_64-asm_64.S"
13859 @@ -295,6 +296,7 @@ __cast6_enc_blk8:
13860 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13861 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13862
13863 + pax_force_retaddr
13864 ret;
13865 ENDPROC(__cast6_enc_blk8)
13866
13867 @@ -340,6 +342,7 @@ __cast6_dec_blk8:
13868 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13869 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13870
13871 + pax_force_retaddr
13872 ret;
13873 ENDPROC(__cast6_dec_blk8)
13874
13875 @@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13876
13877 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13878
13879 + pax_force_retaddr
13880 ret;
13881 ENDPROC(cast6_ecb_enc_8way)
13882
13883 @@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13884
13885 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13886
13887 + pax_force_retaddr
13888 ret;
13889 ENDPROC(cast6_ecb_dec_8way)
13890
13891 @@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13892 * %rdx: src
13893 */
13894
13895 - pushq %r12;
13896 + pushq %r14;
13897
13898 movq %rsi, %r11;
13899 - movq %rdx, %r12;
13900 + movq %rdx, %r14;
13901
13902 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13903
13904 call __cast6_dec_blk8;
13905
13906 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13907 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13908
13909 - popq %r12;
13910 + popq %r14;
13911
13912 + pax_force_retaddr
13913 ret;
13914 ENDPROC(cast6_cbc_dec_8way)
13915
13916 @@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13917 * %rcx: iv (little endian, 128bit)
13918 */
13919
13920 - pushq %r12;
13921 + pushq %r14;
13922
13923 movq %rsi, %r11;
13924 - movq %rdx, %r12;
13925 + movq %rdx, %r14;
13926
13927 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13928 RD2, RX, RKR, RKM);
13929
13930 call __cast6_enc_blk8;
13931
13932 - store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13933 + store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13934
13935 - popq %r12;
13936 + popq %r14;
13937
13938 + pax_force_retaddr
13939 ret;
13940 ENDPROC(cast6_ctr_8way)
13941
13942 @@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13943 /* dst <= regs xor IVs(in dst) */
13944 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13945
13946 + pax_force_retaddr
13947 ret;
13948 ENDPROC(cast6_xts_enc_8way)
13949
13950 @@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13951 /* dst <= regs xor IVs(in dst) */
13952 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13953
13954 + pax_force_retaddr
13955 ret;
13956 ENDPROC(cast6_xts_dec_8way)
13957 diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13958 index 26d49eb..c0a8c84 100644
13959 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13960 +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13961 @@ -45,6 +45,7 @@
13962
13963 #include <asm/inst.h>
13964 #include <linux/linkage.h>
13965 +#include <asm/alternative-asm.h>
13966
13967 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13968
13969 @@ -309,6 +310,7 @@ do_return:
13970 popq %rsi
13971 popq %rdi
13972 popq %rbx
13973 + pax_force_retaddr
13974 ret
13975
13976 ################################################################
13977 diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13978 index 5d1e007..098cb4f 100644
13979 --- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13980 +++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13981 @@ -18,6 +18,7 @@
13982
13983 #include <linux/linkage.h>
13984 #include <asm/inst.h>
13985 +#include <asm/alternative-asm.h>
13986
13987 .data
13988
13989 @@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
13990 psrlq $1, T2
13991 pxor T2, T1
13992 pxor T1, DATA
13993 + pax_force_retaddr
13994 ret
13995 ENDPROC(__clmul_gf128mul_ble)
13996
13997 @@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
13998 call __clmul_gf128mul_ble
13999 PSHUFB_XMM BSWAP DATA
14000 movups DATA, (%rdi)
14001 + pax_force_retaddr
14002 ret
14003 ENDPROC(clmul_ghash_mul)
14004
14005 @@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14006 PSHUFB_XMM BSWAP DATA
14007 movups DATA, (%rdi)
14008 .Lupdate_just_ret:
14009 + pax_force_retaddr
14010 ret
14011 ENDPROC(clmul_ghash_update)
14012 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14013 index 9279e0b..c4b3d2c 100644
14014 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14015 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14016 @@ -1,4 +1,5 @@
14017 #include <linux/linkage.h>
14018 +#include <asm/alternative-asm.h>
14019
14020 # enter salsa20_encrypt_bytes
14021 ENTRY(salsa20_encrypt_bytes)
14022 @@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14023 add %r11,%rsp
14024 mov %rdi,%rax
14025 mov %rsi,%rdx
14026 + pax_force_retaddr
14027 ret
14028 # bytesatleast65:
14029 ._bytesatleast65:
14030 @@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14031 add %r11,%rsp
14032 mov %rdi,%rax
14033 mov %rsi,%rdx
14034 + pax_force_retaddr
14035 ret
14036 ENDPROC(salsa20_keysetup)
14037
14038 @@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14039 add %r11,%rsp
14040 mov %rdi,%rax
14041 mov %rsi,%rdx
14042 + pax_force_retaddr
14043 ret
14044 ENDPROC(salsa20_ivsetup)
14045 diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14046 index 2f202f4..d9164d6 100644
14047 --- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14048 +++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14049 @@ -24,6 +24,7 @@
14050 */
14051
14052 #include <linux/linkage.h>
14053 +#include <asm/alternative-asm.h>
14054 #include "glue_helper-asm-avx.S"
14055
14056 .file "serpent-avx-x86_64-asm_64.S"
14057 @@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14058 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14059 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14060
14061 + pax_force_retaddr
14062 ret;
14063 ENDPROC(__serpent_enc_blk8_avx)
14064
14065 @@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14066 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14067 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14068
14069 + pax_force_retaddr
14070 ret;
14071 ENDPROC(__serpent_dec_blk8_avx)
14072
14073 @@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14074
14075 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14076
14077 + pax_force_retaddr
14078 ret;
14079 ENDPROC(serpent_ecb_enc_8way_avx)
14080
14081 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14082
14083 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14084
14085 + pax_force_retaddr
14086 ret;
14087 ENDPROC(serpent_ecb_dec_8way_avx)
14088
14089 @@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14090
14091 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14092
14093 + pax_force_retaddr
14094 ret;
14095 ENDPROC(serpent_cbc_dec_8way_avx)
14096
14097 @@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14098
14099 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14100
14101 + pax_force_retaddr
14102 ret;
14103 ENDPROC(serpent_ctr_8way_avx)
14104
14105 @@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14106 /* dst <= regs xor IVs(in dst) */
14107 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14108
14109 + pax_force_retaddr
14110 ret;
14111 ENDPROC(serpent_xts_enc_8way_avx)
14112
14113 @@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14114 /* dst <= regs xor IVs(in dst) */
14115 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14116
14117 + pax_force_retaddr
14118 ret;
14119 ENDPROC(serpent_xts_dec_8way_avx)
14120 diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14121 index b222085..abd483c 100644
14122 --- a/arch/x86/crypto/serpent-avx2-asm_64.S
14123 +++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14124 @@ -15,6 +15,7 @@
14125 */
14126
14127 #include <linux/linkage.h>
14128 +#include <asm/alternative-asm.h>
14129 #include "glue_helper-asm-avx2.S"
14130
14131 .file "serpent-avx2-asm_64.S"
14132 @@ -610,6 +611,7 @@ __serpent_enc_blk16:
14133 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14134 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14135
14136 + pax_force_retaddr
14137 ret;
14138 ENDPROC(__serpent_enc_blk16)
14139
14140 @@ -664,6 +666,7 @@ __serpent_dec_blk16:
14141 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14142 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14143
14144 + pax_force_retaddr
14145 ret;
14146 ENDPROC(__serpent_dec_blk16)
14147
14148 @@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14149
14150 vzeroupper;
14151
14152 + pax_force_retaddr
14153 ret;
14154 ENDPROC(serpent_ecb_enc_16way)
14155
14156 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14157
14158 vzeroupper;
14159
14160 + pax_force_retaddr
14161 ret;
14162 ENDPROC(serpent_ecb_dec_16way)
14163
14164 @@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14165
14166 vzeroupper;
14167
14168 + pax_force_retaddr
14169 ret;
14170 ENDPROC(serpent_cbc_dec_16way)
14171
14172 @@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14173
14174 vzeroupper;
14175
14176 + pax_force_retaddr
14177 ret;
14178 ENDPROC(serpent_ctr_16way)
14179
14180 @@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14181
14182 vzeroupper;
14183
14184 + pax_force_retaddr
14185 ret;
14186 ENDPROC(serpent_xts_enc_16way)
14187
14188 @@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14189
14190 vzeroupper;
14191
14192 + pax_force_retaddr
14193 ret;
14194 ENDPROC(serpent_xts_dec_16way)
14195 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14196 index acc066c..1559cc4 100644
14197 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14198 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14199 @@ -25,6 +25,7 @@
14200 */
14201
14202 #include <linux/linkage.h>
14203 +#include <asm/alternative-asm.h>
14204
14205 .file "serpent-sse2-x86_64-asm_64.S"
14206 .text
14207 @@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14208 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14209 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14210
14211 + pax_force_retaddr
14212 ret;
14213
14214 .L__enc_xor8:
14215 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14216 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14217
14218 + pax_force_retaddr
14219 ret;
14220 ENDPROC(__serpent_enc_blk_8way)
14221
14222 @@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14223 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14224 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14225
14226 + pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_dec_blk_8way)
14229 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14230 index a410950..9dfe7ad 100644
14231 --- a/arch/x86/crypto/sha1_ssse3_asm.S
14232 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
14233 @@ -29,6 +29,7 @@
14234 */
14235
14236 #include <linux/linkage.h>
14237 +#include <asm/alternative-asm.h>
14238
14239 #define CTX %rdi // arg1
14240 #define BUF %rsi // arg2
14241 @@ -75,9 +76,9 @@
14242
14243 push %rbx
14244 push %rbp
14245 - push %r12
14246 + push %r14
14247
14248 - mov %rsp, %r12
14249 + mov %rsp, %r14
14250 sub $64, %rsp # allocate workspace
14251 and $~15, %rsp # align stack
14252
14253 @@ -99,11 +100,12 @@
14254 xor %rax, %rax
14255 rep stosq
14256
14257 - mov %r12, %rsp # deallocate workspace
14258 + mov %r14, %rsp # deallocate workspace
14259
14260 - pop %r12
14261 + pop %r14
14262 pop %rbp
14263 pop %rbx
14264 + pax_force_retaddr
14265 ret
14266
14267 ENDPROC(\name)
14268 diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14269 index 642f156..51a513c 100644
14270 --- a/arch/x86/crypto/sha256-avx-asm.S
14271 +++ b/arch/x86/crypto/sha256-avx-asm.S
14272 @@ -49,6 +49,7 @@
14273
14274 #ifdef CONFIG_AS_AVX
14275 #include <linux/linkage.h>
14276 +#include <asm/alternative-asm.h>
14277
14278 ## assume buffers not aligned
14279 #define VMOVDQ vmovdqu
14280 @@ -460,6 +461,7 @@ done_hash:
14281 popq %r13
14282 popq %rbp
14283 popq %rbx
14284 + pax_force_retaddr
14285 ret
14286 ENDPROC(sha256_transform_avx)
14287
14288 diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14289 index 9e86944..3795e6a 100644
14290 --- a/arch/x86/crypto/sha256-avx2-asm.S
14291 +++ b/arch/x86/crypto/sha256-avx2-asm.S
14292 @@ -50,6 +50,7 @@
14293
14294 #ifdef CONFIG_AS_AVX2
14295 #include <linux/linkage.h>
14296 +#include <asm/alternative-asm.h>
14297
14298 ## assume buffers not aligned
14299 #define VMOVDQ vmovdqu
14300 @@ -720,6 +721,7 @@ done_hash:
14301 popq %r12
14302 popq %rbp
14303 popq %rbx
14304 + pax_force_retaddr
14305 ret
14306 ENDPROC(sha256_transform_rorx)
14307
14308 diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14309 index f833b74..8c62a9e 100644
14310 --- a/arch/x86/crypto/sha256-ssse3-asm.S
14311 +++ b/arch/x86/crypto/sha256-ssse3-asm.S
14312 @@ -47,6 +47,7 @@
14313 ########################################################################
14314
14315 #include <linux/linkage.h>
14316 +#include <asm/alternative-asm.h>
14317
14318 ## assume buffers not aligned
14319 #define MOVDQ movdqu
14320 @@ -471,6 +472,7 @@ done_hash:
14321 popq %rbp
14322 popq %rbx
14323
14324 + pax_force_retaddr
14325 ret
14326 ENDPROC(sha256_transform_ssse3)
14327
14328 diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14329 index 974dde9..a823ff9 100644
14330 --- a/arch/x86/crypto/sha512-avx-asm.S
14331 +++ b/arch/x86/crypto/sha512-avx-asm.S
14332 @@ -49,6 +49,7 @@
14333
14334 #ifdef CONFIG_AS_AVX
14335 #include <linux/linkage.h>
14336 +#include <asm/alternative-asm.h>
14337
14338 .text
14339
14340 @@ -364,6 +365,7 @@ updateblock:
14341 mov frame_RSPSAVE(%rsp), %rsp
14342
14343 nowork:
14344 + pax_force_retaddr
14345 ret
14346 ENDPROC(sha512_transform_avx)
14347
14348 diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14349 index 568b961..ed20c37 100644
14350 --- a/arch/x86/crypto/sha512-avx2-asm.S
14351 +++ b/arch/x86/crypto/sha512-avx2-asm.S
14352 @@ -51,6 +51,7 @@
14353
14354 #ifdef CONFIG_AS_AVX2
14355 #include <linux/linkage.h>
14356 +#include <asm/alternative-asm.h>
14357
14358 .text
14359
14360 @@ -678,6 +679,7 @@ done_hash:
14361
14362 # Restore Stack Pointer
14363 mov frame_RSPSAVE(%rsp), %rsp
14364 + pax_force_retaddr
14365 ret
14366 ENDPROC(sha512_transform_rorx)
14367
14368 diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14369 index fb56855..6edd768 100644
14370 --- a/arch/x86/crypto/sha512-ssse3-asm.S
14371 +++ b/arch/x86/crypto/sha512-ssse3-asm.S
14372 @@ -48,6 +48,7 @@
14373 ########################################################################
14374
14375 #include <linux/linkage.h>
14376 +#include <asm/alternative-asm.h>
14377
14378 .text
14379
14380 @@ -363,6 +364,7 @@ updateblock:
14381 mov frame_RSPSAVE(%rsp), %rsp
14382
14383 nowork:
14384 + pax_force_retaddr
14385 ret
14386 ENDPROC(sha512_transform_ssse3)
14387
14388 diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14389 index 0505813..b067311 100644
14390 --- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14391 +++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14392 @@ -24,6 +24,7 @@
14393 */
14394
14395 #include <linux/linkage.h>
14396 +#include <asm/alternative-asm.h>
14397 #include "glue_helper-asm-avx.S"
14398
14399 .file "twofish-avx-x86_64-asm_64.S"
14400 @@ -284,6 +285,7 @@ __twofish_enc_blk8:
14401 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14402 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14403
14404 + pax_force_retaddr
14405 ret;
14406 ENDPROC(__twofish_enc_blk8)
14407
14408 @@ -324,6 +326,7 @@ __twofish_dec_blk8:
14409 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14410 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14411
14412 + pax_force_retaddr
14413 ret;
14414 ENDPROC(__twofish_dec_blk8)
14415
14416 @@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14417
14418 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14419
14420 + pax_force_retaddr
14421 ret;
14422 ENDPROC(twofish_ecb_enc_8way)
14423
14424 @@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14425
14426 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14427
14428 + pax_force_retaddr
14429 ret;
14430 ENDPROC(twofish_ecb_dec_8way)
14431
14432 @@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14433 * %rdx: src
14434 */
14435
14436 - pushq %r12;
14437 + pushq %r14;
14438
14439 movq %rsi, %r11;
14440 - movq %rdx, %r12;
14441 + movq %rdx, %r14;
14442
14443 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14444
14445 call __twofish_dec_blk8;
14446
14447 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14448 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14449
14450 - popq %r12;
14451 + popq %r14;
14452
14453 + pax_force_retaddr
14454 ret;
14455 ENDPROC(twofish_cbc_dec_8way)
14456
14457 @@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14458 * %rcx: iv (little endian, 128bit)
14459 */
14460
14461 - pushq %r12;
14462 + pushq %r14;
14463
14464 movq %rsi, %r11;
14465 - movq %rdx, %r12;
14466 + movq %rdx, %r14;
14467
14468 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14469 RD2, RX0, RX1, RY0);
14470
14471 call __twofish_enc_blk8;
14472
14473 - store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14474 + store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14475
14476 - popq %r12;
14477 + popq %r14;
14478
14479 + pax_force_retaddr
14480 ret;
14481 ENDPROC(twofish_ctr_8way)
14482
14483 @@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14484 /* dst <= regs xor IVs(in dst) */
14485 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14486
14487 + pax_force_retaddr
14488 ret;
14489 ENDPROC(twofish_xts_enc_8way)
14490
14491 @@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14492 /* dst <= regs xor IVs(in dst) */
14493 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14494
14495 + pax_force_retaddr
14496 ret;
14497 ENDPROC(twofish_xts_dec_8way)
14498 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14499 index 1c3b7ce..02f578d 100644
14500 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14501 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14502 @@ -21,6 +21,7 @@
14503 */
14504
14505 #include <linux/linkage.h>
14506 +#include <asm/alternative-asm.h>
14507
14508 .file "twofish-x86_64-asm-3way.S"
14509 .text
14510 @@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14511 popq %r13;
14512 popq %r14;
14513 popq %r15;
14514 + pax_force_retaddr
14515 ret;
14516
14517 .L__enc_xor3:
14518 @@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14519 popq %r13;
14520 popq %r14;
14521 popq %r15;
14522 + pax_force_retaddr
14523 ret;
14524 ENDPROC(__twofish_enc_blk_3way)
14525
14526 @@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14527 popq %r13;
14528 popq %r14;
14529 popq %r15;
14530 + pax_force_retaddr
14531 ret;
14532 ENDPROC(twofish_dec_blk_3way)
14533 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14534 index a039d21..524b8b2 100644
14535 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14536 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14537 @@ -22,6 +22,7 @@
14538
14539 #include <linux/linkage.h>
14540 #include <asm/asm-offsets.h>
14541 +#include <asm/alternative-asm.h>
14542
14543 #define a_offset 0
14544 #define b_offset 4
14545 @@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14546
14547 popq R1
14548 movq $1,%rax
14549 + pax_force_retaddr
14550 ret
14551 ENDPROC(twofish_enc_blk)
14552
14553 @@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14554
14555 popq R1
14556 movq $1,%rax
14557 + pax_force_retaddr
14558 ret
14559 ENDPROC(twofish_dec_blk)
14560 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14561 index df91466..74b31cb 100644
14562 --- a/arch/x86/ia32/ia32_aout.c
14563 +++ b/arch/x86/ia32/ia32_aout.c
14564 @@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14565 unsigned long dump_start, dump_size;
14566 struct user32 dump;
14567
14568 + memset(&dump, 0, sizeof(dump));
14569 +
14570 fs = get_fs();
14571 set_fs(KERNEL_DS);
14572 has_dumped = 1;
14573 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14574 index f9e181a..300544c 100644
14575 --- a/arch/x86/ia32/ia32_signal.c
14576 +++ b/arch/x86/ia32/ia32_signal.c
14577 @@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14578 if (__get_user(set.sig[0], &frame->sc.oldmask)
14579 || (_COMPAT_NSIG_WORDS > 1
14580 && __copy_from_user((((char *) &set.sig) + 4),
14581 - &frame->extramask,
14582 + frame->extramask,
14583 sizeof(frame->extramask))))
14584 goto badframe;
14585
14586 @@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14587 sp -= frame_size;
14588 /* Align the stack pointer according to the i386 ABI,
14589 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14590 - sp = ((sp + 4) & -16ul) - 4;
14591 + sp = ((sp - 12) & -16ul) - 4;
14592 return (void __user *) sp;
14593 }
14594
14595 @@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14596 } else {
14597 /* Return stub is in 32bit vsyscall page */
14598 if (current->mm->context.vdso)
14599 - restorer = current->mm->context.vdso +
14600 - selected_vdso32->sym___kernel_sigreturn;
14601 + restorer = (void __force_user *)(current->mm->context.vdso +
14602 + selected_vdso32->sym___kernel_sigreturn);
14603 else
14604 - restorer = &frame->retcode;
14605 + restorer = frame->retcode;
14606 }
14607
14608 put_user_try {
14609 @@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14610 * These are actually not used anymore, but left because some
14611 * gdb versions depend on them as a marker.
14612 */
14613 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14614 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14615 } put_user_catch(err);
14616
14617 if (err)
14618 @@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14619 0xb8,
14620 __NR_ia32_rt_sigreturn,
14621 0x80cd,
14622 - 0,
14623 + 0
14624 };
14625
14626 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14627 @@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14628
14629 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14630 restorer = ksig->ka.sa.sa_restorer;
14631 + else if (current->mm->context.vdso)
14632 + /* Return stub is in 32bit vsyscall page */
14633 + restorer = (void __force_user *)(current->mm->context.vdso +
14634 + selected_vdso32->sym___kernel_rt_sigreturn);
14635 else
14636 - restorer = current->mm->context.vdso +
14637 - selected_vdso32->sym___kernel_rt_sigreturn;
14638 + restorer = frame->retcode;
14639 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14640
14641 /*
14642 * Not actually used anymore, but left because some gdb
14643 * versions need it.
14644 */
14645 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14646 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14647 } put_user_catch(err);
14648
14649 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14650 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14651 index ffe7122..899bad3 100644
14652 --- a/arch/x86/ia32/ia32entry.S
14653 +++ b/arch/x86/ia32/ia32entry.S
14654 @@ -15,8 +15,10 @@
14655 #include <asm/irqflags.h>
14656 #include <asm/asm.h>
14657 #include <asm/smap.h>
14658 +#include <asm/pgtable.h>
14659 #include <linux/linkage.h>
14660 #include <linux/err.h>
14661 +#include <asm/alternative-asm.h>
14662
14663 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14664 #include <linux/elf-em.h>
14665 @@ -62,12 +64,12 @@
14666 */
14667 .macro LOAD_ARGS32 offset, _r9=0
14668 .if \_r9
14669 - movl \offset+16(%rsp),%r9d
14670 + movl \offset+R9(%rsp),%r9d
14671 .endif
14672 - movl \offset+40(%rsp),%ecx
14673 - movl \offset+48(%rsp),%edx
14674 - movl \offset+56(%rsp),%esi
14675 - movl \offset+64(%rsp),%edi
14676 + movl \offset+RCX(%rsp),%ecx
14677 + movl \offset+RDX(%rsp),%edx
14678 + movl \offset+RSI(%rsp),%esi
14679 + movl \offset+RDI(%rsp),%edi
14680 movl %eax,%eax /* zero extension */
14681 .endm
14682
14683 @@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14684 ENDPROC(native_irq_enable_sysexit)
14685 #endif
14686
14687 + .macro pax_enter_kernel_user
14688 + pax_set_fptr_mask
14689 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14690 + call pax_enter_kernel_user
14691 +#endif
14692 + .endm
14693 +
14694 + .macro pax_exit_kernel_user
14695 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14696 + call pax_exit_kernel_user
14697 +#endif
14698 +#ifdef CONFIG_PAX_RANDKSTACK
14699 + pushq %rax
14700 + pushq %r11
14701 + call pax_randomize_kstack
14702 + popq %r11
14703 + popq %rax
14704 +#endif
14705 + .endm
14706 +
14707 + .macro pax_erase_kstack
14708 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14709 + call pax_erase_kstack
14710 +#endif
14711 + .endm
14712 +
14713 /*
14714 * 32bit SYSENTER instruction entry.
14715 *
14716 @@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14717 CFI_REGISTER rsp,rbp
14718 SWAPGS_UNSAFE_STACK
14719 movq PER_CPU_VAR(kernel_stack), %rsp
14720 - addq $(KERNEL_STACK_OFFSET),%rsp
14721 - /*
14722 - * No need to follow this irqs on/off section: the syscall
14723 - * disabled irqs, here we enable it straight after entry:
14724 - */
14725 - ENABLE_INTERRUPTS(CLBR_NONE)
14726 movl %ebp,%ebp /* zero extension */
14727 pushq_cfi $__USER32_DS
14728 /*CFI_REL_OFFSET ss,0*/
14729 @@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14730 CFI_REL_OFFSET rsp,0
14731 pushfq_cfi
14732 /*CFI_REL_OFFSET rflags,0*/
14733 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14734 - CFI_REGISTER rip,r10
14735 + orl $X86_EFLAGS_IF,(%rsp)
14736 + GET_THREAD_INFO(%r11)
14737 + movl TI_sysenter_return(%r11), %r11d
14738 + CFI_REGISTER rip,r11
14739 pushq_cfi $__USER32_CS
14740 /*CFI_REL_OFFSET cs,0*/
14741 movl %eax, %eax
14742 - pushq_cfi %r10
14743 + pushq_cfi %r11
14744 CFI_REL_OFFSET rip,0
14745 pushq_cfi %rax
14746 cld
14747 SAVE_ARGS 0,1,0
14748 + pax_enter_kernel_user
14749 +
14750 +#ifdef CONFIG_PAX_RANDKSTACK
14751 + pax_erase_kstack
14752 +#endif
14753 +
14754 + /*
14755 + * No need to follow this irqs on/off section: the syscall
14756 + * disabled irqs, here we enable it straight after entry:
14757 + */
14758 + ENABLE_INTERRUPTS(CLBR_NONE)
14759 /* no need to do an access_ok check here because rbp has been
14760 32bit zero extended */
14761 +
14762 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14763 + addq pax_user_shadow_base,%rbp
14764 + ASM_PAX_OPEN_USERLAND
14765 +#endif
14766 +
14767 ASM_STAC
14768 1: movl (%rbp),%ebp
14769 _ASM_EXTABLE(1b,ia32_badarg)
14770 ASM_CLAC
14771
14772 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14773 + ASM_PAX_CLOSE_USERLAND
14774 +#endif
14775 +
14776 /*
14777 * Sysenter doesn't filter flags, so we need to clear NT
14778 * ourselves. To save a few cycles, we can check whether
14779 @@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14780 jnz sysenter_fix_flags
14781 sysenter_flags_fixed:
14782
14783 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14784 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14785 + GET_THREAD_INFO(%r11)
14786 + orl $TS_COMPAT,TI_status(%r11)
14787 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14788 CFI_REMEMBER_STATE
14789 jnz sysenter_tracesys
14790 cmpq $(IA32_NR_syscalls-1),%rax
14791 @@ -172,15 +218,18 @@ sysenter_do_call:
14792 sysenter_dispatch:
14793 call *ia32_sys_call_table(,%rax,8)
14794 movq %rax,RAX-ARGOFFSET(%rsp)
14795 + GET_THREAD_INFO(%r11)
14796 DISABLE_INTERRUPTS(CLBR_NONE)
14797 TRACE_IRQS_OFF
14798 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14799 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14800 jnz sysexit_audit
14801 sysexit_from_sys_call:
14802 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14803 + pax_exit_kernel_user
14804 + pax_erase_kstack
14805 + andl $~TS_COMPAT,TI_status(%r11)
14806 /* clear IF, that popfq doesn't enable interrupts early */
14807 - andl $~0x200,EFLAGS-R11(%rsp)
14808 - movl RIP-R11(%rsp),%edx /* User %eip */
14809 + andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14810 + movl RIP(%rsp),%edx /* User %eip */
14811 CFI_REGISTER rip,rdx
14812 RESTORE_ARGS 0,24,0,0,0,0
14813 xorq %r8,%r8
14814 @@ -205,6 +254,9 @@ sysexit_from_sys_call:
14815 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14816 movl %eax,%edi /* 1st arg: syscall number */
14817 call __audit_syscall_entry
14818 +
14819 + pax_erase_kstack
14820 +
14821 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14822 cmpq $(IA32_NR_syscalls-1),%rax
14823 ja ia32_badsys
14824 @@ -216,7 +268,7 @@ sysexit_from_sys_call:
14825 .endm
14826
14827 .macro auditsys_exit exit
14828 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14829 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14830 jnz ia32_ret_from_sys_call
14831 TRACE_IRQS_ON
14832 ENABLE_INTERRUPTS(CLBR_NONE)
14833 @@ -227,11 +279,12 @@ sysexit_from_sys_call:
14834 1: setbe %al /* 1 if error, 0 if not */
14835 movzbl %al,%edi /* zero-extend that into %edi */
14836 call __audit_syscall_exit
14837 + GET_THREAD_INFO(%r11)
14838 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14839 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14840 DISABLE_INTERRUPTS(CLBR_NONE)
14841 TRACE_IRQS_OFF
14842 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14843 + testl %edi,TI_flags(%r11)
14844 jz \exit
14845 CLEAR_RREGS -ARGOFFSET
14846 jmp int_with_check
14847 @@ -253,7 +306,7 @@ sysenter_fix_flags:
14848
14849 sysenter_tracesys:
14850 #ifdef CONFIG_AUDITSYSCALL
14851 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14852 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14853 jz sysenter_auditsys
14854 #endif
14855 SAVE_REST
14856 @@ -265,6 +318,9 @@ sysenter_tracesys:
14857 RESTORE_REST
14858 cmpq $(IA32_NR_syscalls-1),%rax
14859 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14860 +
14861 + pax_erase_kstack
14862 +
14863 jmp sysenter_do_call
14864 CFI_ENDPROC
14865 ENDPROC(ia32_sysenter_target)
14866 @@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14867 ENTRY(ia32_cstar_target)
14868 CFI_STARTPROC32 simple
14869 CFI_SIGNAL_FRAME
14870 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14871 + CFI_DEF_CFA rsp,0
14872 CFI_REGISTER rip,rcx
14873 /*CFI_REGISTER rflags,r11*/
14874 SWAPGS_UNSAFE_STACK
14875 movl %esp,%r8d
14876 CFI_REGISTER rsp,r8
14877 movq PER_CPU_VAR(kernel_stack),%rsp
14878 + SAVE_ARGS 8*6,0,0
14879 + pax_enter_kernel_user
14880 +
14881 +#ifdef CONFIG_PAX_RANDKSTACK
14882 + pax_erase_kstack
14883 +#endif
14884 +
14885 /*
14886 * No need to follow this irqs on/off section: the syscall
14887 * disabled irqs and here we enable it straight after entry:
14888 */
14889 ENABLE_INTERRUPTS(CLBR_NONE)
14890 - SAVE_ARGS 8,0,0
14891 movl %eax,%eax /* zero extension */
14892 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14893 movq %rcx,RIP-ARGOFFSET(%rsp)
14894 @@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14895 /* no need to do an access_ok check here because r8 has been
14896 32bit zero extended */
14897 /* hardware stack frame is complete now */
14898 +
14899 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14900 + ASM_PAX_OPEN_USERLAND
14901 + movq pax_user_shadow_base,%r8
14902 + addq RSP-ARGOFFSET(%rsp),%r8
14903 +#endif
14904 +
14905 ASM_STAC
14906 1: movl (%r8),%r9d
14907 _ASM_EXTABLE(1b,ia32_badarg)
14908 ASM_CLAC
14909 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14910 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14911 +
14912 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14913 + ASM_PAX_CLOSE_USERLAND
14914 +#endif
14915 +
14916 + GET_THREAD_INFO(%r11)
14917 + orl $TS_COMPAT,TI_status(%r11)
14918 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14919 CFI_REMEMBER_STATE
14920 jnz cstar_tracesys
14921 cmpq $IA32_NR_syscalls-1,%rax
14922 @@ -335,13 +410,16 @@ cstar_do_call:
14923 cstar_dispatch:
14924 call *ia32_sys_call_table(,%rax,8)
14925 movq %rax,RAX-ARGOFFSET(%rsp)
14926 + GET_THREAD_INFO(%r11)
14927 DISABLE_INTERRUPTS(CLBR_NONE)
14928 TRACE_IRQS_OFF
14929 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14930 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14931 jnz sysretl_audit
14932 sysretl_from_sys_call:
14933 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14934 - RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14935 + pax_exit_kernel_user
14936 + pax_erase_kstack
14937 + andl $~TS_COMPAT,TI_status(%r11)
14938 + RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14939 movl RIP-ARGOFFSET(%rsp),%ecx
14940 CFI_REGISTER rip,rcx
14941 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14942 @@ -368,7 +446,7 @@ sysretl_audit:
14943
14944 cstar_tracesys:
14945 #ifdef CONFIG_AUDITSYSCALL
14946 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14947 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14948 jz cstar_auditsys
14949 #endif
14950 xchgl %r9d,%ebp
14951 @@ -382,11 +460,19 @@ cstar_tracesys:
14952 xchgl %ebp,%r9d
14953 cmpq $(IA32_NR_syscalls-1),%rax
14954 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14955 +
14956 + pax_erase_kstack
14957 +
14958 jmp cstar_do_call
14959 END(ia32_cstar_target)
14960
14961 ia32_badarg:
14962 ASM_CLAC
14963 +
14964 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14965 + ASM_PAX_CLOSE_USERLAND
14966 +#endif
14967 +
14968 movq $-EFAULT,%rax
14969 jmp ia32_sysret
14970 CFI_ENDPROC
14971 @@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
14972 CFI_REL_OFFSET rip,RIP-RIP
14973 PARAVIRT_ADJUST_EXCEPTION_FRAME
14974 SWAPGS
14975 - /*
14976 - * No need to follow this irqs on/off section: the syscall
14977 - * disabled irqs and here we enable it straight after entry:
14978 - */
14979 - ENABLE_INTERRUPTS(CLBR_NONE)
14980 movl %eax,%eax
14981 pushq_cfi %rax
14982 cld
14983 /* note the registers are not zero extended to the sf.
14984 this could be a problem. */
14985 SAVE_ARGS 0,1,0
14986 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14987 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14988 + pax_enter_kernel_user
14989 +
14990 +#ifdef CONFIG_PAX_RANDKSTACK
14991 + pax_erase_kstack
14992 +#endif
14993 +
14994 + /*
14995 + * No need to follow this irqs on/off section: the syscall
14996 + * disabled irqs and here we enable it straight after entry:
14997 + */
14998 + ENABLE_INTERRUPTS(CLBR_NONE)
14999 + GET_THREAD_INFO(%r11)
15000 + orl $TS_COMPAT,TI_status(%r11)
15001 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15002 jnz ia32_tracesys
15003 cmpq $(IA32_NR_syscalls-1),%rax
15004 ja ia32_badsys
15005 @@ -458,6 +551,9 @@ ia32_tracesys:
15006 RESTORE_REST
15007 cmpq $(IA32_NR_syscalls-1),%rax
15008 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15009 +
15010 + pax_erase_kstack
15011 +
15012 jmp ia32_do_call
15013 END(ia32_syscall)
15014
15015 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15016 index 8e0ceec..af13504 100644
15017 --- a/arch/x86/ia32/sys_ia32.c
15018 +++ b/arch/x86/ia32/sys_ia32.c
15019 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15020 */
15021 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15022 {
15023 - typeof(ubuf->st_uid) uid = 0;
15024 - typeof(ubuf->st_gid) gid = 0;
15025 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
15026 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
15027 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15028 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15029 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15030 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15031 index 372231c..51b537d 100644
15032 --- a/arch/x86/include/asm/alternative-asm.h
15033 +++ b/arch/x86/include/asm/alternative-asm.h
15034 @@ -18,6 +18,45 @@
15035 .endm
15036 #endif
15037
15038 +#ifdef KERNEXEC_PLUGIN
15039 + .macro pax_force_retaddr_bts rip=0
15040 + btsq $63,\rip(%rsp)
15041 + .endm
15042 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15043 + .macro pax_force_retaddr rip=0, reload=0
15044 + btsq $63,\rip(%rsp)
15045 + .endm
15046 + .macro pax_force_fptr ptr
15047 + btsq $63,\ptr
15048 + .endm
15049 + .macro pax_set_fptr_mask
15050 + .endm
15051 +#endif
15052 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15053 + .macro pax_force_retaddr rip=0, reload=0
15054 + .if \reload
15055 + pax_set_fptr_mask
15056 + .endif
15057 + orq %r12,\rip(%rsp)
15058 + .endm
15059 + .macro pax_force_fptr ptr
15060 + orq %r12,\ptr
15061 + .endm
15062 + .macro pax_set_fptr_mask
15063 + movabs $0x8000000000000000,%r12
15064 + .endm
15065 +#endif
15066 +#else
15067 + .macro pax_force_retaddr rip=0, reload=0
15068 + .endm
15069 + .macro pax_force_fptr ptr
15070 + .endm
15071 + .macro pax_force_retaddr_bts rip=0
15072 + .endm
15073 + .macro pax_set_fptr_mask
15074 + .endm
15075 +#endif
15076 +
15077 .macro altinstruction_entry orig alt feature orig_len alt_len
15078 .long \orig - .
15079 .long \alt - .
15080 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15081 index 473bdbe..b1e3377 100644
15082 --- a/arch/x86/include/asm/alternative.h
15083 +++ b/arch/x86/include/asm/alternative.h
15084 @@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15085 ".pushsection .discard,\"aw\",@progbits\n" \
15086 DISCARD_ENTRY(1) \
15087 ".popsection\n" \
15088 - ".pushsection .altinstr_replacement, \"ax\"\n" \
15089 + ".pushsection .altinstr_replacement, \"a\"\n" \
15090 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15091 ".popsection"
15092
15093 @@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15094 DISCARD_ENTRY(1) \
15095 DISCARD_ENTRY(2) \
15096 ".popsection\n" \
15097 - ".pushsection .altinstr_replacement, \"ax\"\n" \
15098 + ".pushsection .altinstr_replacement, \"a\"\n" \
15099 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15100 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15101 ".popsection"
15102 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15103 index 465b309..ab7e51f 100644
15104 --- a/arch/x86/include/asm/apic.h
15105 +++ b/arch/x86/include/asm/apic.h
15106 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15107
15108 #ifdef CONFIG_X86_LOCAL_APIC
15109
15110 -extern unsigned int apic_verbosity;
15111 +extern int apic_verbosity;
15112 extern int local_apic_timer_c2_ok;
15113
15114 extern int disable_apic;
15115 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15116 index 20370c6..a2eb9b0 100644
15117 --- a/arch/x86/include/asm/apm.h
15118 +++ b/arch/x86/include/asm/apm.h
15119 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15120 __asm__ __volatile__(APM_DO_ZERO_SEGS
15121 "pushl %%edi\n\t"
15122 "pushl %%ebp\n\t"
15123 - "lcall *%%cs:apm_bios_entry\n\t"
15124 + "lcall *%%ss:apm_bios_entry\n\t"
15125 "setc %%al\n\t"
15126 "popl %%ebp\n\t"
15127 "popl %%edi\n\t"
15128 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15129 __asm__ __volatile__(APM_DO_ZERO_SEGS
15130 "pushl %%edi\n\t"
15131 "pushl %%ebp\n\t"
15132 - "lcall *%%cs:apm_bios_entry\n\t"
15133 + "lcall *%%ss:apm_bios_entry\n\t"
15134 "setc %%bl\n\t"
15135 "popl %%ebp\n\t"
15136 "popl %%edi\n\t"
15137 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15138 index 5e5cd12..3d18208 100644
15139 --- a/arch/x86/include/asm/atomic.h
15140 +++ b/arch/x86/include/asm/atomic.h
15141 @@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15142 }
15143
15144 /**
15145 + * atomic_read_unchecked - read atomic variable
15146 + * @v: pointer of type atomic_unchecked_t
15147 + *
15148 + * Atomically reads the value of @v.
15149 + */
15150 +static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15151 +{
15152 + return ACCESS_ONCE((v)->counter);
15153 +}
15154 +
15155 +/**
15156 * atomic_set - set atomic variable
15157 * @v: pointer of type atomic_t
15158 * @i: required value
15159 @@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15160 }
15161
15162 /**
15163 + * atomic_set_unchecked - set atomic variable
15164 + * @v: pointer of type atomic_unchecked_t
15165 + * @i: required value
15166 + *
15167 + * Atomically sets the value of @v to @i.
15168 + */
15169 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15170 +{
15171 + v->counter = i;
15172 +}
15173 +
15174 +/**
15175 * atomic_add - add integer to atomic variable
15176 * @i: integer value to add
15177 * @v: pointer of type atomic_t
15178 @@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15179 */
15180 static inline void atomic_add(int i, atomic_t *v)
15181 {
15182 - asm volatile(LOCK_PREFIX "addl %1,%0"
15183 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
15184 +
15185 +#ifdef CONFIG_PAX_REFCOUNT
15186 + "jno 0f\n"
15187 + LOCK_PREFIX "subl %1,%0\n"
15188 + "int $4\n0:\n"
15189 + _ASM_EXTABLE(0b, 0b)
15190 +#endif
15191 +
15192 + : "+m" (v->counter)
15193 + : "ir" (i));
15194 +}
15195 +
15196 +/**
15197 + * atomic_add_unchecked - add integer to atomic variable
15198 + * @i: integer value to add
15199 + * @v: pointer of type atomic_unchecked_t
15200 + *
15201 + * Atomically adds @i to @v.
15202 + */
15203 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15204 +{
15205 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
15206 : "+m" (v->counter)
15207 : "ir" (i));
15208 }
15209 @@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15210 */
15211 static inline void atomic_sub(int i, atomic_t *v)
15212 {
15213 - asm volatile(LOCK_PREFIX "subl %1,%0"
15214 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
15215 +
15216 +#ifdef CONFIG_PAX_REFCOUNT
15217 + "jno 0f\n"
15218 + LOCK_PREFIX "addl %1,%0\n"
15219 + "int $4\n0:\n"
15220 + _ASM_EXTABLE(0b, 0b)
15221 +#endif
15222 +
15223 + : "+m" (v->counter)
15224 + : "ir" (i));
15225 +}
15226 +
15227 +/**
15228 + * atomic_sub_unchecked - subtract integer from atomic variable
15229 + * @i: integer value to subtract
15230 + * @v: pointer of type atomic_unchecked_t
15231 + *
15232 + * Atomically subtracts @i from @v.
15233 + */
15234 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15235 +{
15236 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
15237 : "+m" (v->counter)
15238 : "ir" (i));
15239 }
15240 @@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15241 */
15242 static inline int atomic_sub_and_test(int i, atomic_t *v)
15243 {
15244 - GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15245 + GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15246 }
15247
15248 /**
15249 @@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15250 */
15251 static inline void atomic_inc(atomic_t *v)
15252 {
15253 - asm volatile(LOCK_PREFIX "incl %0"
15254 + asm volatile(LOCK_PREFIX "incl %0\n"
15255 +
15256 +#ifdef CONFIG_PAX_REFCOUNT
15257 + "jno 0f\n"
15258 + LOCK_PREFIX "decl %0\n"
15259 + "int $4\n0:\n"
15260 + _ASM_EXTABLE(0b, 0b)
15261 +#endif
15262 +
15263 + : "+m" (v->counter));
15264 +}
15265 +
15266 +/**
15267 + * atomic_inc_unchecked - increment atomic variable
15268 + * @v: pointer of type atomic_unchecked_t
15269 + *
15270 + * Atomically increments @v by 1.
15271 + */
15272 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15273 +{
15274 + asm volatile(LOCK_PREFIX "incl %0\n"
15275 : "+m" (v->counter));
15276 }
15277
15278 @@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15279 */
15280 static inline void atomic_dec(atomic_t *v)
15281 {
15282 - asm volatile(LOCK_PREFIX "decl %0"
15283 + asm volatile(LOCK_PREFIX "decl %0\n"
15284 +
15285 +#ifdef CONFIG_PAX_REFCOUNT
15286 + "jno 0f\n"
15287 + LOCK_PREFIX "incl %0\n"
15288 + "int $4\n0:\n"
15289 + _ASM_EXTABLE(0b, 0b)
15290 +#endif
15291 +
15292 + : "+m" (v->counter));
15293 +}
15294 +
15295 +/**
15296 + * atomic_dec_unchecked - decrement atomic variable
15297 + * @v: pointer of type atomic_unchecked_t
15298 + *
15299 + * Atomically decrements @v by 1.
15300 + */
15301 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15302 +{
15303 + asm volatile(LOCK_PREFIX "decl %0\n"
15304 : "+m" (v->counter));
15305 }
15306
15307 @@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15308 */
15309 static inline int atomic_dec_and_test(atomic_t *v)
15310 {
15311 - GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15312 + GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15313 }
15314
15315 /**
15316 @@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15317 */
15318 static inline int atomic_inc_and_test(atomic_t *v)
15319 {
15320 - GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15321 + GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15322 +}
15323 +
15324 +/**
15325 + * atomic_inc_and_test_unchecked - increment and test
15326 + * @v: pointer of type atomic_unchecked_t
15327 + *
15328 + * Atomically increments @v by 1
15329 + * and returns true if the result is zero, or false for all
15330 + * other cases.
15331 + */
15332 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15333 +{
15334 + GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15335 }
15336
15337 /**
15338 @@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15339 */
15340 static inline int atomic_add_negative(int i, atomic_t *v)
15341 {
15342 - GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15343 + GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15344 }
15345
15346 /**
15347 @@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15348 *
15349 * Atomically adds @i to @v and returns @i + @v
15350 */
15351 -static inline int atomic_add_return(int i, atomic_t *v)
15352 +static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15353 +{
15354 + return i + xadd_check_overflow(&v->counter, i);
15355 +}
15356 +
15357 +/**
15358 + * atomic_add_return_unchecked - add integer and return
15359 + * @i: integer value to add
15360 + * @v: pointer of type atomic_unchecked_t
15361 + *
15362 + * Atomically adds @i to @v and returns @i + @v
15363 + */
15364 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15365 {
15366 return i + xadd(&v->counter, i);
15367 }
15368 @@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15369 *
15370 * Atomically subtracts @i from @v and returns @v - @i
15371 */
15372 -static inline int atomic_sub_return(int i, atomic_t *v)
15373 +static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15374 {
15375 return atomic_add_return(-i, v);
15376 }
15377
15378 #define atomic_inc_return(v) (atomic_add_return(1, v))
15379 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15380 +{
15381 + return atomic_add_return_unchecked(1, v);
15382 +}
15383 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15384
15385 -static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15386 +static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15387 +{
15388 + return cmpxchg(&v->counter, old, new);
15389 +}
15390 +
15391 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15392 {
15393 return cmpxchg(&v->counter, old, new);
15394 }
15395 @@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15396 return xchg(&v->counter, new);
15397 }
15398
15399 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15400 +{
15401 + return xchg(&v->counter, new);
15402 +}
15403 +
15404 /**
15405 * __atomic_add_unless - add unless the number is already a given value
15406 * @v: pointer of type atomic_t
15407 @@ -191,14 +337,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15408 * Atomically adds @a to @v, so long as @v was not already @u.
15409 * Returns the old value of @v.
15410 */
15411 -static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15412 +static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15413 {
15414 - int c, old;
15415 + int c, old, new;
15416 c = atomic_read(v);
15417 for (;;) {
15418 - if (unlikely(c == (u)))
15419 + if (unlikely(c == u))
15420 break;
15421 - old = atomic_cmpxchg((v), c, c + (a));
15422 +
15423 + asm volatile("addl %2,%0\n"
15424 +
15425 +#ifdef CONFIG_PAX_REFCOUNT
15426 + "jno 0f\n"
15427 + "subl %2,%0\n"
15428 + "int $4\n0:\n"
15429 + _ASM_EXTABLE(0b, 0b)
15430 +#endif
15431 +
15432 + : "=r" (new)
15433 + : "0" (c), "ir" (a));
15434 +
15435 + old = atomic_cmpxchg(v, c, new);
15436 if (likely(old == c))
15437 break;
15438 c = old;
15439 @@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15440 }
15441
15442 /**
15443 + * atomic_inc_not_zero_hint - increment if not null
15444 + * @v: pointer of type atomic_t
15445 + * @hint: probable value of the atomic before the increment
15446 + *
15447 + * This version of atomic_inc_not_zero() gives a hint of probable
15448 + * value of the atomic. This helps processor to not read the memory
15449 + * before doing the atomic read/modify/write cycle, lowering
15450 + * number of bus transactions on some arches.
15451 + *
15452 + * Returns: 0 if increment was not done, 1 otherwise.
15453 + */
15454 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15455 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15456 +{
15457 + int val, c = hint, new;
15458 +
15459 + /* sanity test, should be removed by compiler if hint is a constant */
15460 + if (!hint)
15461 + return __atomic_add_unless(v, 1, 0);
15462 +
15463 + do {
15464 + asm volatile("incl %0\n"
15465 +
15466 +#ifdef CONFIG_PAX_REFCOUNT
15467 + "jno 0f\n"
15468 + "decl %0\n"
15469 + "int $4\n0:\n"
15470 + _ASM_EXTABLE(0b, 0b)
15471 +#endif
15472 +
15473 + : "=r" (new)
15474 + : "0" (c));
15475 +
15476 + val = atomic_cmpxchg(v, c, new);
15477 + if (val == c)
15478 + return 1;
15479 + c = val;
15480 + } while (c);
15481 +
15482 + return 0;
15483 +}
15484 +
15485 +/**
15486 * atomic_inc_short - increment of a short integer
15487 * @v: pointer to type int
15488 *
15489 @@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15490 }
15491
15492 /* These are x86-specific, used by some header files */
15493 -#define atomic_clear_mask(mask, addr) \
15494 - asm volatile(LOCK_PREFIX "andl %0,%1" \
15495 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
15496 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15497 +{
15498 + asm volatile(LOCK_PREFIX "andl %1,%0"
15499 + : "+m" (v->counter)
15500 + : "r" (~(mask))
15501 + : "memory");
15502 +}
15503
15504 -#define atomic_set_mask(mask, addr) \
15505 - asm volatile(LOCK_PREFIX "orl %0,%1" \
15506 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15507 - : "memory")
15508 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15509 +{
15510 + asm volatile(LOCK_PREFIX "andl %1,%0"
15511 + : "+m" (v->counter)
15512 + : "r" (~(mask))
15513 + : "memory");
15514 +}
15515 +
15516 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15517 +{
15518 + asm volatile(LOCK_PREFIX "orl %1,%0"
15519 + : "+m" (v->counter)
15520 + : "r" (mask)
15521 + : "memory");
15522 +}
15523 +
15524 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15525 +{
15526 + asm volatile(LOCK_PREFIX "orl %1,%0"
15527 + : "+m" (v->counter)
15528 + : "r" (mask)
15529 + : "memory");
15530 +}
15531
15532 #ifdef CONFIG_X86_32
15533 # include <asm/atomic64_32.h>
15534 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15535 index b154de7..bf18a5a 100644
15536 --- a/arch/x86/include/asm/atomic64_32.h
15537 +++ b/arch/x86/include/asm/atomic64_32.h
15538 @@ -12,6 +12,14 @@ typedef struct {
15539 u64 __aligned(8) counter;
15540 } atomic64_t;
15541
15542 +#ifdef CONFIG_PAX_REFCOUNT
15543 +typedef struct {
15544 + u64 __aligned(8) counter;
15545 +} atomic64_unchecked_t;
15546 +#else
15547 +typedef atomic64_t atomic64_unchecked_t;
15548 +#endif
15549 +
15550 #define ATOMIC64_INIT(val) { (val) }
15551
15552 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15553 @@ -37,21 +45,31 @@ typedef struct {
15554 ATOMIC64_DECL_ONE(sym##_386)
15555
15556 ATOMIC64_DECL_ONE(add_386);
15557 +ATOMIC64_DECL_ONE(add_unchecked_386);
15558 ATOMIC64_DECL_ONE(sub_386);
15559 +ATOMIC64_DECL_ONE(sub_unchecked_386);
15560 ATOMIC64_DECL_ONE(inc_386);
15561 +ATOMIC64_DECL_ONE(inc_unchecked_386);
15562 ATOMIC64_DECL_ONE(dec_386);
15563 +ATOMIC64_DECL_ONE(dec_unchecked_386);
15564 #endif
15565
15566 #define alternative_atomic64(f, out, in...) \
15567 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15568
15569 ATOMIC64_DECL(read);
15570 +ATOMIC64_DECL(read_unchecked);
15571 ATOMIC64_DECL(set);
15572 +ATOMIC64_DECL(set_unchecked);
15573 ATOMIC64_DECL(xchg);
15574 ATOMIC64_DECL(add_return);
15575 +ATOMIC64_DECL(add_return_unchecked);
15576 ATOMIC64_DECL(sub_return);
15577 +ATOMIC64_DECL(sub_return_unchecked);
15578 ATOMIC64_DECL(inc_return);
15579 +ATOMIC64_DECL(inc_return_unchecked);
15580 ATOMIC64_DECL(dec_return);
15581 +ATOMIC64_DECL(dec_return_unchecked);
15582 ATOMIC64_DECL(dec_if_positive);
15583 ATOMIC64_DECL(inc_not_zero);
15584 ATOMIC64_DECL(add_unless);
15585 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15586 }
15587
15588 /**
15589 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15590 + * @p: pointer to type atomic64_unchecked_t
15591 + * @o: expected value
15592 + * @n: new value
15593 + *
15594 + * Atomically sets @v to @n if it was equal to @o and returns
15595 + * the old value.
15596 + */
15597 +
15598 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15599 +{
15600 + return cmpxchg64(&v->counter, o, n);
15601 +}
15602 +
15603 +/**
15604 * atomic64_xchg - xchg atomic64 variable
15605 * @v: pointer to type atomic64_t
15606 * @n: value to assign
15607 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15608 }
15609
15610 /**
15611 + * atomic64_set_unchecked - set atomic64 variable
15612 + * @v: pointer to type atomic64_unchecked_t
15613 + * @n: value to assign
15614 + *
15615 + * Atomically sets the value of @v to @n.
15616 + */
15617 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15618 +{
15619 + unsigned high = (unsigned)(i >> 32);
15620 + unsigned low = (unsigned)i;
15621 + alternative_atomic64(set, /* no output */,
15622 + "S" (v), "b" (low), "c" (high)
15623 + : "eax", "edx", "memory");
15624 +}
15625 +
15626 +/**
15627 * atomic64_read - read atomic64 variable
15628 * @v: pointer to type atomic64_t
15629 *
15630 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15631 }
15632
15633 /**
15634 + * atomic64_read_unchecked - read atomic64 variable
15635 + * @v: pointer to type atomic64_unchecked_t
15636 + *
15637 + * Atomically reads the value of @v and returns it.
15638 + */
15639 +static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15640 +{
15641 + long long r;
15642 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15643 + return r;
15644 + }
15645 +
15646 +/**
15647 * atomic64_add_return - add and return
15648 * @i: integer value to add
15649 * @v: pointer to type atomic64_t
15650 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15651 return i;
15652 }
15653
15654 +/**
15655 + * atomic64_add_return_unchecked - add and return
15656 + * @i: integer value to add
15657 + * @v: pointer to type atomic64_unchecked_t
15658 + *
15659 + * Atomically adds @i to @v and returns @i + *@v
15660 + */
15661 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15662 +{
15663 + alternative_atomic64(add_return_unchecked,
15664 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15665 + ASM_NO_INPUT_CLOBBER("memory"));
15666 + return i;
15667 +}
15668 +
15669 /*
15670 * Other variants with different arithmetic operators:
15671 */
15672 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15673 return a;
15674 }
15675
15676 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15677 +{
15678 + long long a;
15679 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
15680 + "S" (v) : "memory", "ecx");
15681 + return a;
15682 +}
15683 +
15684 static inline long long atomic64_dec_return(atomic64_t *v)
15685 {
15686 long long a;
15687 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15688 }
15689
15690 /**
15691 + * atomic64_add_unchecked - add integer to atomic64 variable
15692 + * @i: integer value to add
15693 + * @v: pointer to type atomic64_unchecked_t
15694 + *
15695 + * Atomically adds @i to @v.
15696 + */
15697 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15698 +{
15699 + __alternative_atomic64(add_unchecked, add_return_unchecked,
15700 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15701 + ASM_NO_INPUT_CLOBBER("memory"));
15702 + return i;
15703 +}
15704 +
15705 +/**
15706 * atomic64_sub - subtract the atomic64 variable
15707 * @i: integer value to subtract
15708 * @v: pointer to type atomic64_t
15709 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15710 index f8d273e..02f39f3 100644
15711 --- a/arch/x86/include/asm/atomic64_64.h
15712 +++ b/arch/x86/include/asm/atomic64_64.h
15713 @@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15714 }
15715
15716 /**
15717 + * atomic64_read_unchecked - read atomic64 variable
15718 + * @v: pointer of type atomic64_unchecked_t
15719 + *
15720 + * Atomically reads the value of @v.
15721 + * Doesn't imply a read memory barrier.
15722 + */
15723 +static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15724 +{
15725 + return ACCESS_ONCE((v)->counter);
15726 +}
15727 +
15728 +/**
15729 * atomic64_set - set atomic64 variable
15730 * @v: pointer to type atomic64_t
15731 * @i: required value
15732 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15733 }
15734
15735 /**
15736 + * atomic64_set_unchecked - set atomic64 variable
15737 + * @v: pointer to type atomic64_unchecked_t
15738 + * @i: required value
15739 + *
15740 + * Atomically sets the value of @v to @i.
15741 + */
15742 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15743 +{
15744 + v->counter = i;
15745 +}
15746 +
15747 +/**
15748 * atomic64_add - add integer to atomic64 variable
15749 * @i: integer value to add
15750 * @v: pointer to type atomic64_t
15751 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15752 */
15753 static inline void atomic64_add(long i, atomic64_t *v)
15754 {
15755 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
15756 +
15757 +#ifdef CONFIG_PAX_REFCOUNT
15758 + "jno 0f\n"
15759 + LOCK_PREFIX "subq %1,%0\n"
15760 + "int $4\n0:\n"
15761 + _ASM_EXTABLE(0b, 0b)
15762 +#endif
15763 +
15764 + : "=m" (v->counter)
15765 + : "er" (i), "m" (v->counter));
15766 +}
15767 +
15768 +/**
15769 + * atomic64_add_unchecked - add integer to atomic64 variable
15770 + * @i: integer value to add
15771 + * @v: pointer to type atomic64_unchecked_t
15772 + *
15773 + * Atomically adds @i to @v.
15774 + */
15775 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15776 +{
15777 asm volatile(LOCK_PREFIX "addq %1,%0"
15778 : "=m" (v->counter)
15779 : "er" (i), "m" (v->counter));
15780 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15781 */
15782 static inline void atomic64_sub(long i, atomic64_t *v)
15783 {
15784 - asm volatile(LOCK_PREFIX "subq %1,%0"
15785 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15786 +
15787 +#ifdef CONFIG_PAX_REFCOUNT
15788 + "jno 0f\n"
15789 + LOCK_PREFIX "addq %1,%0\n"
15790 + "int $4\n0:\n"
15791 + _ASM_EXTABLE(0b, 0b)
15792 +#endif
15793 +
15794 + : "=m" (v->counter)
15795 + : "er" (i), "m" (v->counter));
15796 +}
15797 +
15798 +/**
15799 + * atomic64_sub_unchecked - subtract the atomic64 variable
15800 + * @i: integer value to subtract
15801 + * @v: pointer to type atomic64_unchecked_t
15802 + *
15803 + * Atomically subtracts @i from @v.
15804 + */
15805 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15806 +{
15807 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15808 : "=m" (v->counter)
15809 : "er" (i), "m" (v->counter));
15810 }
15811 @@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15812 */
15813 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15814 {
15815 - GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15816 + GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15817 }
15818
15819 /**
15820 @@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15821 */
15822 static inline void atomic64_inc(atomic64_t *v)
15823 {
15824 + asm volatile(LOCK_PREFIX "incq %0\n"
15825 +
15826 +#ifdef CONFIG_PAX_REFCOUNT
15827 + "jno 0f\n"
15828 + LOCK_PREFIX "decq %0\n"
15829 + "int $4\n0:\n"
15830 + _ASM_EXTABLE(0b, 0b)
15831 +#endif
15832 +
15833 + : "=m" (v->counter)
15834 + : "m" (v->counter));
15835 +}
15836 +
15837 +/**
15838 + * atomic64_inc_unchecked - increment atomic64 variable
15839 + * @v: pointer to type atomic64_unchecked_t
15840 + *
15841 + * Atomically increments @v by 1.
15842 + */
15843 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15844 +{
15845 asm volatile(LOCK_PREFIX "incq %0"
15846 : "=m" (v->counter)
15847 : "m" (v->counter));
15848 @@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15849 */
15850 static inline void atomic64_dec(atomic64_t *v)
15851 {
15852 - asm volatile(LOCK_PREFIX "decq %0"
15853 + asm volatile(LOCK_PREFIX "decq %0\n"
15854 +
15855 +#ifdef CONFIG_PAX_REFCOUNT
15856 + "jno 0f\n"
15857 + LOCK_PREFIX "incq %0\n"
15858 + "int $4\n0:\n"
15859 + _ASM_EXTABLE(0b, 0b)
15860 +#endif
15861 +
15862 + : "=m" (v->counter)
15863 + : "m" (v->counter));
15864 +}
15865 +
15866 +/**
15867 + * atomic64_dec_unchecked - decrement atomic64 variable
15868 + * @v: pointer to type atomic64_t
15869 + *
15870 + * Atomically decrements @v by 1.
15871 + */
15872 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15873 +{
15874 + asm volatile(LOCK_PREFIX "decq %0\n"
15875 : "=m" (v->counter)
15876 : "m" (v->counter));
15877 }
15878 @@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15879 */
15880 static inline int atomic64_dec_and_test(atomic64_t *v)
15881 {
15882 - GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15883 + GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15884 }
15885
15886 /**
15887 @@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15888 */
15889 static inline int atomic64_inc_and_test(atomic64_t *v)
15890 {
15891 - GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15892 + GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15893 }
15894
15895 /**
15896 @@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15897 */
15898 static inline int atomic64_add_negative(long i, atomic64_t *v)
15899 {
15900 - GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15901 + GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15902 }
15903
15904 /**
15905 @@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15906 */
15907 static inline long atomic64_add_return(long i, atomic64_t *v)
15908 {
15909 + return i + xadd_check_overflow(&v->counter, i);
15910 +}
15911 +
15912 +/**
15913 + * atomic64_add_return_unchecked - add and return
15914 + * @i: integer value to add
15915 + * @v: pointer to type atomic64_unchecked_t
15916 + *
15917 + * Atomically adds @i to @v and returns @i + @v
15918 + */
15919 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15920 +{
15921 return i + xadd(&v->counter, i);
15922 }
15923
15924 @@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15925 }
15926
15927 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15928 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15929 +{
15930 + return atomic64_add_return_unchecked(1, v);
15931 +}
15932 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15933
15934 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15935 @@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15936 return cmpxchg(&v->counter, old, new);
15937 }
15938
15939 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15940 +{
15941 + return cmpxchg(&v->counter, old, new);
15942 +}
15943 +
15944 static inline long atomic64_xchg(atomic64_t *v, long new)
15945 {
15946 return xchg(&v->counter, new);
15947 @@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15948 */
15949 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15950 {
15951 - long c, old;
15952 + long c, old, new;
15953 c = atomic64_read(v);
15954 for (;;) {
15955 - if (unlikely(c == (u)))
15956 + if (unlikely(c == u))
15957 break;
15958 - old = atomic64_cmpxchg((v), c, c + (a));
15959 +
15960 + asm volatile("add %2,%0\n"
15961 +
15962 +#ifdef CONFIG_PAX_REFCOUNT
15963 + "jno 0f\n"
15964 + "sub %2,%0\n"
15965 + "int $4\n0:\n"
15966 + _ASM_EXTABLE(0b, 0b)
15967 +#endif
15968 +
15969 + : "=r" (new)
15970 + : "0" (c), "ir" (a));
15971 +
15972 + old = atomic64_cmpxchg(v, c, new);
15973 if (likely(old == c))
15974 break;
15975 c = old;
15976 }
15977 - return c != (u);
15978 + return c != u;
15979 }
15980
15981 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15982 diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
15983 index 0f4460b..fa1ee19 100644
15984 --- a/arch/x86/include/asm/barrier.h
15985 +++ b/arch/x86/include/asm/barrier.h
15986 @@ -107,7 +107,7 @@
15987 do { \
15988 compiletime_assert_atomic_type(*p); \
15989 smp_mb(); \
15990 - ACCESS_ONCE(*p) = (v); \
15991 + ACCESS_ONCE_RW(*p) = (v); \
15992 } while (0)
15993
15994 #define smp_load_acquire(p) \
15995 @@ -124,7 +124,7 @@ do { \
15996 do { \
15997 compiletime_assert_atomic_type(*p); \
15998 barrier(); \
15999 - ACCESS_ONCE(*p) = (v); \
16000 + ACCESS_ONCE_RW(*p) = (v); \
16001 } while (0)
16002
16003 #define smp_load_acquire(p) \
16004 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16005 index cfe3b95..d01b118 100644
16006 --- a/arch/x86/include/asm/bitops.h
16007 +++ b/arch/x86/include/asm/bitops.h
16008 @@ -50,7 +50,7 @@
16009 * a mask operation on a byte.
16010 */
16011 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16012 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16013 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16014 #define CONST_MASK(nr) (1 << ((nr) & 7))
16015
16016 /**
16017 @@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16018 */
16019 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16020 {
16021 - GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16022 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16023 }
16024
16025 /**
16026 @@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16027 */
16028 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16029 {
16030 - GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16031 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16032 }
16033
16034 /**
16035 @@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16036 */
16037 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16038 {
16039 - GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16040 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16041 }
16042
16043 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16044 @@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16045 *
16046 * Undefined if no bit exists, so code should check against 0 first.
16047 */
16048 -static inline unsigned long __ffs(unsigned long word)
16049 +static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16050 {
16051 asm("rep; bsf %1,%0"
16052 : "=r" (word)
16053 @@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16054 *
16055 * Undefined if no zero exists, so code should check against ~0UL first.
16056 */
16057 -static inline unsigned long ffz(unsigned long word)
16058 +static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16059 {
16060 asm("rep; bsf %1,%0"
16061 : "=r" (word)
16062 @@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16063 *
16064 * Undefined if no set bit exists, so code should check against 0 first.
16065 */
16066 -static inline unsigned long __fls(unsigned long word)
16067 +static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16068 {
16069 asm("bsr %1,%0"
16070 : "=r" (word)
16071 @@ -434,7 +434,7 @@ static inline int ffs(int x)
16072 * set bit if value is nonzero. The last (most significant) bit is
16073 * at position 32.
16074 */
16075 -static inline int fls(int x)
16076 +static inline int __intentional_overflow(-1) fls(int x)
16077 {
16078 int r;
16079
16080 @@ -476,7 +476,7 @@ static inline int fls(int x)
16081 * at position 64.
16082 */
16083 #ifdef CONFIG_X86_64
16084 -static __always_inline int fls64(__u64 x)
16085 +static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16086 {
16087 int bitpos = -1;
16088 /*
16089 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16090 index 4fa687a..60f2d39 100644
16091 --- a/arch/x86/include/asm/boot.h
16092 +++ b/arch/x86/include/asm/boot.h
16093 @@ -6,10 +6,15 @@
16094 #include <uapi/asm/boot.h>
16095
16096 /* Physical address where kernel should be loaded. */
16097 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16098 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16099 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16100 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16101
16102 +#ifndef __ASSEMBLY__
16103 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
16104 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16105 +#endif
16106 +
16107 /* Minimum kernel alignment, as a power of two */
16108 #ifdef CONFIG_X86_64
16109 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16110 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16111 index 48f99f1..d78ebf9 100644
16112 --- a/arch/x86/include/asm/cache.h
16113 +++ b/arch/x86/include/asm/cache.h
16114 @@ -5,12 +5,13 @@
16115
16116 /* L1 cache line size */
16117 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16118 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16119 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16120
16121 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16122 +#define __read_only __attribute__((__section__(".data..read_only")))
16123
16124 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16125 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16126 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16127
16128 #ifdef CONFIG_X86_VSMP
16129 #ifdef CONFIG_SMP
16130 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
16131 index 9863ee3..4a1f8e1 100644
16132 --- a/arch/x86/include/asm/cacheflush.h
16133 +++ b/arch/x86/include/asm/cacheflush.h
16134 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
16135 unsigned long pg_flags = pg->flags & _PGMT_MASK;
16136
16137 if (pg_flags == _PGMT_DEFAULT)
16138 - return -1;
16139 + return ~0UL;
16140 else if (pg_flags == _PGMT_WC)
16141 return _PAGE_CACHE_WC;
16142 else if (pg_flags == _PGMT_UC_MINUS)
16143 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16144 index 76659b6..72b8439 100644
16145 --- a/arch/x86/include/asm/calling.h
16146 +++ b/arch/x86/include/asm/calling.h
16147 @@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16148 #define RSP 152
16149 #define SS 160
16150
16151 -#define ARGOFFSET R11
16152 -#define SWFRAME ORIG_RAX
16153 +#define ARGOFFSET R15
16154
16155 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16156 - subq $9*8+\addskip, %rsp
16157 - CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16158 - movq_cfi rdi, 8*8
16159 - movq_cfi rsi, 7*8
16160 - movq_cfi rdx, 6*8
16161 + subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16162 + CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16163 + movq_cfi rdi, RDI
16164 + movq_cfi rsi, RSI
16165 + movq_cfi rdx, RDX
16166
16167 .if \save_rcx
16168 - movq_cfi rcx, 5*8
16169 + movq_cfi rcx, RCX
16170 .endif
16171
16172 .if \rax_enosys
16173 - movq $-ENOSYS, 4*8(%rsp)
16174 + movq $-ENOSYS, RAX(%rsp)
16175 .else
16176 - movq_cfi rax, 4*8
16177 + movq_cfi rax, RAX
16178 .endif
16179
16180 .if \save_r891011
16181 - movq_cfi r8, 3*8
16182 - movq_cfi r9, 2*8
16183 - movq_cfi r10, 1*8
16184 - movq_cfi r11, 0*8
16185 + movq_cfi r8, R8
16186 + movq_cfi r9, R9
16187 + movq_cfi r10, R10
16188 + movq_cfi r11, R11
16189 .endif
16190
16191 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16192 + movq_cfi r12, R12
16193 +#endif
16194 +
16195 .endm
16196
16197 -#define ARG_SKIP (9*8)
16198 +#define ARG_SKIP ORIG_RAX
16199
16200 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16201 rstor_r8910=1, rstor_rdx=1
16202 +
16203 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16204 + movq_cfi_restore R12, r12
16205 +#endif
16206 +
16207 .if \rstor_r11
16208 - movq_cfi_restore 0*8, r11
16209 + movq_cfi_restore R11, r11
16210 .endif
16211
16212 .if \rstor_r8910
16213 - movq_cfi_restore 1*8, r10
16214 - movq_cfi_restore 2*8, r9
16215 - movq_cfi_restore 3*8, r8
16216 + movq_cfi_restore R10, r10
16217 + movq_cfi_restore R9, r9
16218 + movq_cfi_restore R8, r8
16219 .endif
16220
16221 .if \rstor_rax
16222 - movq_cfi_restore 4*8, rax
16223 + movq_cfi_restore RAX, rax
16224 .endif
16225
16226 .if \rstor_rcx
16227 - movq_cfi_restore 5*8, rcx
16228 + movq_cfi_restore RCX, rcx
16229 .endif
16230
16231 .if \rstor_rdx
16232 - movq_cfi_restore 6*8, rdx
16233 + movq_cfi_restore RDX, rdx
16234 .endif
16235
16236 - movq_cfi_restore 7*8, rsi
16237 - movq_cfi_restore 8*8, rdi
16238 + movq_cfi_restore RSI, rsi
16239 + movq_cfi_restore RDI, rdi
16240
16241 - .if ARG_SKIP+\addskip > 0
16242 - addq $ARG_SKIP+\addskip, %rsp
16243 - CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16244 + .if ORIG_RAX+\addskip > 0
16245 + addq $ORIG_RAX+\addskip, %rsp
16246 + CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16247 .endif
16248 .endm
16249
16250 - .macro LOAD_ARGS offset, skiprax=0
16251 - movq \offset(%rsp), %r11
16252 - movq \offset+8(%rsp), %r10
16253 - movq \offset+16(%rsp), %r9
16254 - movq \offset+24(%rsp), %r8
16255 - movq \offset+40(%rsp), %rcx
16256 - movq \offset+48(%rsp), %rdx
16257 - movq \offset+56(%rsp), %rsi
16258 - movq \offset+64(%rsp), %rdi
16259 + .macro LOAD_ARGS skiprax=0
16260 + movq R11(%rsp), %r11
16261 + movq R10(%rsp), %r10
16262 + movq R9(%rsp), %r9
16263 + movq R8(%rsp), %r8
16264 + movq RCX(%rsp), %rcx
16265 + movq RDX(%rsp), %rdx
16266 + movq RSI(%rsp), %rsi
16267 + movq RDI(%rsp), %rdi
16268 .if \skiprax
16269 .else
16270 - movq \offset+72(%rsp), %rax
16271 + movq ORIG_RAX(%rsp), %rax
16272 .endif
16273 .endm
16274
16275 -#define REST_SKIP (6*8)
16276 -
16277 .macro SAVE_REST
16278 - subq $REST_SKIP, %rsp
16279 - CFI_ADJUST_CFA_OFFSET REST_SKIP
16280 - movq_cfi rbx, 5*8
16281 - movq_cfi rbp, 4*8
16282 - movq_cfi r12, 3*8
16283 - movq_cfi r13, 2*8
16284 - movq_cfi r14, 1*8
16285 - movq_cfi r15, 0*8
16286 + movq_cfi rbx, RBX
16287 + movq_cfi rbp, RBP
16288 +
16289 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16290 + movq_cfi r12, R12
16291 +#endif
16292 +
16293 + movq_cfi r13, R13
16294 + movq_cfi r14, R14
16295 + movq_cfi r15, R15
16296 .endm
16297
16298 .macro RESTORE_REST
16299 - movq_cfi_restore 0*8, r15
16300 - movq_cfi_restore 1*8, r14
16301 - movq_cfi_restore 2*8, r13
16302 - movq_cfi_restore 3*8, r12
16303 - movq_cfi_restore 4*8, rbp
16304 - movq_cfi_restore 5*8, rbx
16305 - addq $REST_SKIP, %rsp
16306 - CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16307 + movq_cfi_restore R15, r15
16308 + movq_cfi_restore R14, r14
16309 + movq_cfi_restore R13, r13
16310 +
16311 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16312 + movq_cfi_restore R12, r12
16313 +#endif
16314 +
16315 + movq_cfi_restore RBP, rbp
16316 + movq_cfi_restore RBX, rbx
16317 .endm
16318
16319 .macro SAVE_ALL
16320 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16321 index f50de69..2b0a458 100644
16322 --- a/arch/x86/include/asm/checksum_32.h
16323 +++ b/arch/x86/include/asm/checksum_32.h
16324 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16325 int len, __wsum sum,
16326 int *src_err_ptr, int *dst_err_ptr);
16327
16328 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16329 + int len, __wsum sum,
16330 + int *src_err_ptr, int *dst_err_ptr);
16331 +
16332 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16333 + int len, __wsum sum,
16334 + int *src_err_ptr, int *dst_err_ptr);
16335 +
16336 /*
16337 * Note: when you get a NULL pointer exception here this means someone
16338 * passed in an incorrect kernel address to one of these functions.
16339 @@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16340
16341 might_sleep();
16342 stac();
16343 - ret = csum_partial_copy_generic((__force void *)src, dst,
16344 + ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16345 len, sum, err_ptr, NULL);
16346 clac();
16347
16348 @@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16349 might_sleep();
16350 if (access_ok(VERIFY_WRITE, dst, len)) {
16351 stac();
16352 - ret = csum_partial_copy_generic(src, (__force void *)dst,
16353 + ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16354 len, sum, NULL, err_ptr);
16355 clac();
16356 return ret;
16357 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16358 index 99c105d7..2f667ac 100644
16359 --- a/arch/x86/include/asm/cmpxchg.h
16360 +++ b/arch/x86/include/asm/cmpxchg.h
16361 @@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16362 __compiletime_error("Bad argument size for cmpxchg");
16363 extern void __xadd_wrong_size(void)
16364 __compiletime_error("Bad argument size for xadd");
16365 +extern void __xadd_check_overflow_wrong_size(void)
16366 + __compiletime_error("Bad argument size for xadd_check_overflow");
16367 extern void __add_wrong_size(void)
16368 __compiletime_error("Bad argument size for add");
16369 +extern void __add_check_overflow_wrong_size(void)
16370 + __compiletime_error("Bad argument size for add_check_overflow");
16371
16372 /*
16373 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16374 @@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16375 __ret; \
16376 })
16377
16378 +#ifdef CONFIG_PAX_REFCOUNT
16379 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16380 + ({ \
16381 + __typeof__ (*(ptr)) __ret = (arg); \
16382 + switch (sizeof(*(ptr))) { \
16383 + case __X86_CASE_L: \
16384 + asm volatile (lock #op "l %0, %1\n" \
16385 + "jno 0f\n" \
16386 + "mov %0,%1\n" \
16387 + "int $4\n0:\n" \
16388 + _ASM_EXTABLE(0b, 0b) \
16389 + : "+r" (__ret), "+m" (*(ptr)) \
16390 + : : "memory", "cc"); \
16391 + break; \
16392 + case __X86_CASE_Q: \
16393 + asm volatile (lock #op "q %q0, %1\n" \
16394 + "jno 0f\n" \
16395 + "mov %0,%1\n" \
16396 + "int $4\n0:\n" \
16397 + _ASM_EXTABLE(0b, 0b) \
16398 + : "+r" (__ret), "+m" (*(ptr)) \
16399 + : : "memory", "cc"); \
16400 + break; \
16401 + default: \
16402 + __ ## op ## _check_overflow_wrong_size(); \
16403 + } \
16404 + __ret; \
16405 + })
16406 +#else
16407 +#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16408 +#endif
16409 +
16410 /*
16411 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16412 * Since this is generally used to protect other memory information, we
16413 @@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16414 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16415 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16416
16417 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16418 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16419 +
16420 #define __add(ptr, inc, lock) \
16421 ({ \
16422 __typeof__ (*(ptr)) __ret = (inc); \
16423 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16424 index 59c6c40..5e0b22c 100644
16425 --- a/arch/x86/include/asm/compat.h
16426 +++ b/arch/x86/include/asm/compat.h
16427 @@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16428 typedef u32 compat_uint_t;
16429 typedef u32 compat_ulong_t;
16430 typedef u64 __attribute__((aligned(4))) compat_u64;
16431 -typedef u32 compat_uptr_t;
16432 +typedef u32 __user compat_uptr_t;
16433
16434 struct compat_timespec {
16435 compat_time_t tv_sec;
16436 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16437 index 0bb1335..8f1aec7 100644
16438 --- a/arch/x86/include/asm/cpufeature.h
16439 +++ b/arch/x86/include/asm/cpufeature.h
16440 @@ -207,7 +207,7 @@
16441 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16442 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16443 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16444 -
16445 +#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16446
16447 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16448 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16449 @@ -215,7 +215,7 @@
16450 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16451 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16452 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16453 -#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16454 +#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16455 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16456 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16457 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16458 @@ -383,6 +383,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16459 #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
16460 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16461 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16462 +#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16463
16464 #if __GNUC__ >= 4
16465 extern void warn_pre_alternatives(void);
16466 @@ -434,7 +435,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16467
16468 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16469 t_warn:
16470 - warn_pre_alternatives();
16471 + if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16472 + warn_pre_alternatives();
16473 return false;
16474 #endif
16475
16476 @@ -454,7 +456,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16477 ".section .discard,\"aw\",@progbits\n"
16478 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16479 ".previous\n"
16480 - ".section .altinstr_replacement,\"ax\"\n"
16481 + ".section .altinstr_replacement,\"a\"\n"
16482 "3: movb $1,%0\n"
16483 "4:\n"
16484 ".previous\n"
16485 @@ -491,7 +493,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16486 " .byte 2b - 1b\n" /* src len */
16487 " .byte 4f - 3f\n" /* repl len */
16488 ".previous\n"
16489 - ".section .altinstr_replacement,\"ax\"\n"
16490 + ".section .altinstr_replacement,\"a\"\n"
16491 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16492 "4:\n"
16493 ".previous\n"
16494 @@ -524,7 +526,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16495 ".section .discard,\"aw\",@progbits\n"
16496 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16497 ".previous\n"
16498 - ".section .altinstr_replacement,\"ax\"\n"
16499 + ".section .altinstr_replacement,\"a\"\n"
16500 "3: movb $0,%0\n"
16501 "4:\n"
16502 ".previous\n"
16503 @@ -538,7 +540,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16504 ".section .discard,\"aw\",@progbits\n"
16505 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16506 ".previous\n"
16507 - ".section .altinstr_replacement,\"ax\"\n"
16508 + ".section .altinstr_replacement,\"a\"\n"
16509 "5: movb $1,%0\n"
16510 "6:\n"
16511 ".previous\n"
16512 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16513 index 50d033a..37deb26 100644
16514 --- a/arch/x86/include/asm/desc.h
16515 +++ b/arch/x86/include/asm/desc.h
16516 @@ -4,6 +4,7 @@
16517 #include <asm/desc_defs.h>
16518 #include <asm/ldt.h>
16519 #include <asm/mmu.h>
16520 +#include <asm/pgtable.h>
16521
16522 #include <linux/smp.h>
16523 #include <linux/percpu.h>
16524 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16525
16526 desc->type = (info->read_exec_only ^ 1) << 1;
16527 desc->type |= info->contents << 2;
16528 + desc->type |= info->seg_not_present ^ 1;
16529
16530 desc->s = 1;
16531 desc->dpl = 0x3;
16532 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16533 }
16534
16535 extern struct desc_ptr idt_descr;
16536 -extern gate_desc idt_table[];
16537 -extern struct desc_ptr debug_idt_descr;
16538 -extern gate_desc debug_idt_table[];
16539 -
16540 -struct gdt_page {
16541 - struct desc_struct gdt[GDT_ENTRIES];
16542 -} __attribute__((aligned(PAGE_SIZE)));
16543 -
16544 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16545 +extern gate_desc idt_table[IDT_ENTRIES];
16546 +extern const struct desc_ptr debug_idt_descr;
16547 +extern gate_desc debug_idt_table[IDT_ENTRIES];
16548
16549 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16550 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16551 {
16552 - return per_cpu(gdt_page, cpu).gdt;
16553 + return cpu_gdt_table[cpu];
16554 }
16555
16556 #ifdef CONFIG_X86_64
16557 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16558 unsigned long base, unsigned dpl, unsigned flags,
16559 unsigned short seg)
16560 {
16561 - gate->a = (seg << 16) | (base & 0xffff);
16562 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16563 + gate->gate.offset_low = base;
16564 + gate->gate.seg = seg;
16565 + gate->gate.reserved = 0;
16566 + gate->gate.type = type;
16567 + gate->gate.s = 0;
16568 + gate->gate.dpl = dpl;
16569 + gate->gate.p = 1;
16570 + gate->gate.offset_high = base >> 16;
16571 }
16572
16573 #endif
16574 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16575
16576 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16577 {
16578 + pax_open_kernel();
16579 memcpy(&idt[entry], gate, sizeof(*gate));
16580 + pax_close_kernel();
16581 }
16582
16583 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16584 {
16585 + pax_open_kernel();
16586 memcpy(&ldt[entry], desc, 8);
16587 + pax_close_kernel();
16588 }
16589
16590 static inline void
16591 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16592 default: size = sizeof(*gdt); break;
16593 }
16594
16595 + pax_open_kernel();
16596 memcpy(&gdt[entry], desc, size);
16597 + pax_close_kernel();
16598 }
16599
16600 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16601 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16602
16603 static inline void native_load_tr_desc(void)
16604 {
16605 + pax_open_kernel();
16606 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16607 + pax_close_kernel();
16608 }
16609
16610 static inline void native_load_gdt(const struct desc_ptr *dtr)
16611 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16612 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16613 unsigned int i;
16614
16615 + pax_open_kernel();
16616 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16617 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16618 + pax_close_kernel();
16619 }
16620
16621 #define _LDT_empty(info) \
16622 @@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16623 preempt_enable();
16624 }
16625
16626 -static inline unsigned long get_desc_base(const struct desc_struct *desc)
16627 +static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16628 {
16629 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16630 }
16631 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16632 }
16633
16634 #ifdef CONFIG_X86_64
16635 -static inline void set_nmi_gate(int gate, void *addr)
16636 +static inline void set_nmi_gate(int gate, const void *addr)
16637 {
16638 gate_desc s;
16639
16640 @@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16641 #endif
16642
16643 #ifdef CONFIG_TRACING
16644 -extern struct desc_ptr trace_idt_descr;
16645 -extern gate_desc trace_idt_table[];
16646 +extern const struct desc_ptr trace_idt_descr;
16647 +extern gate_desc trace_idt_table[IDT_ENTRIES];
16648 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16649 {
16650 write_idt_entry(trace_idt_table, entry, gate);
16651 }
16652
16653 -static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16654 +static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16655 unsigned dpl, unsigned ist, unsigned seg)
16656 {
16657 gate_desc s;
16658 @@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16659 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16660 #endif
16661
16662 -static inline void _set_gate(int gate, unsigned type, void *addr,
16663 +static inline void _set_gate(int gate, unsigned type, const void *addr,
16664 unsigned dpl, unsigned ist, unsigned seg)
16665 {
16666 gate_desc s;
16667 @@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16668 #define set_intr_gate(n, addr) \
16669 do { \
16670 BUG_ON((unsigned)n > 0xFF); \
16671 - _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16672 + _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16673 __KERNEL_CS); \
16674 - _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16675 + _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16676 0, 0, __KERNEL_CS); \
16677 } while (0)
16678
16679 @@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16680 /*
16681 * This routine sets up an interrupt gate at directory privilege level 3.
16682 */
16683 -static inline void set_system_intr_gate(unsigned int n, void *addr)
16684 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
16685 {
16686 BUG_ON((unsigned)n > 0xFF);
16687 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16688 }
16689
16690 -static inline void set_system_trap_gate(unsigned int n, void *addr)
16691 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
16692 {
16693 BUG_ON((unsigned)n > 0xFF);
16694 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16695 }
16696
16697 -static inline void set_trap_gate(unsigned int n, void *addr)
16698 +static inline void set_trap_gate(unsigned int n, const void *addr)
16699 {
16700 BUG_ON((unsigned)n > 0xFF);
16701 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16702 @@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16703 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16704 {
16705 BUG_ON((unsigned)n > 0xFF);
16706 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16707 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16708 }
16709
16710 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16711 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16712 {
16713 BUG_ON((unsigned)n > 0xFF);
16714 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16715 }
16716
16717 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16718 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16719 {
16720 BUG_ON((unsigned)n > 0xFF);
16721 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16722 @@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16723 else
16724 load_idt((const struct desc_ptr *)&idt_descr);
16725 }
16726 +
16727 +#ifdef CONFIG_X86_32
16728 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16729 +{
16730 + struct desc_struct d;
16731 +
16732 + if (likely(limit))
16733 + limit = (limit - 1UL) >> PAGE_SHIFT;
16734 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
16735 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16736 +}
16737 +#endif
16738 +
16739 #endif /* _ASM_X86_DESC_H */
16740 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16741 index 278441f..b95a174 100644
16742 --- a/arch/x86/include/asm/desc_defs.h
16743 +++ b/arch/x86/include/asm/desc_defs.h
16744 @@ -31,6 +31,12 @@ struct desc_struct {
16745 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16746 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16747 };
16748 + struct {
16749 + u16 offset_low;
16750 + u16 seg;
16751 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16752 + unsigned offset_high: 16;
16753 + } gate;
16754 };
16755 } __attribute__((packed));
16756
16757 diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16758 index ced283a..ffe04cc 100644
16759 --- a/arch/x86/include/asm/div64.h
16760 +++ b/arch/x86/include/asm/div64.h
16761 @@ -39,7 +39,7 @@
16762 __mod; \
16763 })
16764
16765 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16766 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16767 {
16768 union {
16769 u64 v64;
16770 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16771 index ca3347a..1a5082a 100644
16772 --- a/arch/x86/include/asm/elf.h
16773 +++ b/arch/x86/include/asm/elf.h
16774 @@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16775
16776 #include <asm/vdso.h>
16777
16778 -#ifdef CONFIG_X86_64
16779 -extern unsigned int vdso64_enabled;
16780 -#endif
16781 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16782 extern unsigned int vdso32_enabled;
16783 #endif
16784 @@ -249,7 +246,25 @@ extern int force_personality32;
16785 the loader. We need to make sure that it is out of the way of the program
16786 that it will "exec", and that there is sufficient room for the brk. */
16787
16788 +#ifdef CONFIG_PAX_SEGMEXEC
16789 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16790 +#else
16791 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16792 +#endif
16793 +
16794 +#ifdef CONFIG_PAX_ASLR
16795 +#ifdef CONFIG_X86_32
16796 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16797 +
16798 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16799 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16800 +#else
16801 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
16802 +
16803 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16804 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16805 +#endif
16806 +#endif
16807
16808 /* This yields a mask that user programs can use to figure out what
16809 instruction set this CPU supports. This could be done in user space,
16810 @@ -298,17 +313,13 @@ do { \
16811
16812 #define ARCH_DLINFO \
16813 do { \
16814 - if (vdso64_enabled) \
16815 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16816 - (unsigned long __force)current->mm->context.vdso); \
16817 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16818 } while (0)
16819
16820 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16821 #define ARCH_DLINFO_X32 \
16822 do { \
16823 - if (vdso64_enabled) \
16824 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16825 - (unsigned long __force)current->mm->context.vdso); \
16826 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16827 } while (0)
16828
16829 #define AT_SYSINFO 32
16830 @@ -323,10 +334,10 @@ else \
16831
16832 #endif /* !CONFIG_X86_32 */
16833
16834 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16835 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16836
16837 #define VDSO_ENTRY \
16838 - ((unsigned long)current->mm->context.vdso + \
16839 + (current->mm->context.vdso + \
16840 selected_vdso32->sym___kernel_vsyscall)
16841
16842 struct linux_binprm;
16843 @@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16844 int uses_interp);
16845 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16846
16847 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16848 -#define arch_randomize_brk arch_randomize_brk
16849 -
16850 /*
16851 * True on X86_32 or when emulating IA32 on X86_64
16852 */
16853 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16854 index 77a99ac..39ff7f5 100644
16855 --- a/arch/x86/include/asm/emergency-restart.h
16856 +++ b/arch/x86/include/asm/emergency-restart.h
16857 @@ -1,6 +1,6 @@
16858 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16859 #define _ASM_X86_EMERGENCY_RESTART_H
16860
16861 -extern void machine_emergency_restart(void);
16862 +extern void machine_emergency_restart(void) __noreturn;
16863
16864 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16865 diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16866 index 1c7eefe..d0e4702 100644
16867 --- a/arch/x86/include/asm/floppy.h
16868 +++ b/arch/x86/include/asm/floppy.h
16869 @@ -229,18 +229,18 @@ static struct fd_routine_l {
16870 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16871 } fd_routine[] = {
16872 {
16873 - request_dma,
16874 - free_dma,
16875 - get_dma_residue,
16876 - dma_mem_alloc,
16877 - hard_dma_setup
16878 + ._request_dma = request_dma,
16879 + ._free_dma = free_dma,
16880 + ._get_dma_residue = get_dma_residue,
16881 + ._dma_mem_alloc = dma_mem_alloc,
16882 + ._dma_setup = hard_dma_setup
16883 },
16884 {
16885 - vdma_request_dma,
16886 - vdma_nop,
16887 - vdma_get_dma_residue,
16888 - vdma_mem_alloc,
16889 - vdma_dma_setup
16890 + ._request_dma = vdma_request_dma,
16891 + ._free_dma = vdma_nop,
16892 + ._get_dma_residue = vdma_get_dma_residue,
16893 + ._dma_mem_alloc = vdma_mem_alloc,
16894 + ._dma_setup = vdma_dma_setup
16895 }
16896 };
16897
16898 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16899 index e97622f..d0ba77a 100644
16900 --- a/arch/x86/include/asm/fpu-internal.h
16901 +++ b/arch/x86/include/asm/fpu-internal.h
16902 @@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16903 #define user_insn(insn, output, input...) \
16904 ({ \
16905 int err; \
16906 + pax_open_userland(); \
16907 asm volatile(ASM_STAC "\n" \
16908 - "1:" #insn "\n\t" \
16909 + "1:" \
16910 + __copyuser_seg \
16911 + #insn "\n\t" \
16912 "2: " ASM_CLAC "\n" \
16913 ".section .fixup,\"ax\"\n" \
16914 "3: movl $-1,%[err]\n" \
16915 @@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16916 _ASM_EXTABLE(1b, 3b) \
16917 : [err] "=r" (err), output \
16918 : "0"(0), input); \
16919 + pax_close_userland(); \
16920 err; \
16921 })
16922
16923 @@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16924 "fnclex\n\t"
16925 "emms\n\t"
16926 "fildl %P[addr]" /* set F?P to defined value */
16927 - : : [addr] "m" (tsk->thread.fpu.has_fpu));
16928 + : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16929 }
16930
16931 return fpu_restore_checking(&tsk->thread.fpu);
16932 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16933 index b4c1f54..e290c08 100644
16934 --- a/arch/x86/include/asm/futex.h
16935 +++ b/arch/x86/include/asm/futex.h
16936 @@ -12,6 +12,7 @@
16937 #include <asm/smap.h>
16938
16939 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16940 + typecheck(u32 __user *, uaddr); \
16941 asm volatile("\t" ASM_STAC "\n" \
16942 "1:\t" insn "\n" \
16943 "2:\t" ASM_CLAC "\n" \
16944 @@ -20,15 +21,16 @@
16945 "\tjmp\t2b\n" \
16946 "\t.previous\n" \
16947 _ASM_EXTABLE(1b, 3b) \
16948 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16949 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16950 : "i" (-EFAULT), "0" (oparg), "1" (0))
16951
16952 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16953 + typecheck(u32 __user *, uaddr); \
16954 asm volatile("\t" ASM_STAC "\n" \
16955 "1:\tmovl %2, %0\n" \
16956 "\tmovl\t%0, %3\n" \
16957 "\t" insn "\n" \
16958 - "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16959 + "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16960 "\tjnz\t1b\n" \
16961 "3:\t" ASM_CLAC "\n" \
16962 "\t.section .fixup,\"ax\"\n" \
16963 @@ -38,7 +40,7 @@
16964 _ASM_EXTABLE(1b, 4b) \
16965 _ASM_EXTABLE(2b, 4b) \
16966 : "=&a" (oldval), "=&r" (ret), \
16967 - "+m" (*uaddr), "=&r" (tem) \
16968 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16969 : "r" (oparg), "i" (-EFAULT), "1" (0))
16970
16971 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16972 @@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16973
16974 pagefault_disable();
16975
16976 + pax_open_userland();
16977 switch (op) {
16978 case FUTEX_OP_SET:
16979 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16980 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16981 break;
16982 case FUTEX_OP_ADD:
16983 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16984 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16985 uaddr, oparg);
16986 break;
16987 case FUTEX_OP_OR:
16988 @@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16989 default:
16990 ret = -ENOSYS;
16991 }
16992 + pax_close_userland();
16993
16994 pagefault_enable();
16995
16996 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16997 index 4615906..788c817 100644
16998 --- a/arch/x86/include/asm/hw_irq.h
16999 +++ b/arch/x86/include/asm/hw_irq.h
17000 @@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
17001 extern void enable_IO_APIC(void);
17002
17003 /* Statistics */
17004 -extern atomic_t irq_err_count;
17005 -extern atomic_t irq_mis_count;
17006 +extern atomic_unchecked_t irq_err_count;
17007 +extern atomic_unchecked_t irq_mis_count;
17008
17009 /* EISA */
17010 extern void eisa_set_level_irq(unsigned int irq);
17011 diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17012 index ccffa53..3c90c87 100644
17013 --- a/arch/x86/include/asm/i8259.h
17014 +++ b/arch/x86/include/asm/i8259.h
17015 @@ -62,7 +62,7 @@ struct legacy_pic {
17016 void (*init)(int auto_eoi);
17017 int (*irq_pending)(unsigned int irq);
17018 void (*make_irq)(unsigned int irq);
17019 -};
17020 +} __do_const;
17021
17022 extern struct legacy_pic *legacy_pic;
17023 extern struct legacy_pic null_legacy_pic;
17024 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17025 index b8237d8..3e8864e 100644
17026 --- a/arch/x86/include/asm/io.h
17027 +++ b/arch/x86/include/asm/io.h
17028 @@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17029 "m" (*(volatile type __force *)addr) barrier); }
17030
17031 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17032 -build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17033 -build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17034 +build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17035 +build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17036
17037 build_mmio_read(__readb, "b", unsigned char, "=q", )
17038 -build_mmio_read(__readw, "w", unsigned short, "=r", )
17039 -build_mmio_read(__readl, "l", unsigned int, "=r", )
17040 +build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17041 +build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17042
17043 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17044 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17045 @@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17046 * this function
17047 */
17048
17049 -static inline phys_addr_t virt_to_phys(volatile void *address)
17050 +static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17051 {
17052 return __pa(address);
17053 }
17054 @@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17055 return ioremap_nocache(offset, size);
17056 }
17057
17058 -extern void iounmap(volatile void __iomem *addr);
17059 +extern void iounmap(const volatile void __iomem *addr);
17060
17061 extern void set_iounmap_nonlazy(void);
17062
17063 @@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
17064
17065 #include <linux/vmalloc.h>
17066
17067 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17068 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17069 +{
17070 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17071 +}
17072 +
17073 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17074 +{
17075 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17076 +}
17077 +
17078 /*
17079 * Convert a virtual cached pointer to an uncached pointer
17080 */
17081 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17082 index 0a8b519..80e7d5b 100644
17083 --- a/arch/x86/include/asm/irqflags.h
17084 +++ b/arch/x86/include/asm/irqflags.h
17085 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17086 sti; \
17087 sysexit
17088
17089 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
17090 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17091 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
17092 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17093 +
17094 #else
17095 #define INTERRUPT_RETURN iret
17096 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17097 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17098 index 4421b5d..8543006 100644
17099 --- a/arch/x86/include/asm/kprobes.h
17100 +++ b/arch/x86/include/asm/kprobes.h
17101 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17102 #define RELATIVEJUMP_SIZE 5
17103 #define RELATIVECALL_OPCODE 0xe8
17104 #define RELATIVE_ADDR_SIZE 4
17105 -#define MAX_STACK_SIZE 64
17106 -#define MIN_STACK_SIZE(ADDR) \
17107 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17108 - THREAD_SIZE - (unsigned long)(ADDR))) \
17109 - ? (MAX_STACK_SIZE) \
17110 - : (((unsigned long)current_thread_info()) + \
17111 - THREAD_SIZE - (unsigned long)(ADDR)))
17112 +#define MAX_STACK_SIZE 64UL
17113 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17114
17115 #define flush_insn_slot(p) do { } while (0)
17116
17117 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
17118 index 6ed0c30..74fb6c3 100644
17119 --- a/arch/x86/include/asm/kvm_host.h
17120 +++ b/arch/x86/include/asm/kvm_host.h
17121 @@ -51,6 +51,7 @@
17122 | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
17123
17124 #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
17125 +#define CR3_PCID_INVD (1UL << 63)
17126 #define CR4_RESERVED_BITS \
17127 (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
17128 | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
17129 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17130 index 4ad6560..75c7bdd 100644
17131 --- a/arch/x86/include/asm/local.h
17132 +++ b/arch/x86/include/asm/local.h
17133 @@ -10,33 +10,97 @@ typedef struct {
17134 atomic_long_t a;
17135 } local_t;
17136
17137 +typedef struct {
17138 + atomic_long_unchecked_t a;
17139 +} local_unchecked_t;
17140 +
17141 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17142
17143 #define local_read(l) atomic_long_read(&(l)->a)
17144 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17145 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17146 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17147
17148 static inline void local_inc(local_t *l)
17149 {
17150 - asm volatile(_ASM_INC "%0"
17151 + asm volatile(_ASM_INC "%0\n"
17152 +
17153 +#ifdef CONFIG_PAX_REFCOUNT
17154 + "jno 0f\n"
17155 + _ASM_DEC "%0\n"
17156 + "int $4\n0:\n"
17157 + _ASM_EXTABLE(0b, 0b)
17158 +#endif
17159 +
17160 + : "+m" (l->a.counter));
17161 +}
17162 +
17163 +static inline void local_inc_unchecked(local_unchecked_t *l)
17164 +{
17165 + asm volatile(_ASM_INC "%0\n"
17166 : "+m" (l->a.counter));
17167 }
17168
17169 static inline void local_dec(local_t *l)
17170 {
17171 - asm volatile(_ASM_DEC "%0"
17172 + asm volatile(_ASM_DEC "%0\n"
17173 +
17174 +#ifdef CONFIG_PAX_REFCOUNT
17175 + "jno 0f\n"
17176 + _ASM_INC "%0\n"
17177 + "int $4\n0:\n"
17178 + _ASM_EXTABLE(0b, 0b)
17179 +#endif
17180 +
17181 + : "+m" (l->a.counter));
17182 +}
17183 +
17184 +static inline void local_dec_unchecked(local_unchecked_t *l)
17185 +{
17186 + asm volatile(_ASM_DEC "%0\n"
17187 : "+m" (l->a.counter));
17188 }
17189
17190 static inline void local_add(long i, local_t *l)
17191 {
17192 - asm volatile(_ASM_ADD "%1,%0"
17193 + asm volatile(_ASM_ADD "%1,%0\n"
17194 +
17195 +#ifdef CONFIG_PAX_REFCOUNT
17196 + "jno 0f\n"
17197 + _ASM_SUB "%1,%0\n"
17198 + "int $4\n0:\n"
17199 + _ASM_EXTABLE(0b, 0b)
17200 +#endif
17201 +
17202 + : "+m" (l->a.counter)
17203 + : "ir" (i));
17204 +}
17205 +
17206 +static inline void local_add_unchecked(long i, local_unchecked_t *l)
17207 +{
17208 + asm volatile(_ASM_ADD "%1,%0\n"
17209 : "+m" (l->a.counter)
17210 : "ir" (i));
17211 }
17212
17213 static inline void local_sub(long i, local_t *l)
17214 {
17215 - asm volatile(_ASM_SUB "%1,%0"
17216 + asm volatile(_ASM_SUB "%1,%0\n"
17217 +
17218 +#ifdef CONFIG_PAX_REFCOUNT
17219 + "jno 0f\n"
17220 + _ASM_ADD "%1,%0\n"
17221 + "int $4\n0:\n"
17222 + _ASM_EXTABLE(0b, 0b)
17223 +#endif
17224 +
17225 + : "+m" (l->a.counter)
17226 + : "ir" (i));
17227 +}
17228 +
17229 +static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17230 +{
17231 + asm volatile(_ASM_SUB "%1,%0\n"
17232 : "+m" (l->a.counter)
17233 : "ir" (i));
17234 }
17235 @@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17236 */
17237 static inline int local_sub_and_test(long i, local_t *l)
17238 {
17239 - GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17240 + GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17241 }
17242
17243 /**
17244 @@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17245 */
17246 static inline int local_dec_and_test(local_t *l)
17247 {
17248 - GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17249 + GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17250 }
17251
17252 /**
17253 @@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17254 */
17255 static inline int local_inc_and_test(local_t *l)
17256 {
17257 - GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17258 + GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17259 }
17260
17261 /**
17262 @@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17263 */
17264 static inline int local_add_negative(long i, local_t *l)
17265 {
17266 - GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17267 + GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17268 }
17269
17270 /**
17271 @@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17272 static inline long local_add_return(long i, local_t *l)
17273 {
17274 long __i = i;
17275 + asm volatile(_ASM_XADD "%0, %1\n"
17276 +
17277 +#ifdef CONFIG_PAX_REFCOUNT
17278 + "jno 0f\n"
17279 + _ASM_MOV "%0,%1\n"
17280 + "int $4\n0:\n"
17281 + _ASM_EXTABLE(0b, 0b)
17282 +#endif
17283 +
17284 + : "+r" (i), "+m" (l->a.counter)
17285 + : : "memory");
17286 + return i + __i;
17287 +}
17288 +
17289 +/**
17290 + * local_add_return_unchecked - add and return
17291 + * @i: integer value to add
17292 + * @l: pointer to type local_unchecked_t
17293 + *
17294 + * Atomically adds @i to @l and returns @i + @l
17295 + */
17296 +static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17297 +{
17298 + long __i = i;
17299 asm volatile(_ASM_XADD "%0, %1;"
17300 : "+r" (i), "+m" (l->a.counter)
17301 : : "memory");
17302 @@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17303
17304 #define local_cmpxchg(l, o, n) \
17305 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17306 +#define local_cmpxchg_unchecked(l, o, n) \
17307 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
17308 /* Always has a lock prefix */
17309 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17310
17311 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17312 new file mode 100644
17313 index 0000000..2bfd3ba
17314 --- /dev/null
17315 +++ b/arch/x86/include/asm/mman.h
17316 @@ -0,0 +1,15 @@
17317 +#ifndef _X86_MMAN_H
17318 +#define _X86_MMAN_H
17319 +
17320 +#include <uapi/asm/mman.h>
17321 +
17322 +#ifdef __KERNEL__
17323 +#ifndef __ASSEMBLY__
17324 +#ifdef CONFIG_X86_32
17325 +#define arch_mmap_check i386_mmap_check
17326 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17327 +#endif
17328 +#endif
17329 +#endif
17330 +
17331 +#endif /* X86_MMAN_H */
17332 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17333 index 876e74e..e20bfb1 100644
17334 --- a/arch/x86/include/asm/mmu.h
17335 +++ b/arch/x86/include/asm/mmu.h
17336 @@ -9,7 +9,7 @@
17337 * we put the segment information here.
17338 */
17339 typedef struct {
17340 - void *ldt;
17341 + struct desc_struct *ldt;
17342 int size;
17343
17344 #ifdef CONFIG_X86_64
17345 @@ -18,7 +18,19 @@ typedef struct {
17346 #endif
17347
17348 struct mutex lock;
17349 - void __user *vdso;
17350 + unsigned long vdso;
17351 +
17352 +#ifdef CONFIG_X86_32
17353 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17354 + unsigned long user_cs_base;
17355 + unsigned long user_cs_limit;
17356 +
17357 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17358 + cpumask_t cpu_user_cs_mask;
17359 +#endif
17360 +
17361 +#endif
17362 +#endif
17363 } mm_context_t;
17364
17365 #ifdef CONFIG_SMP
17366 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17367 index 166af2a..648c200 100644
17368 --- a/arch/x86/include/asm/mmu_context.h
17369 +++ b/arch/x86/include/asm/mmu_context.h
17370 @@ -28,6 +28,20 @@ void destroy_context(struct mm_struct *mm);
17371
17372 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17373 {
17374 +
17375 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17376 + if (!(static_cpu_has(X86_FEATURE_PCID))) {
17377 + unsigned int i;
17378 + pgd_t *pgd;
17379 +
17380 + pax_open_kernel();
17381 + pgd = get_cpu_pgd(smp_processor_id(), kernel);
17382 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17383 + set_pgd_batched(pgd+i, native_make_pgd(0));
17384 + pax_close_kernel();
17385 + }
17386 +#endif
17387 +
17388 #ifdef CONFIG_SMP
17389 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17390 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17391 @@ -38,16 +52,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17392 struct task_struct *tsk)
17393 {
17394 unsigned cpu = smp_processor_id();
17395 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17396 + int tlbstate = TLBSTATE_OK;
17397 +#endif
17398
17399 if (likely(prev != next)) {
17400 #ifdef CONFIG_SMP
17401 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17402 + tlbstate = this_cpu_read(cpu_tlbstate.state);
17403 +#endif
17404 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17405 this_cpu_write(cpu_tlbstate.active_mm, next);
17406 #endif
17407 cpumask_set_cpu(cpu, mm_cpumask(next));
17408
17409 /* Re-load page tables */
17410 +#ifdef CONFIG_PAX_PER_CPU_PGD
17411 + pax_open_kernel();
17412 +
17413 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17414 + if (static_cpu_has(X86_FEATURE_PCID))
17415 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17416 + else
17417 +#endif
17418 +
17419 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17420 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17421 + pax_close_kernel();
17422 + 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));
17423 +
17424 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17425 + if (static_cpu_has(X86_FEATURE_PCID)) {
17426 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17427 + u64 descriptor[2];
17428 + descriptor[0] = PCID_USER;
17429 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17430 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17431 + descriptor[0] = PCID_KERNEL;
17432 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17433 + }
17434 + } else {
17435 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17436 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17437 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17438 + else
17439 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17440 + }
17441 + } else
17442 +#endif
17443 +
17444 + load_cr3(get_cpu_pgd(cpu, kernel));
17445 +#else
17446 load_cr3(next->pgd);
17447 +#endif
17448 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17449
17450 /* Stop flush ipis for the previous mm */
17451 @@ -56,9 +113,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17452 /* Load the LDT, if the LDT is different: */
17453 if (unlikely(prev->context.ldt != next->context.ldt))
17454 load_LDT_nolock(&next->context);
17455 +
17456 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17457 + if (!(__supported_pte_mask & _PAGE_NX)) {
17458 + smp_mb__before_atomic();
17459 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17460 + smp_mb__after_atomic();
17461 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17462 + }
17463 +#endif
17464 +
17465 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17466 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17467 + prev->context.user_cs_limit != next->context.user_cs_limit))
17468 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17469 +#ifdef CONFIG_SMP
17470 + else if (unlikely(tlbstate != TLBSTATE_OK))
17471 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17472 +#endif
17473 +#endif
17474 +
17475 }
17476 + else {
17477 +
17478 +#ifdef CONFIG_PAX_PER_CPU_PGD
17479 + pax_open_kernel();
17480 +
17481 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17482 + if (static_cpu_has(X86_FEATURE_PCID))
17483 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17484 + else
17485 +#endif
17486 +
17487 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17488 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17489 + pax_close_kernel();
17490 + 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));
17491 +
17492 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17493 + if (static_cpu_has(X86_FEATURE_PCID)) {
17494 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17495 + u64 descriptor[2];
17496 + descriptor[0] = PCID_USER;
17497 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17498 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17499 + descriptor[0] = PCID_KERNEL;
17500 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17501 + }
17502 + } else {
17503 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17504 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17505 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17506 + else
17507 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17508 + }
17509 + } else
17510 +#endif
17511 +
17512 + load_cr3(get_cpu_pgd(cpu, kernel));
17513 +#endif
17514 +
17515 #ifdef CONFIG_SMP
17516 - else {
17517 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17518 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17519
17520 @@ -75,12 +190,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17521 * tlb flush IPI delivery. We must reload CR3
17522 * to make sure to use no freed page tables.
17523 */
17524 +
17525 +#ifndef CONFIG_PAX_PER_CPU_PGD
17526 load_cr3(next->pgd);
17527 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17528 +#endif
17529 +
17530 load_LDT_nolock(&next->context);
17531 +
17532 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17533 + if (!(__supported_pte_mask & _PAGE_NX))
17534 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17535 +#endif
17536 +
17537 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17538 +#ifdef CONFIG_PAX_PAGEEXEC
17539 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17540 +#endif
17541 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17542 +#endif
17543 +
17544 }
17545 +#endif
17546 }
17547 -#endif
17548 }
17549
17550 #define activate_mm(prev, next) \
17551 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17552 index e3b7819..b257c64 100644
17553 --- a/arch/x86/include/asm/module.h
17554 +++ b/arch/x86/include/asm/module.h
17555 @@ -5,6 +5,7 @@
17556
17557 #ifdef CONFIG_X86_64
17558 /* X86_64 does not define MODULE_PROC_FAMILY */
17559 +#define MODULE_PROC_FAMILY ""
17560 #elif defined CONFIG_M486
17561 #define MODULE_PROC_FAMILY "486 "
17562 #elif defined CONFIG_M586
17563 @@ -57,8 +58,20 @@
17564 #error unknown processor family
17565 #endif
17566
17567 -#ifdef CONFIG_X86_32
17568 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17569 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17570 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17571 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17572 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17573 +#else
17574 +#define MODULE_PAX_KERNEXEC ""
17575 #endif
17576
17577 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17578 +#define MODULE_PAX_UDEREF "UDEREF "
17579 +#else
17580 +#define MODULE_PAX_UDEREF ""
17581 +#endif
17582 +
17583 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17584 +
17585 #endif /* _ASM_X86_MODULE_H */
17586 diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17587 index 5f2fc44..106caa6 100644
17588 --- a/arch/x86/include/asm/nmi.h
17589 +++ b/arch/x86/include/asm/nmi.h
17590 @@ -36,26 +36,35 @@ enum {
17591
17592 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17593
17594 +struct nmiaction;
17595 +
17596 +struct nmiwork {
17597 + const struct nmiaction *action;
17598 + u64 max_duration;
17599 + struct irq_work irq_work;
17600 +};
17601 +
17602 struct nmiaction {
17603 struct list_head list;
17604 nmi_handler_t handler;
17605 - u64 max_duration;
17606 - struct irq_work irq_work;
17607 unsigned long flags;
17608 const char *name;
17609 -};
17610 + struct nmiwork *work;
17611 +} __do_const;
17612
17613 #define register_nmi_handler(t, fn, fg, n, init...) \
17614 ({ \
17615 - static struct nmiaction init fn##_na = { \
17616 + static struct nmiwork fn##_nw; \
17617 + static const struct nmiaction init fn##_na = { \
17618 .handler = (fn), \
17619 .name = (n), \
17620 .flags = (fg), \
17621 + .work = &fn##_nw, \
17622 }; \
17623 __register_nmi_handler((t), &fn##_na); \
17624 })
17625
17626 -int __register_nmi_handler(unsigned int, struct nmiaction *);
17627 +int __register_nmi_handler(unsigned int, const struct nmiaction *);
17628
17629 void unregister_nmi_handler(unsigned int, const char *);
17630
17631 diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17632 index 802dde3..9183e68 100644
17633 --- a/arch/x86/include/asm/page.h
17634 +++ b/arch/x86/include/asm/page.h
17635 @@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17636 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17637
17638 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17639 +#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17640
17641 #define __boot_va(x) __va(x)
17642 #define __boot_pa(x) __pa(x)
17643 @@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17644 * virt_to_page(kaddr) returns a valid pointer if and only if
17645 * virt_addr_valid(kaddr) returns true.
17646 */
17647 -#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17648 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17649 extern bool __virt_addr_valid(unsigned long kaddr);
17650 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17651
17652 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17653 +#define virt_to_page(kaddr) \
17654 + ({ \
17655 + const void *__kaddr = (const void *)(kaddr); \
17656 + BUG_ON(!virt_addr_valid(__kaddr)); \
17657 + pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17658 + })
17659 +#else
17660 +#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17661 +#endif
17662 +
17663 #endif /* __ASSEMBLY__ */
17664
17665 #include <asm-generic/memory_model.h>
17666 diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17667 index f408caf..4a0455e 100644
17668 --- a/arch/x86/include/asm/page_64.h
17669 +++ b/arch/x86/include/asm/page_64.h
17670 @@ -7,9 +7,9 @@
17671
17672 /* duplicated to the one in bootmem.h */
17673 extern unsigned long max_pfn;
17674 -extern unsigned long phys_base;
17675 +extern const unsigned long phys_base;
17676
17677 -static inline unsigned long __phys_addr_nodebug(unsigned long x)
17678 +static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17679 {
17680 unsigned long y = x - __START_KERNEL_map;
17681
17682 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17683 index cd6e1610..70f4418 100644
17684 --- a/arch/x86/include/asm/paravirt.h
17685 +++ b/arch/x86/include/asm/paravirt.h
17686 @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17687 return (pmd_t) { ret };
17688 }
17689
17690 -static inline pmdval_t pmd_val(pmd_t pmd)
17691 +static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17692 {
17693 pmdval_t ret;
17694
17695 @@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17696 val);
17697 }
17698
17699 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17700 +{
17701 + pgdval_t val = native_pgd_val(pgd);
17702 +
17703 + if (sizeof(pgdval_t) > sizeof(long))
17704 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17705 + val, (u64)val >> 32);
17706 + else
17707 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17708 + val);
17709 +}
17710 +
17711 static inline void pgd_clear(pgd_t *pgdp)
17712 {
17713 set_pgd(pgdp, __pgd(0));
17714 @@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17715 pv_mmu_ops.set_fixmap(idx, phys, flags);
17716 }
17717
17718 +#ifdef CONFIG_PAX_KERNEXEC
17719 +static inline unsigned long pax_open_kernel(void)
17720 +{
17721 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17722 +}
17723 +
17724 +static inline unsigned long pax_close_kernel(void)
17725 +{
17726 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17727 +}
17728 +#else
17729 +static inline unsigned long pax_open_kernel(void) { return 0; }
17730 +static inline unsigned long pax_close_kernel(void) { return 0; }
17731 +#endif
17732 +
17733 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17734
17735 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17736 @@ -906,7 +933,7 @@ extern void default_banner(void);
17737
17738 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17739 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17740 -#define PARA_INDIRECT(addr) *%cs:addr
17741 +#define PARA_INDIRECT(addr) *%ss:addr
17742 #endif
17743
17744 #define INTERRUPT_RETURN \
17745 @@ -981,6 +1008,21 @@ extern void default_banner(void);
17746 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17747 CLBR_NONE, \
17748 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17749 +
17750 +#define GET_CR0_INTO_RDI \
17751 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17752 + mov %rax,%rdi
17753 +
17754 +#define SET_RDI_INTO_CR0 \
17755 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17756 +
17757 +#define GET_CR3_INTO_RDI \
17758 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17759 + mov %rax,%rdi
17760 +
17761 +#define SET_RDI_INTO_CR3 \
17762 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17763 +
17764 #endif /* CONFIG_X86_32 */
17765
17766 #endif /* __ASSEMBLY__ */
17767 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17768 index 7549b8b..f0edfda 100644
17769 --- a/arch/x86/include/asm/paravirt_types.h
17770 +++ b/arch/x86/include/asm/paravirt_types.h
17771 @@ -84,7 +84,7 @@ struct pv_init_ops {
17772 */
17773 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17774 unsigned long addr, unsigned len);
17775 -};
17776 +} __no_const __no_randomize_layout;
17777
17778
17779 struct pv_lazy_ops {
17780 @@ -92,13 +92,13 @@ struct pv_lazy_ops {
17781 void (*enter)(void);
17782 void (*leave)(void);
17783 void (*flush)(void);
17784 -};
17785 +} __no_randomize_layout;
17786
17787 struct pv_time_ops {
17788 unsigned long long (*sched_clock)(void);
17789 unsigned long long (*steal_clock)(int cpu);
17790 unsigned long (*get_tsc_khz)(void);
17791 -};
17792 +} __no_const __no_randomize_layout;
17793
17794 struct pv_cpu_ops {
17795 /* hooks for various privileged instructions */
17796 @@ -192,7 +192,7 @@ struct pv_cpu_ops {
17797
17798 void (*start_context_switch)(struct task_struct *prev);
17799 void (*end_context_switch)(struct task_struct *next);
17800 -};
17801 +} __no_const __no_randomize_layout;
17802
17803 struct pv_irq_ops {
17804 /*
17805 @@ -215,7 +215,7 @@ struct pv_irq_ops {
17806 #ifdef CONFIG_X86_64
17807 void (*adjust_exception_frame)(void);
17808 #endif
17809 -};
17810 +} __no_randomize_layout;
17811
17812 struct pv_apic_ops {
17813 #ifdef CONFIG_X86_LOCAL_APIC
17814 @@ -223,7 +223,7 @@ struct pv_apic_ops {
17815 unsigned long start_eip,
17816 unsigned long start_esp);
17817 #endif
17818 -};
17819 +} __no_const __no_randomize_layout;
17820
17821 struct pv_mmu_ops {
17822 unsigned long (*read_cr2)(void);
17823 @@ -313,6 +313,7 @@ struct pv_mmu_ops {
17824 struct paravirt_callee_save make_pud;
17825
17826 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17827 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17828 #endif /* PAGETABLE_LEVELS == 4 */
17829 #endif /* PAGETABLE_LEVELS >= 3 */
17830
17831 @@ -324,7 +325,13 @@ struct pv_mmu_ops {
17832 an mfn. We can tell which is which from the index. */
17833 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17834 phys_addr_t phys, pgprot_t flags);
17835 -};
17836 +
17837 +#ifdef CONFIG_PAX_KERNEXEC
17838 + unsigned long (*pax_open_kernel)(void);
17839 + unsigned long (*pax_close_kernel)(void);
17840 +#endif
17841 +
17842 +} __no_randomize_layout;
17843
17844 struct arch_spinlock;
17845 #ifdef CONFIG_SMP
17846 @@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17847 struct pv_lock_ops {
17848 struct paravirt_callee_save lock_spinning;
17849 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17850 -};
17851 +} __no_randomize_layout;
17852
17853 /* This contains all the paravirt structures: we get a convenient
17854 * number for each function using the offset which we use to indicate
17855 - * what to patch. */
17856 + * what to patch.
17857 + * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17858 + */
17859 +
17860 struct paravirt_patch_template {
17861 struct pv_init_ops pv_init_ops;
17862 struct pv_time_ops pv_time_ops;
17863 @@ -349,7 +359,7 @@ struct paravirt_patch_template {
17864 struct pv_apic_ops pv_apic_ops;
17865 struct pv_mmu_ops pv_mmu_ops;
17866 struct pv_lock_ops pv_lock_ops;
17867 -};
17868 +} __no_randomize_layout;
17869
17870 extern struct pv_info pv_info;
17871 extern struct pv_init_ops pv_init_ops;
17872 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17873 index c4412e9..90e88c5 100644
17874 --- a/arch/x86/include/asm/pgalloc.h
17875 +++ b/arch/x86/include/asm/pgalloc.h
17876 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17877 pmd_t *pmd, pte_t *pte)
17878 {
17879 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17880 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17881 +}
17882 +
17883 +static inline void pmd_populate_user(struct mm_struct *mm,
17884 + pmd_t *pmd, pte_t *pte)
17885 +{
17886 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17887 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17888 }
17889
17890 @@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17891
17892 #ifdef CONFIG_X86_PAE
17893 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17894 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17895 +{
17896 + pud_populate(mm, pudp, pmd);
17897 +}
17898 #else /* !CONFIG_X86_PAE */
17899 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17900 {
17901 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17902 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17903 }
17904 +
17905 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17906 +{
17907 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17908 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17909 +}
17910 #endif /* CONFIG_X86_PAE */
17911
17912 #if PAGETABLE_LEVELS > 3
17913 @@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17914 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17915 }
17916
17917 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17918 +{
17919 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17920 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17921 +}
17922 +
17923 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17924 {
17925 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17926 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17927 index 206a87f..1623b06 100644
17928 --- a/arch/x86/include/asm/pgtable-2level.h
17929 +++ b/arch/x86/include/asm/pgtable-2level.h
17930 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17931
17932 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17933 {
17934 + pax_open_kernel();
17935 *pmdp = pmd;
17936 + pax_close_kernel();
17937 }
17938
17939 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17940 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17941 index 81bb91b..9392125 100644
17942 --- a/arch/x86/include/asm/pgtable-3level.h
17943 +++ b/arch/x86/include/asm/pgtable-3level.h
17944 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17945
17946 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17947 {
17948 + pax_open_kernel();
17949 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17950 + pax_close_kernel();
17951 }
17952
17953 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17954 {
17955 + pax_open_kernel();
17956 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17957 + pax_close_kernel();
17958 }
17959
17960 /*
17961 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17962 index aa97a07..5c53c32 100644
17963 --- a/arch/x86/include/asm/pgtable.h
17964 +++ b/arch/x86/include/asm/pgtable.h
17965 @@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17966
17967 #ifndef __PAGETABLE_PUD_FOLDED
17968 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17969 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17970 #define pgd_clear(pgd) native_pgd_clear(pgd)
17971 #endif
17972
17973 @@ -83,12 +84,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17974
17975 #define arch_end_context_switch(prev) do {} while(0)
17976
17977 +#define pax_open_kernel() native_pax_open_kernel()
17978 +#define pax_close_kernel() native_pax_close_kernel()
17979 #endif /* CONFIG_PARAVIRT */
17980
17981 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
17982 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17983 +
17984 +#ifdef CONFIG_PAX_KERNEXEC
17985 +static inline unsigned long native_pax_open_kernel(void)
17986 +{
17987 + unsigned long cr0;
17988 +
17989 + preempt_disable();
17990 + barrier();
17991 + cr0 = read_cr0() ^ X86_CR0_WP;
17992 + BUG_ON(cr0 & X86_CR0_WP);
17993 + write_cr0(cr0);
17994 + barrier();
17995 + return cr0 ^ X86_CR0_WP;
17996 +}
17997 +
17998 +static inline unsigned long native_pax_close_kernel(void)
17999 +{
18000 + unsigned long cr0;
18001 +
18002 + barrier();
18003 + cr0 = read_cr0() ^ X86_CR0_WP;
18004 + BUG_ON(!(cr0 & X86_CR0_WP));
18005 + write_cr0(cr0);
18006 + barrier();
18007 + preempt_enable_no_resched();
18008 + return cr0 ^ X86_CR0_WP;
18009 +}
18010 +#else
18011 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
18012 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
18013 +#endif
18014 +
18015 /*
18016 * The following only work if pte_present() is true.
18017 * Undefined behaviour if not..
18018 */
18019 +static inline int pte_user(pte_t pte)
18020 +{
18021 + return pte_val(pte) & _PAGE_USER;
18022 +}
18023 +
18024 static inline int pte_dirty(pte_t pte)
18025 {
18026 return pte_flags(pte) & _PAGE_DIRTY;
18027 @@ -155,6 +197,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18028 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18029 }
18030
18031 +static inline unsigned long pgd_pfn(pgd_t pgd)
18032 +{
18033 + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18034 +}
18035 +
18036 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18037
18038 static inline int pmd_large(pmd_t pte)
18039 @@ -208,9 +255,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18040 return pte_clear_flags(pte, _PAGE_RW);
18041 }
18042
18043 +static inline pte_t pte_mkread(pte_t pte)
18044 +{
18045 + return __pte(pte_val(pte) | _PAGE_USER);
18046 +}
18047 +
18048 static inline pte_t pte_mkexec(pte_t pte)
18049 {
18050 - return pte_clear_flags(pte, _PAGE_NX);
18051 +#ifdef CONFIG_X86_PAE
18052 + if (__supported_pte_mask & _PAGE_NX)
18053 + return pte_clear_flags(pte, _PAGE_NX);
18054 + else
18055 +#endif
18056 + return pte_set_flags(pte, _PAGE_USER);
18057 +}
18058 +
18059 +static inline pte_t pte_exprotect(pte_t pte)
18060 +{
18061 +#ifdef CONFIG_X86_PAE
18062 + if (__supported_pte_mask & _PAGE_NX)
18063 + return pte_set_flags(pte, _PAGE_NX);
18064 + else
18065 +#endif
18066 + return pte_clear_flags(pte, _PAGE_USER);
18067 }
18068
18069 static inline pte_t pte_mkdirty(pte_t pte)
18070 @@ -440,6 +507,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18071 #endif
18072
18073 #ifndef __ASSEMBLY__
18074 +
18075 +#ifdef CONFIG_PAX_PER_CPU_PGD
18076 +extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18077 +enum cpu_pgd_type {kernel = 0, user = 1};
18078 +static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18079 +{
18080 + return cpu_pgd[cpu][type];
18081 +}
18082 +#endif
18083 +
18084 #include <linux/mm_types.h>
18085 #include <linux/mmdebug.h>
18086 #include <linux/log2.h>
18087 @@ -586,7 +663,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18088 * Currently stuck as a macro due to indirect forward reference to
18089 * linux/mmzone.h's __section_mem_map_addr() definition:
18090 */
18091 -#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18092 +#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18093
18094 /* Find an entry in the second-level page table.. */
18095 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18096 @@ -626,7 +703,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18097 * Currently stuck as a macro due to indirect forward reference to
18098 * linux/mmzone.h's __section_mem_map_addr() definition:
18099 */
18100 -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18101 +#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18102
18103 /* to find an entry in a page-table-directory. */
18104 static inline unsigned long pud_index(unsigned long address)
18105 @@ -641,7 +718,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18106
18107 static inline int pgd_bad(pgd_t pgd)
18108 {
18109 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18110 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18111 }
18112
18113 static inline int pgd_none(pgd_t pgd)
18114 @@ -664,7 +741,12 @@ static inline int pgd_none(pgd_t pgd)
18115 * pgd_offset() returns a (pgd_t *)
18116 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18117 */
18118 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18119 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18120 +
18121 +#ifdef CONFIG_PAX_PER_CPU_PGD
18122 +#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18123 +#endif
18124 +
18125 /*
18126 * a shortcut which implies the use of the kernel's pgd, instead
18127 * of a process's
18128 @@ -675,6 +757,23 @@ static inline int pgd_none(pgd_t pgd)
18129 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18130 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18131
18132 +#ifdef CONFIG_X86_32
18133 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18134 +#else
18135 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18136 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18137 +
18138 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18139 +#ifdef __ASSEMBLY__
18140 +#define pax_user_shadow_base pax_user_shadow_base(%rip)
18141 +#else
18142 +extern unsigned long pax_user_shadow_base;
18143 +extern pgdval_t clone_pgd_mask;
18144 +#endif
18145 +#endif
18146 +
18147 +#endif
18148 +
18149 #ifndef __ASSEMBLY__
18150
18151 extern int direct_gbpages;
18152 @@ -841,11 +940,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18153 * dst and src can be on the same page, but the range must not overlap,
18154 * and must not cross a page boundary.
18155 */
18156 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18157 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18158 {
18159 - memcpy(dst, src, count * sizeof(pgd_t));
18160 + pax_open_kernel();
18161 + while (count--)
18162 + *dst++ = *src++;
18163 + pax_close_kernel();
18164 }
18165
18166 +#ifdef CONFIG_PAX_PER_CPU_PGD
18167 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18168 +#endif
18169 +
18170 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18171 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18172 +#else
18173 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18174 +#endif
18175 +
18176 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18177 static inline int page_level_shift(enum pg_level level)
18178 {
18179 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18180 index b6c0b40..3535d47 100644
18181 --- a/arch/x86/include/asm/pgtable_32.h
18182 +++ b/arch/x86/include/asm/pgtable_32.h
18183 @@ -25,9 +25,6 @@
18184 struct mm_struct;
18185 struct vm_area_struct;
18186
18187 -extern pgd_t swapper_pg_dir[1024];
18188 -extern pgd_t initial_page_table[1024];
18189 -
18190 static inline void pgtable_cache_init(void) { }
18191 static inline void check_pgt_cache(void) { }
18192 void paging_init(void);
18193 @@ -45,6 +42,12 @@ void paging_init(void);
18194 # include <asm/pgtable-2level.h>
18195 #endif
18196
18197 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18198 +extern pgd_t initial_page_table[PTRS_PER_PGD];
18199 +#ifdef CONFIG_X86_PAE
18200 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18201 +#endif
18202 +
18203 #if defined(CONFIG_HIGHPTE)
18204 #define pte_offset_map(dir, address) \
18205 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18206 @@ -59,12 +62,17 @@ void paging_init(void);
18207 /* Clear a kernel PTE and flush it from the TLB */
18208 #define kpte_clear_flush(ptep, vaddr) \
18209 do { \
18210 + pax_open_kernel(); \
18211 pte_clear(&init_mm, (vaddr), (ptep)); \
18212 + pax_close_kernel(); \
18213 __flush_tlb_one((vaddr)); \
18214 } while (0)
18215
18216 #endif /* !__ASSEMBLY__ */
18217
18218 +#define HAVE_ARCH_UNMAPPED_AREA
18219 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18220 +
18221 /*
18222 * kern_addr_valid() is (1) for FLATMEM and (0) for
18223 * SPARSEMEM and DISCONTIGMEM
18224 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18225 index ed5903b..c7fe163 100644
18226 --- a/arch/x86/include/asm/pgtable_32_types.h
18227 +++ b/arch/x86/include/asm/pgtable_32_types.h
18228 @@ -8,7 +8,7 @@
18229 */
18230 #ifdef CONFIG_X86_PAE
18231 # include <asm/pgtable-3level_types.h>
18232 -# define PMD_SIZE (1UL << PMD_SHIFT)
18233 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18234 # define PMD_MASK (~(PMD_SIZE - 1))
18235 #else
18236 # include <asm/pgtable-2level_types.h>
18237 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18238 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18239 #endif
18240
18241 +#ifdef CONFIG_PAX_KERNEXEC
18242 +#ifndef __ASSEMBLY__
18243 +extern unsigned char MODULES_EXEC_VADDR[];
18244 +extern unsigned char MODULES_EXEC_END[];
18245 +#endif
18246 +#include <asm/boot.h>
18247 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18248 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18249 +#else
18250 +#define ktla_ktva(addr) (addr)
18251 +#define ktva_ktla(addr) (addr)
18252 +#endif
18253 +
18254 #define MODULES_VADDR VMALLOC_START
18255 #define MODULES_END VMALLOC_END
18256 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18257 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18258 index 4572b2f..4430113 100644
18259 --- a/arch/x86/include/asm/pgtable_64.h
18260 +++ b/arch/x86/include/asm/pgtable_64.h
18261 @@ -16,11 +16,16 @@
18262
18263 extern pud_t level3_kernel_pgt[512];
18264 extern pud_t level3_ident_pgt[512];
18265 +extern pud_t level3_vmalloc_start_pgt[512];
18266 +extern pud_t level3_vmalloc_end_pgt[512];
18267 +extern pud_t level3_vmemmap_pgt[512];
18268 +extern pud_t level2_vmemmap_pgt[512];
18269 extern pmd_t level2_kernel_pgt[512];
18270 extern pmd_t level2_fixmap_pgt[512];
18271 -extern pmd_t level2_ident_pgt[512];
18272 +extern pmd_t level2_ident_pgt[512*2];
18273 extern pte_t level1_fixmap_pgt[512];
18274 -extern pgd_t init_level4_pgt[];
18275 +extern pte_t level1_vsyscall_pgt[512];
18276 +extern pgd_t init_level4_pgt[512];
18277
18278 #define swapper_pg_dir init_level4_pgt
18279
18280 @@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18281
18282 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18283 {
18284 + pax_open_kernel();
18285 *pmdp = pmd;
18286 + pax_close_kernel();
18287 }
18288
18289 static inline void native_pmd_clear(pmd_t *pmd)
18290 @@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18291
18292 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18293 {
18294 + pax_open_kernel();
18295 *pudp = pud;
18296 + pax_close_kernel();
18297 }
18298
18299 static inline void native_pud_clear(pud_t *pud)
18300 @@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18301
18302 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18303 {
18304 + pax_open_kernel();
18305 + *pgdp = pgd;
18306 + pax_close_kernel();
18307 +}
18308 +
18309 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18310 +{
18311 *pgdp = pgd;
18312 }
18313
18314 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18315 index 7166e25..baaa6fe 100644
18316 --- a/arch/x86/include/asm/pgtable_64_types.h
18317 +++ b/arch/x86/include/asm/pgtable_64_types.h
18318 @@ -61,9 +61,14 @@ typedef struct { pteval_t pte; } pte_t;
18319 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18320 #define MODULES_END _AC(0xffffffffff000000, UL)
18321 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18322 +#define MODULES_EXEC_VADDR MODULES_VADDR
18323 +#define MODULES_EXEC_END MODULES_END
18324 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18325 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18326
18327 +#define ktla_ktva(addr) (addr)
18328 +#define ktva_ktla(addr) (addr)
18329 +
18330 #define EARLY_DYNAMIC_PAGE_TABLES 64
18331
18332 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18333 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18334 index 0778964..0e94758 100644
18335 --- a/arch/x86/include/asm/pgtable_types.h
18336 +++ b/arch/x86/include/asm/pgtable_types.h
18337 @@ -110,8 +110,10 @@
18338
18339 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18340 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18341 -#else
18342 +#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18343 #define _PAGE_NX (_AT(pteval_t, 0))
18344 +#else
18345 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18346 #endif
18347
18348 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18349 @@ -150,6 +152,9 @@
18350 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18351 _PAGE_ACCESSED)
18352
18353 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
18354 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
18355 +
18356 #define __PAGE_KERNEL_EXEC \
18357 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18358 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18359 @@ -160,7 +165,7 @@
18360 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18361 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18362 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18363 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18364 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18365 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18366 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18367 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18368 @@ -217,7 +222,7 @@
18369 #ifdef CONFIG_X86_64
18370 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18371 #else
18372 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18373 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18374 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18375 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18376 #endif
18377 @@ -256,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18378 {
18379 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18380 }
18381 +#endif
18382
18383 +#if PAGETABLE_LEVELS == 3
18384 +#include <asm-generic/pgtable-nopud.h>
18385 +#endif
18386 +
18387 +#if PAGETABLE_LEVELS == 2
18388 +#include <asm-generic/pgtable-nopmd.h>
18389 +#endif
18390 +
18391 +#ifndef __ASSEMBLY__
18392 #if PAGETABLE_LEVELS > 3
18393 typedef struct { pudval_t pud; } pud_t;
18394
18395 @@ -270,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18396 return pud.pud;
18397 }
18398 #else
18399 -#include <asm-generic/pgtable-nopud.h>
18400 -
18401 static inline pudval_t native_pud_val(pud_t pud)
18402 {
18403 return native_pgd_val(pud.pgd);
18404 @@ -291,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18405 return pmd.pmd;
18406 }
18407 #else
18408 -#include <asm-generic/pgtable-nopmd.h>
18409 -
18410 static inline pmdval_t native_pmd_val(pmd_t pmd)
18411 {
18412 return native_pgd_val(pmd.pud.pgd);
18413 @@ -346,7 +357,6 @@ typedef struct page *pgtable_t;
18414
18415 extern pteval_t __supported_pte_mask;
18416 extern void set_nx(void);
18417 -extern int nx_enabled;
18418
18419 #define pgprot_writecombine pgprot_writecombine
18420 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18421 diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18422 index 4008734..48f0d81 100644
18423 --- a/arch/x86/include/asm/preempt.h
18424 +++ b/arch/x86/include/asm/preempt.h
18425 @@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18426 */
18427 static __always_inline bool __preempt_count_dec_and_test(void)
18428 {
18429 - GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18430 + GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18431 }
18432
18433 /*
18434 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18435 index eb71ec7..f06532a 100644
18436 --- a/arch/x86/include/asm/processor.h
18437 +++ b/arch/x86/include/asm/processor.h
18438 @@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18439 /* Index into per_cpu list: */
18440 u16 cpu_index;
18441 u32 microcode;
18442 -} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18443 +} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18444
18445 #define X86_VENDOR_INTEL 0
18446 #define X86_VENDOR_CYRIX 1
18447 @@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18448 : "memory");
18449 }
18450
18451 +/* invpcid (%rdx),%rax */
18452 +#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18453 +
18454 +#define INVPCID_SINGLE_ADDRESS 0UL
18455 +#define INVPCID_SINGLE_CONTEXT 1UL
18456 +#define INVPCID_ALL_GLOBAL 2UL
18457 +#define INVPCID_ALL_NONGLOBAL 3UL
18458 +
18459 +#define PCID_KERNEL 0UL
18460 +#define PCID_USER 1UL
18461 +#define PCID_NOFLUSH (1UL << 63)
18462 +
18463 static inline void load_cr3(pgd_t *pgdir)
18464 {
18465 - write_cr3(__pa(pgdir));
18466 + write_cr3(__pa(pgdir) | PCID_KERNEL);
18467 }
18468
18469 #ifdef CONFIG_X86_32
18470 @@ -282,7 +294,7 @@ struct tss_struct {
18471
18472 } ____cacheline_aligned;
18473
18474 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18475 +extern struct tss_struct init_tss[NR_CPUS];
18476
18477 /*
18478 * Save the original ist values for checking stack pointers during debugging
18479 @@ -478,6 +490,7 @@ struct thread_struct {
18480 unsigned short ds;
18481 unsigned short fsindex;
18482 unsigned short gsindex;
18483 + unsigned short ss;
18484 #endif
18485 #ifdef CONFIG_X86_32
18486 unsigned long ip;
18487 @@ -587,29 +600,8 @@ static inline void load_sp0(struct tss_struct *tss,
18488 extern unsigned long mmu_cr4_features;
18489 extern u32 *trampoline_cr4_features;
18490
18491 -static inline void set_in_cr4(unsigned long mask)
18492 -{
18493 - unsigned long cr4;
18494 -
18495 - mmu_cr4_features |= mask;
18496 - if (trampoline_cr4_features)
18497 - *trampoline_cr4_features = mmu_cr4_features;
18498 - cr4 = read_cr4();
18499 - cr4 |= mask;
18500 - write_cr4(cr4);
18501 -}
18502 -
18503 -static inline void clear_in_cr4(unsigned long mask)
18504 -{
18505 - unsigned long cr4;
18506 -
18507 - mmu_cr4_features &= ~mask;
18508 - if (trampoline_cr4_features)
18509 - *trampoline_cr4_features = mmu_cr4_features;
18510 - cr4 = read_cr4();
18511 - cr4 &= ~mask;
18512 - write_cr4(cr4);
18513 -}
18514 +extern void set_in_cr4(unsigned long mask);
18515 +extern void clear_in_cr4(unsigned long mask);
18516
18517 typedef struct {
18518 unsigned long seg;
18519 @@ -837,11 +829,18 @@ static inline void spin_lock_prefetch(const void *x)
18520 */
18521 #define TASK_SIZE PAGE_OFFSET
18522 #define TASK_SIZE_MAX TASK_SIZE
18523 +
18524 +#ifdef CONFIG_PAX_SEGMEXEC
18525 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18526 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18527 +#else
18528 #define STACK_TOP TASK_SIZE
18529 -#define STACK_TOP_MAX STACK_TOP
18530 +#endif
18531 +
18532 +#define STACK_TOP_MAX TASK_SIZE
18533
18534 #define INIT_THREAD { \
18535 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18536 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18537 .vm86_info = NULL, \
18538 .sysenter_cs = __KERNEL_CS, \
18539 .io_bitmap_ptr = NULL, \
18540 @@ -855,7 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18541 */
18542 #define INIT_TSS { \
18543 .x86_tss = { \
18544 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18545 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18546 .ss0 = __KERNEL_DS, \
18547 .ss1 = __KERNEL_CS, \
18548 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18549 @@ -866,11 +865,7 @@ static inline void spin_lock_prefetch(const void *x)
18550 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18551
18552 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18553 -#define KSTK_TOP(info) \
18554 -({ \
18555 - unsigned long *__ptr = (unsigned long *)(info); \
18556 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18557 -})
18558 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18559
18560 /*
18561 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18562 @@ -885,7 +880,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18563 #define task_pt_regs(task) \
18564 ({ \
18565 struct pt_regs *__regs__; \
18566 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18567 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18568 __regs__ - 1; \
18569 })
18570
18571 @@ -895,13 +890,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18572 /*
18573 * User space process size. 47bits minus one guard page.
18574 */
18575 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18576 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18577
18578 /* This decides where the kernel will search for a free chunk of vm
18579 * space during mmap's.
18580 */
18581 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18582 - 0xc0000000 : 0xFFFFe000)
18583 + 0xc0000000 : 0xFFFFf000)
18584
18585 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18586 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18587 @@ -912,11 +907,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18588 #define STACK_TOP_MAX TASK_SIZE_MAX
18589
18590 #define INIT_THREAD { \
18591 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18592 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18593 }
18594
18595 #define INIT_TSS { \
18596 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18597 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18598 }
18599
18600 /*
18601 @@ -944,6 +939,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18602 */
18603 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18604
18605 +#ifdef CONFIG_PAX_SEGMEXEC
18606 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18607 +#endif
18608 +
18609 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18610
18611 /* Get/set a process' ability to use the timestamp counter instruction */
18612 @@ -970,7 +969,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18613 return 0;
18614 }
18615
18616 -extern unsigned long arch_align_stack(unsigned long sp);
18617 +#define arch_align_stack(x) ((x) & ~0xfUL)
18618 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18619
18620 void default_idle(void);
18621 @@ -980,6 +979,6 @@ bool xen_set_default_idle(void);
18622 #define xen_set_default_idle 0
18623 #endif
18624
18625 -void stop_this_cpu(void *dummy);
18626 +void stop_this_cpu(void *dummy) __noreturn;
18627 void df_debug(struct pt_regs *regs, long error_code);
18628 #endif /* _ASM_X86_PROCESSOR_H */
18629 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18630 index 86fc2bb..bd5049a 100644
18631 --- a/arch/x86/include/asm/ptrace.h
18632 +++ b/arch/x86/include/asm/ptrace.h
18633 @@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18634 }
18635
18636 /*
18637 - * user_mode_vm(regs) determines whether a register set came from user mode.
18638 + * user_mode(regs) determines whether a register set came from user mode.
18639 * This is true if V8086 mode was enabled OR if the register set was from
18640 * protected mode with RPL-3 CS value. This tricky test checks that with
18641 * one comparison. Many places in the kernel can bypass this full check
18642 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18643 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18644 + * be used.
18645 */
18646 -static inline int user_mode(struct pt_regs *regs)
18647 +static inline int user_mode_novm(struct pt_regs *regs)
18648 {
18649 #ifdef CONFIG_X86_32
18650 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18651 #else
18652 - return !!(regs->cs & 3);
18653 + return !!(regs->cs & SEGMENT_RPL_MASK);
18654 #endif
18655 }
18656
18657 -static inline int user_mode_vm(struct pt_regs *regs)
18658 +static inline int user_mode(struct pt_regs *regs)
18659 {
18660 #ifdef CONFIG_X86_32
18661 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18662 USER_RPL;
18663 #else
18664 - return user_mode(regs);
18665 + return user_mode_novm(regs);
18666 #endif
18667 }
18668
18669 @@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18670 #ifdef CONFIG_X86_64
18671 static inline bool user_64bit_mode(struct pt_regs *regs)
18672 {
18673 + unsigned long cs = regs->cs & 0xffff;
18674 #ifndef CONFIG_PARAVIRT
18675 /*
18676 * On non-paravirt systems, this is the only long mode CPL 3
18677 * selector. We do not allow long mode selectors in the LDT.
18678 */
18679 - return regs->cs == __USER_CS;
18680 + return cs == __USER_CS;
18681 #else
18682 /* Headers are too twisted for this to go in paravirt.h. */
18683 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18684 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18685 #endif
18686 }
18687
18688 @@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18689 * Traps from the kernel do not save sp and ss.
18690 * Use the helper function to retrieve sp.
18691 */
18692 - if (offset == offsetof(struct pt_regs, sp) &&
18693 - regs->cs == __KERNEL_CS)
18694 - return kernel_stack_pointer(regs);
18695 + if (offset == offsetof(struct pt_regs, sp)) {
18696 + unsigned long cs = regs->cs & 0xffff;
18697 + if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18698 + return kernel_stack_pointer(regs);
18699 + }
18700 #endif
18701 return *(unsigned long *)((unsigned long)regs + offset);
18702 }
18703 diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18704 index ae0e241..e80b10b 100644
18705 --- a/arch/x86/include/asm/qrwlock.h
18706 +++ b/arch/x86/include/asm/qrwlock.h
18707 @@ -7,8 +7,8 @@
18708 #define queue_write_unlock queue_write_unlock
18709 static inline void queue_write_unlock(struct qrwlock *lock)
18710 {
18711 - barrier();
18712 - ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18713 + barrier();
18714 + ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18715 }
18716 #endif
18717
18718 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18719 index 9c6b890..5305f53 100644
18720 --- a/arch/x86/include/asm/realmode.h
18721 +++ b/arch/x86/include/asm/realmode.h
18722 @@ -22,16 +22,14 @@ struct real_mode_header {
18723 #endif
18724 /* APM/BIOS reboot */
18725 u32 machine_real_restart_asm;
18726 -#ifdef CONFIG_X86_64
18727 u32 machine_real_restart_seg;
18728 -#endif
18729 };
18730
18731 /* This must match data at trampoline_32/64.S */
18732 struct trampoline_header {
18733 #ifdef CONFIG_X86_32
18734 u32 start;
18735 - u16 gdt_pad;
18736 + u16 boot_cs;
18737 u16 gdt_limit;
18738 u32 gdt_base;
18739 #else
18740 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18741 index a82c4f1..ac45053 100644
18742 --- a/arch/x86/include/asm/reboot.h
18743 +++ b/arch/x86/include/asm/reboot.h
18744 @@ -6,13 +6,13 @@
18745 struct pt_regs;
18746
18747 struct machine_ops {
18748 - void (*restart)(char *cmd);
18749 - void (*halt)(void);
18750 - void (*power_off)(void);
18751 + void (* __noreturn restart)(char *cmd);
18752 + void (* __noreturn halt)(void);
18753 + void (* __noreturn power_off)(void);
18754 void (*shutdown)(void);
18755 void (*crash_shutdown)(struct pt_regs *);
18756 - void (*emergency_restart)(void);
18757 -};
18758 + void (* __noreturn emergency_restart)(void);
18759 +} __no_const;
18760
18761 extern struct machine_ops machine_ops;
18762
18763 diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18764 index 8f7866a..e442f20 100644
18765 --- a/arch/x86/include/asm/rmwcc.h
18766 +++ b/arch/x86/include/asm/rmwcc.h
18767 @@ -3,7 +3,34 @@
18768
18769 #ifdef CC_HAVE_ASM_GOTO
18770
18771 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18772 +#ifdef CONFIG_PAX_REFCOUNT
18773 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18774 +do { \
18775 + asm_volatile_goto (fullop \
18776 + ";jno 0f\n" \
18777 + fullantiop \
18778 + ";int $4\n0:\n" \
18779 + _ASM_EXTABLE(0b, 0b) \
18780 + ";j" cc " %l[cc_label]" \
18781 + : : "m" (var), ## __VA_ARGS__ \
18782 + : "memory" : cc_label); \
18783 + return 0; \
18784 +cc_label: \
18785 + return 1; \
18786 +} while (0)
18787 +#else
18788 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18789 +do { \
18790 + asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18791 + : : "m" (var), ## __VA_ARGS__ \
18792 + : "memory" : cc_label); \
18793 + return 0; \
18794 +cc_label: \
18795 + return 1; \
18796 +} while (0)
18797 +#endif
18798 +
18799 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18800 do { \
18801 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18802 : : "m" (var), ## __VA_ARGS__ \
18803 @@ -13,15 +40,46 @@ cc_label: \
18804 return 1; \
18805 } while (0)
18806
18807 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18808 - __GEN_RMWcc(op " " arg0, var, cc)
18809 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18810 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18811
18812 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18813 - __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18814 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18815 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18816 +
18817 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18818 + __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18819 +
18820 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18821 + __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18822
18823 #else /* !CC_HAVE_ASM_GOTO */
18824
18825 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18826 +#ifdef CONFIG_PAX_REFCOUNT
18827 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18828 +do { \
18829 + char c; \
18830 + asm volatile (fullop \
18831 + ";jno 0f\n" \
18832 + fullantiop \
18833 + ";int $4\n0:\n" \
18834 + _ASM_EXTABLE(0b, 0b) \
18835 + "; set" cc " %1" \
18836 + : "+m" (var), "=qm" (c) \
18837 + : __VA_ARGS__ : "memory"); \
18838 + return c != 0; \
18839 +} while (0)
18840 +#else
18841 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18842 +do { \
18843 + char c; \
18844 + asm volatile (fullop "; set" cc " %1" \
18845 + : "+m" (var), "=qm" (c) \
18846 + : __VA_ARGS__ : "memory"); \
18847 + return c != 0; \
18848 +} while (0)
18849 +#endif
18850 +
18851 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18852 do { \
18853 char c; \
18854 asm volatile (fullop "; set" cc " %1" \
18855 @@ -30,11 +88,17 @@ do { \
18856 return c != 0; \
18857 } while (0)
18858
18859 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18860 - __GEN_RMWcc(op " " arg0, var, cc)
18861 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18862 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18863 +
18864 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18865 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18866 +
18867 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18868 + __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18869
18870 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18871 - __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18872 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18873 + __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18874
18875 #endif /* CC_HAVE_ASM_GOTO */
18876
18877 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18878 index cad82c9..2e5c5c1 100644
18879 --- a/arch/x86/include/asm/rwsem.h
18880 +++ b/arch/x86/include/asm/rwsem.h
18881 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18882 {
18883 asm volatile("# beginning down_read\n\t"
18884 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18885 +
18886 +#ifdef CONFIG_PAX_REFCOUNT
18887 + "jno 0f\n"
18888 + LOCK_PREFIX _ASM_DEC "(%1)\n"
18889 + "int $4\n0:\n"
18890 + _ASM_EXTABLE(0b, 0b)
18891 +#endif
18892 +
18893 /* adds 0x00000001 */
18894 " jns 1f\n"
18895 " call call_rwsem_down_read_failed\n"
18896 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18897 "1:\n\t"
18898 " mov %1,%2\n\t"
18899 " add %3,%2\n\t"
18900 +
18901 +#ifdef CONFIG_PAX_REFCOUNT
18902 + "jno 0f\n"
18903 + "sub %3,%2\n"
18904 + "int $4\n0:\n"
18905 + _ASM_EXTABLE(0b, 0b)
18906 +#endif
18907 +
18908 " jle 2f\n\t"
18909 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18910 " jnz 1b\n\t"
18911 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18912 long tmp;
18913 asm volatile("# beginning down_write\n\t"
18914 LOCK_PREFIX " xadd %1,(%2)\n\t"
18915 +
18916 +#ifdef CONFIG_PAX_REFCOUNT
18917 + "jno 0f\n"
18918 + "mov %1,(%2)\n"
18919 + "int $4\n0:\n"
18920 + _ASM_EXTABLE(0b, 0b)
18921 +#endif
18922 +
18923 /* adds 0xffff0001, returns the old value */
18924 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18925 /* was the active mask 0 before? */
18926 @@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18927 long tmp;
18928 asm volatile("# beginning __up_read\n\t"
18929 LOCK_PREFIX " xadd %1,(%2)\n\t"
18930 +
18931 +#ifdef CONFIG_PAX_REFCOUNT
18932 + "jno 0f\n"
18933 + "mov %1,(%2)\n"
18934 + "int $4\n0:\n"
18935 + _ASM_EXTABLE(0b, 0b)
18936 +#endif
18937 +
18938 /* subtracts 1, returns the old value */
18939 " jns 1f\n\t"
18940 " call call_rwsem_wake\n" /* expects old value in %edx */
18941 @@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18942 long tmp;
18943 asm volatile("# beginning __up_write\n\t"
18944 LOCK_PREFIX " xadd %1,(%2)\n\t"
18945 +
18946 +#ifdef CONFIG_PAX_REFCOUNT
18947 + "jno 0f\n"
18948 + "mov %1,(%2)\n"
18949 + "int $4\n0:\n"
18950 + _ASM_EXTABLE(0b, 0b)
18951 +#endif
18952 +
18953 /* subtracts 0xffff0001, returns the old value */
18954 " jns 1f\n\t"
18955 " call call_rwsem_wake\n" /* expects old value in %edx */
18956 @@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18957 {
18958 asm volatile("# beginning __downgrade_write\n\t"
18959 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18960 +
18961 +#ifdef CONFIG_PAX_REFCOUNT
18962 + "jno 0f\n"
18963 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18964 + "int $4\n0:\n"
18965 + _ASM_EXTABLE(0b, 0b)
18966 +#endif
18967 +
18968 /*
18969 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18970 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18971 @@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18972 */
18973 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18974 {
18975 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18976 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18977 +
18978 +#ifdef CONFIG_PAX_REFCOUNT
18979 + "jno 0f\n"
18980 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
18981 + "int $4\n0:\n"
18982 + _ASM_EXTABLE(0b, 0b)
18983 +#endif
18984 +
18985 : "+m" (sem->count)
18986 : "er" (delta));
18987 }
18988 @@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18989 */
18990 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18991 {
18992 - return delta + xadd(&sem->count, delta);
18993 + return delta + xadd_check_overflow(&sem->count, delta);
18994 }
18995
18996 #endif /* __KERNEL__ */
18997 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18998 index 6f1c3a8..7744f19 100644
18999 --- a/arch/x86/include/asm/segment.h
19000 +++ b/arch/x86/include/asm/segment.h
19001 @@ -64,10 +64,15 @@
19002 * 26 - ESPFIX small SS
19003 * 27 - per-cpu [ offset to per-cpu data area ]
19004 * 28 - stack_canary-20 [ for stack protector ]
19005 - * 29 - unused
19006 - * 30 - unused
19007 + * 29 - PCI BIOS CS
19008 + * 30 - PCI BIOS DS
19009 * 31 - TSS for double fault handler
19010 */
19011 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19012 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19013 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19014 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19015 +
19016 #define GDT_ENTRY_TLS_MIN 6
19017 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19018
19019 @@ -79,6 +84,8 @@
19020
19021 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19022
19023 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19024 +
19025 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19026
19027 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19028 @@ -104,6 +111,12 @@
19029 #define __KERNEL_STACK_CANARY 0
19030 #endif
19031
19032 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19033 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19034 +
19035 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19036 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19037 +
19038 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19039
19040 /*
19041 @@ -141,7 +154,7 @@
19042 */
19043
19044 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19045 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19046 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19047
19048
19049 #else
19050 @@ -165,6 +178,8 @@
19051 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19052 #define __USER32_DS __USER_DS
19053
19054 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19055 +
19056 #define GDT_ENTRY_TSS 8 /* needs two entries */
19057 #define GDT_ENTRY_LDT 10 /* needs two entries */
19058 #define GDT_ENTRY_TLS_MIN 12
19059 @@ -173,6 +188,8 @@
19060 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19061 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19062
19063 +#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19064 +
19065 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19066 #define FS_TLS 0
19067 #define GS_TLS 1
19068 @@ -180,12 +197,14 @@
19069 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19070 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19071
19072 -#define GDT_ENTRIES 16
19073 +#define GDT_ENTRIES 17
19074
19075 #endif
19076
19077 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19078 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19079 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19080 +#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19081 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19082 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19083 #ifndef CONFIG_PARAVIRT
19084 @@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
19085 {
19086 unsigned long __limit;
19087 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19088 - return __limit + 1;
19089 + return __limit;
19090 }
19091
19092 #endif /* !__ASSEMBLY__ */
19093 diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19094 index 8d3120f..352b440 100644
19095 --- a/arch/x86/include/asm/smap.h
19096 +++ b/arch/x86/include/asm/smap.h
19097 @@ -25,11 +25,40 @@
19098
19099 #include <asm/alternative-asm.h>
19100
19101 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19102 +#define ASM_PAX_OPEN_USERLAND \
19103 + 661: jmp 663f; \
19104 + .pushsection .altinstr_replacement, "a" ; \
19105 + 662: pushq %rax; nop; \
19106 + .popsection ; \
19107 + .pushsection .altinstructions, "a" ; \
19108 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19109 + .popsection ; \
19110 + call __pax_open_userland; \
19111 + popq %rax; \
19112 + 663:
19113 +
19114 +#define ASM_PAX_CLOSE_USERLAND \
19115 + 661: jmp 663f; \
19116 + .pushsection .altinstr_replacement, "a" ; \
19117 + 662: pushq %rax; nop; \
19118 + .popsection; \
19119 + .pushsection .altinstructions, "a" ; \
19120 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19121 + .popsection; \
19122 + call __pax_close_userland; \
19123 + popq %rax; \
19124 + 663:
19125 +#else
19126 +#define ASM_PAX_OPEN_USERLAND
19127 +#define ASM_PAX_CLOSE_USERLAND
19128 +#endif
19129 +
19130 #ifdef CONFIG_X86_SMAP
19131
19132 #define ASM_CLAC \
19133 661: ASM_NOP3 ; \
19134 - .pushsection .altinstr_replacement, "ax" ; \
19135 + .pushsection .altinstr_replacement, "a" ; \
19136 662: __ASM_CLAC ; \
19137 .popsection ; \
19138 .pushsection .altinstructions, "a" ; \
19139 @@ -38,7 +67,7 @@
19140
19141 #define ASM_STAC \
19142 661: ASM_NOP3 ; \
19143 - .pushsection .altinstr_replacement, "ax" ; \
19144 + .pushsection .altinstr_replacement, "a" ; \
19145 662: __ASM_STAC ; \
19146 .popsection ; \
19147 .pushsection .altinstructions, "a" ; \
19148 @@ -56,6 +85,37 @@
19149
19150 #include <asm/alternative.h>
19151
19152 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
19153 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19154 +
19155 +extern void __pax_open_userland(void);
19156 +static __always_inline unsigned long pax_open_userland(void)
19157 +{
19158 +
19159 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19160 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19161 + :
19162 + : [open] "i" (__pax_open_userland)
19163 + : "memory", "rax");
19164 +#endif
19165 +
19166 + return 0;
19167 +}
19168 +
19169 +extern void __pax_close_userland(void);
19170 +static __always_inline unsigned long pax_close_userland(void)
19171 +{
19172 +
19173 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19174 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19175 + :
19176 + : [close] "i" (__pax_close_userland)
19177 + : "memory", "rax");
19178 +#endif
19179 +
19180 + return 0;
19181 +}
19182 +
19183 #ifdef CONFIG_X86_SMAP
19184
19185 static __always_inline void clac(void)
19186 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19187 index 8cd1cc3..827e09e 100644
19188 --- a/arch/x86/include/asm/smp.h
19189 +++ b/arch/x86/include/asm/smp.h
19190 @@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19191 /* cpus sharing the last level cache: */
19192 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19193 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19194 -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19195 +DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19196
19197 static inline struct cpumask *cpu_sibling_mask(int cpu)
19198 {
19199 @@ -78,7 +78,7 @@ struct smp_ops {
19200
19201 void (*send_call_func_ipi)(const struct cpumask *mask);
19202 void (*send_call_func_single_ipi)(int cpu);
19203 -};
19204 +} __no_const;
19205
19206 /* Globals due to paravirt */
19207 extern void set_cpu_sibling_map(int cpu);
19208 @@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19209 extern int safe_smp_processor_id(void);
19210
19211 #elif defined(CONFIG_X86_64_SMP)
19212 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19213 -
19214 -#define stack_smp_processor_id() \
19215 -({ \
19216 - struct thread_info *ti; \
19217 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19218 - ti->cpu; \
19219 -})
19220 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19221 +#define stack_smp_processor_id() raw_smp_processor_id()
19222 #define safe_smp_processor_id() smp_processor_id()
19223
19224 #endif
19225 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19226 index 6a99859..03cb807 100644
19227 --- a/arch/x86/include/asm/stackprotector.h
19228 +++ b/arch/x86/include/asm/stackprotector.h
19229 @@ -47,7 +47,7 @@
19230 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19231 */
19232 #define GDT_STACK_CANARY_INIT \
19233 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19234 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19235
19236 /*
19237 * Initialize the stackprotector canary value.
19238 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19239
19240 static inline void load_stack_canary_segment(void)
19241 {
19242 -#ifdef CONFIG_X86_32
19243 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19244 asm volatile ("mov %0, %%gs" : : "r" (0));
19245 #endif
19246 }
19247 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19248 index 70bbe39..4ae2bd4 100644
19249 --- a/arch/x86/include/asm/stacktrace.h
19250 +++ b/arch/x86/include/asm/stacktrace.h
19251 @@ -11,28 +11,20 @@
19252
19253 extern int kstack_depth_to_print;
19254
19255 -struct thread_info;
19256 +struct task_struct;
19257 struct stacktrace_ops;
19258
19259 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19260 - unsigned long *stack,
19261 - unsigned long bp,
19262 - const struct stacktrace_ops *ops,
19263 - void *data,
19264 - unsigned long *end,
19265 - int *graph);
19266 +typedef unsigned long walk_stack_t(struct task_struct *task,
19267 + void *stack_start,
19268 + unsigned long *stack,
19269 + unsigned long bp,
19270 + const struct stacktrace_ops *ops,
19271 + void *data,
19272 + unsigned long *end,
19273 + int *graph);
19274
19275 -extern unsigned long
19276 -print_context_stack(struct thread_info *tinfo,
19277 - unsigned long *stack, unsigned long bp,
19278 - const struct stacktrace_ops *ops, void *data,
19279 - unsigned long *end, int *graph);
19280 -
19281 -extern unsigned long
19282 -print_context_stack_bp(struct thread_info *tinfo,
19283 - unsigned long *stack, unsigned long bp,
19284 - const struct stacktrace_ops *ops, void *data,
19285 - unsigned long *end, int *graph);
19286 +extern walk_stack_t print_context_stack;
19287 +extern walk_stack_t print_context_stack_bp;
19288
19289 /* Generic stack tracer with callbacks */
19290
19291 @@ -40,7 +32,7 @@ struct stacktrace_ops {
19292 void (*address)(void *data, unsigned long address, int reliable);
19293 /* On negative return stop dumping */
19294 int (*stack)(void *data, char *name);
19295 - walk_stack_t walk_stack;
19296 + walk_stack_t *walk_stack;
19297 };
19298
19299 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19300 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19301 index d7f3b3b..3cc39f1 100644
19302 --- a/arch/x86/include/asm/switch_to.h
19303 +++ b/arch/x86/include/asm/switch_to.h
19304 @@ -108,7 +108,7 @@ do { \
19305 "call __switch_to\n\t" \
19306 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19307 __switch_canary \
19308 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
19309 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19310 "movq %%rax,%%rdi\n\t" \
19311 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19312 "jnz ret_from_fork\n\t" \
19313 @@ -119,7 +119,7 @@ do { \
19314 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19315 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19316 [_tif_fork] "i" (_TIF_FORK), \
19317 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
19318 + [thread_info] "m" (current_tinfo), \
19319 [current_task] "m" (current_task) \
19320 __switch_canary_iparam \
19321 : "memory", "cc" __EXTRA_CLOBBER)
19322 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19323 index 547e344..6be1175 100644
19324 --- a/arch/x86/include/asm/thread_info.h
19325 +++ b/arch/x86/include/asm/thread_info.h
19326 @@ -24,7 +24,6 @@ struct exec_domain;
19327 #include <linux/atomic.h>
19328
19329 struct thread_info {
19330 - struct task_struct *task; /* main task structure */
19331 struct exec_domain *exec_domain; /* execution domain */
19332 __u32 flags; /* low level flags */
19333 __u32 status; /* thread synchronous flags */
19334 @@ -33,13 +32,13 @@ struct thread_info {
19335 mm_segment_t addr_limit;
19336 struct restart_block restart_block;
19337 void __user *sysenter_return;
19338 + unsigned long lowest_stack;
19339 unsigned int sig_on_uaccess_error:1;
19340 unsigned int uaccess_err:1; /* uaccess failed */
19341 };
19342
19343 -#define INIT_THREAD_INFO(tsk) \
19344 +#define INIT_THREAD_INFO \
19345 { \
19346 - .task = &tsk, \
19347 .exec_domain = &default_exec_domain, \
19348 .flags = 0, \
19349 .cpu = 0, \
19350 @@ -50,7 +49,7 @@ struct thread_info {
19351 }, \
19352 }
19353
19354 -#define init_thread_info (init_thread_union.thread_info)
19355 +#define init_thread_info (init_thread_union.stack)
19356 #define init_stack (init_thread_union.stack)
19357
19358 #else /* !__ASSEMBLY__ */
19359 @@ -91,6 +90,7 @@ struct thread_info {
19360 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19361 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19362 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19363 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19364
19365 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19366 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19367 @@ -115,17 +115,18 @@ struct thread_info {
19368 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19369 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19370 #define _TIF_X32 (1 << TIF_X32)
19371 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19372
19373 /* work to do in syscall_trace_enter() */
19374 #define _TIF_WORK_SYSCALL_ENTRY \
19375 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19376 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19377 - _TIF_NOHZ)
19378 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19379
19380 /* work to do in syscall_trace_leave() */
19381 #define _TIF_WORK_SYSCALL_EXIT \
19382 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19383 - _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19384 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19385
19386 /* work to do on interrupt/exception return */
19387 #define _TIF_WORK_MASK \
19388 @@ -136,7 +137,7 @@ struct thread_info {
19389 /* work to do on any return to user space */
19390 #define _TIF_ALLWORK_MASK \
19391 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19392 - _TIF_NOHZ)
19393 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19394
19395 /* Only used for 64 bit */
19396 #define _TIF_DO_NOTIFY_MASK \
19397 @@ -151,7 +152,6 @@ struct thread_info {
19398 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19399
19400 #define STACK_WARN (THREAD_SIZE/8)
19401 -#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19402
19403 /*
19404 * macros/functions for gaining access to the thread information structure
19405 @@ -162,26 +162,18 @@ struct thread_info {
19406
19407 DECLARE_PER_CPU(unsigned long, kernel_stack);
19408
19409 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19410 +
19411 static inline struct thread_info *current_thread_info(void)
19412 {
19413 - struct thread_info *ti;
19414 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
19415 - KERNEL_STACK_OFFSET - THREAD_SIZE);
19416 - return ti;
19417 + return this_cpu_read_stable(current_tinfo);
19418 }
19419
19420 #else /* !__ASSEMBLY__ */
19421
19422 /* how to get the thread information struct from ASM */
19423 #define GET_THREAD_INFO(reg) \
19424 - _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19425 - _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19426 -
19427 -/*
19428 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19429 - * a certain register (to be used in assembler memory operands).
19430 - */
19431 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19432 + _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19433
19434 #endif
19435
19436 @@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19437 extern void arch_task_cache_init(void);
19438 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19439 extern void arch_release_task_struct(struct task_struct *tsk);
19440 +
19441 +#define __HAVE_THREAD_FUNCTIONS
19442 +#define task_thread_info(task) (&(task)->tinfo)
19443 +#define task_stack_page(task) ((task)->stack)
19444 +#define setup_thread_stack(p, org) do {} while (0)
19445 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19446 +
19447 #endif
19448 #endif /* _ASM_X86_THREAD_INFO_H */
19449 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19450 index 04905bf..1178cdf 100644
19451 --- a/arch/x86/include/asm/tlbflush.h
19452 +++ b/arch/x86/include/asm/tlbflush.h
19453 @@ -17,18 +17,44 @@
19454
19455 static inline void __native_flush_tlb(void)
19456 {
19457 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19458 + u64 descriptor[2];
19459 +
19460 + descriptor[0] = PCID_KERNEL;
19461 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19462 + return;
19463 + }
19464 +
19465 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19466 + if (static_cpu_has(X86_FEATURE_PCID)) {
19467 + unsigned int cpu = raw_get_cpu();
19468 +
19469 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19470 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19471 + raw_put_cpu_no_resched();
19472 + return;
19473 + }
19474 +#endif
19475 +
19476 native_write_cr3(native_read_cr3());
19477 }
19478
19479 static inline void __native_flush_tlb_global_irq_disabled(void)
19480 {
19481 - unsigned long cr4;
19482 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19483 + u64 descriptor[2];
19484
19485 - cr4 = native_read_cr4();
19486 - /* clear PGE */
19487 - native_write_cr4(cr4 & ~X86_CR4_PGE);
19488 - /* write old PGE again and flush TLBs */
19489 - native_write_cr4(cr4);
19490 + descriptor[0] = PCID_KERNEL;
19491 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19492 + } else {
19493 + unsigned long cr4;
19494 +
19495 + cr4 = native_read_cr4();
19496 + /* clear PGE */
19497 + native_write_cr4(cr4 & ~X86_CR4_PGE);
19498 + /* write old PGE again and flush TLBs */
19499 + native_write_cr4(cr4);
19500 + }
19501 }
19502
19503 static inline void __native_flush_tlb_global(void)
19504 @@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19505
19506 static inline void __native_flush_tlb_single(unsigned long addr)
19507 {
19508 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19509 + u64 descriptor[2];
19510 +
19511 + descriptor[0] = PCID_KERNEL;
19512 + descriptor[1] = addr;
19513 +
19514 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19515 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19516 + if (addr < TASK_SIZE_MAX)
19517 + descriptor[1] += pax_user_shadow_base;
19518 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19519 + }
19520 +
19521 + descriptor[0] = PCID_USER;
19522 + descriptor[1] = addr;
19523 +#endif
19524 +
19525 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19526 + return;
19527 + }
19528 +
19529 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19530 + if (static_cpu_has(X86_FEATURE_PCID)) {
19531 + unsigned int cpu = raw_get_cpu();
19532 +
19533 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19534 + asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19535 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19536 + raw_put_cpu_no_resched();
19537 +
19538 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19539 + addr += pax_user_shadow_base;
19540 + }
19541 +#endif
19542 +
19543 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19544 }
19545
19546 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19547 index 0d592e0..526f797 100644
19548 --- a/arch/x86/include/asm/uaccess.h
19549 +++ b/arch/x86/include/asm/uaccess.h
19550 @@ -7,6 +7,7 @@
19551 #include <linux/compiler.h>
19552 #include <linux/thread_info.h>
19553 #include <linux/string.h>
19554 +#include <linux/spinlock.h>
19555 #include <asm/asm.h>
19556 #include <asm/page.h>
19557 #include <asm/smap.h>
19558 @@ -29,7 +30,12 @@
19559
19560 #define get_ds() (KERNEL_DS)
19561 #define get_fs() (current_thread_info()->addr_limit)
19562 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19563 +void __set_fs(mm_segment_t x);
19564 +void set_fs(mm_segment_t x);
19565 +#else
19566 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19567 +#endif
19568
19569 #define segment_eq(a, b) ((a).seg == (b).seg)
19570
19571 @@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19572 * checks that the pointer is in the user space range - after calling
19573 * this function, memory access functions may still return -EFAULT.
19574 */
19575 -#define access_ok(type, addr, size) \
19576 - likely(!__range_not_ok(addr, size, user_addr_max()))
19577 +extern int _cond_resched(void);
19578 +#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19579 +#define access_ok(type, addr, size) \
19580 +({ \
19581 + unsigned long __size = size; \
19582 + unsigned long __addr = (unsigned long)addr; \
19583 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19584 + if (__ret_ao && __size) { \
19585 + unsigned long __addr_ao = __addr & PAGE_MASK; \
19586 + unsigned long __end_ao = __addr + __size - 1; \
19587 + if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19588 + while (__addr_ao <= __end_ao) { \
19589 + char __c_ao; \
19590 + __addr_ao += PAGE_SIZE; \
19591 + if (__size > PAGE_SIZE) \
19592 + _cond_resched(); \
19593 + if (__get_user(__c_ao, (char __user *)__addr)) \
19594 + break; \
19595 + if (type != VERIFY_WRITE) { \
19596 + __addr = __addr_ao; \
19597 + continue; \
19598 + } \
19599 + if (__put_user(__c_ao, (char __user *)__addr)) \
19600 + break; \
19601 + __addr = __addr_ao; \
19602 + } \
19603 + } \
19604 + } \
19605 + __ret_ao; \
19606 +})
19607
19608 /*
19609 * The exception table consists of pairs of addresses relative to the
19610 @@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19611 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19612 __chk_user_ptr(ptr); \
19613 might_fault(); \
19614 + pax_open_userland(); \
19615 asm volatile("call __get_user_%P3" \
19616 : "=a" (__ret_gu), "=r" (__val_gu) \
19617 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19618 (x) = (__typeof__(*(ptr))) __val_gu; \
19619 + pax_close_userland(); \
19620 __ret_gu; \
19621 })
19622
19623 @@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19624 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19625 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19626
19627 -
19628 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19629 +#define __copyuser_seg "gs;"
19630 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19631 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19632 +#else
19633 +#define __copyuser_seg
19634 +#define __COPYUSER_SET_ES
19635 +#define __COPYUSER_RESTORE_ES
19636 +#endif
19637
19638 #ifdef CONFIG_X86_32
19639 #define __put_user_asm_u64(x, addr, err, errret) \
19640 asm volatile(ASM_STAC "\n" \
19641 - "1: movl %%eax,0(%2)\n" \
19642 - "2: movl %%edx,4(%2)\n" \
19643 + "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19644 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19645 "3: " ASM_CLAC "\n" \
19646 ".section .fixup,\"ax\"\n" \
19647 "4: movl %3,%0\n" \
19648 @@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19649
19650 #define __put_user_asm_ex_u64(x, addr) \
19651 asm volatile(ASM_STAC "\n" \
19652 - "1: movl %%eax,0(%1)\n" \
19653 - "2: movl %%edx,4(%1)\n" \
19654 + "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19655 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19656 "3: " ASM_CLAC "\n" \
19657 _ASM_EXTABLE_EX(1b, 2b) \
19658 _ASM_EXTABLE_EX(2b, 3b) \
19659 @@ -257,7 +301,8 @@ extern void __put_user_8(void);
19660 __typeof__(*(ptr)) __pu_val; \
19661 __chk_user_ptr(ptr); \
19662 might_fault(); \
19663 - __pu_val = x; \
19664 + __pu_val = (x); \
19665 + pax_open_userland(); \
19666 switch (sizeof(*(ptr))) { \
19667 case 1: \
19668 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19669 @@ -275,6 +320,7 @@ extern void __put_user_8(void);
19670 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19671 break; \
19672 } \
19673 + pax_close_userland(); \
19674 __ret_pu; \
19675 })
19676
19677 @@ -355,8 +401,10 @@ do { \
19678 } while (0)
19679
19680 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19681 +do { \
19682 + pax_open_userland(); \
19683 asm volatile(ASM_STAC "\n" \
19684 - "1: mov"itype" %2,%"rtype"1\n" \
19685 + "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19686 "2: " ASM_CLAC "\n" \
19687 ".section .fixup,\"ax\"\n" \
19688 "3: mov %3,%0\n" \
19689 @@ -364,8 +412,10 @@ do { \
19690 " jmp 2b\n" \
19691 ".previous\n" \
19692 _ASM_EXTABLE(1b, 3b) \
19693 - : "=r" (err), ltype(x) \
19694 - : "m" (__m(addr)), "i" (errret), "0" (err))
19695 + : "=r" (err), ltype (x) \
19696 + : "m" (__m(addr)), "i" (errret), "0" (err)); \
19697 + pax_close_userland(); \
19698 +} while (0)
19699
19700 #define __get_user_size_ex(x, ptr, size) \
19701 do { \
19702 @@ -389,7 +439,7 @@ do { \
19703 } while (0)
19704
19705 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19706 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19707 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19708 "2:\n" \
19709 _ASM_EXTABLE_EX(1b, 2b) \
19710 : ltype(x) : "m" (__m(addr)))
19711 @@ -406,13 +456,24 @@ do { \
19712 int __gu_err; \
19713 unsigned long __gu_val; \
19714 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19715 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
19716 + (x) = (__typeof__(*(ptr)))__gu_val; \
19717 __gu_err; \
19718 })
19719
19720 /* FIXME: this hack is definitely wrong -AK */
19721 struct __large_struct { unsigned long buf[100]; };
19722 -#define __m(x) (*(struct __large_struct __user *)(x))
19723 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19724 +#define ____m(x) \
19725 +({ \
19726 + unsigned long ____x = (unsigned long)(x); \
19727 + if (____x < pax_user_shadow_base) \
19728 + ____x += pax_user_shadow_base; \
19729 + (typeof(x))____x; \
19730 +})
19731 +#else
19732 +#define ____m(x) (x)
19733 +#endif
19734 +#define __m(x) (*(struct __large_struct __user *)____m(x))
19735
19736 /*
19737 * Tell gcc we read from memory instead of writing: this is because
19738 @@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19739 * aliasing issues.
19740 */
19741 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19742 +do { \
19743 + pax_open_userland(); \
19744 asm volatile(ASM_STAC "\n" \
19745 - "1: mov"itype" %"rtype"1,%2\n" \
19746 + "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19747 "2: " ASM_CLAC "\n" \
19748 ".section .fixup,\"ax\"\n" \
19749 "3: mov %3,%0\n" \
19750 @@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19751 ".previous\n" \
19752 _ASM_EXTABLE(1b, 3b) \
19753 : "=r"(err) \
19754 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19755 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19756 + pax_close_userland(); \
19757 +} while (0)
19758
19759 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19760 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19761 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19762 "2:\n" \
19763 _ASM_EXTABLE_EX(1b, 2b) \
19764 : : ltype(x), "m" (__m(addr)))
19765 @@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19766 */
19767 #define uaccess_try do { \
19768 current_thread_info()->uaccess_err = 0; \
19769 + pax_open_userland(); \
19770 stac(); \
19771 barrier();
19772
19773 #define uaccess_catch(err) \
19774 clac(); \
19775 + pax_close_userland(); \
19776 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19777 } while (0)
19778
19779 @@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19780 * On error, the variable @x is set to zero.
19781 */
19782
19783 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19784 +#define __get_user(x, ptr) get_user((x), (ptr))
19785 +#else
19786 #define __get_user(x, ptr) \
19787 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19788 +#endif
19789
19790 /**
19791 * __put_user: - Write a simple value into user space, with less checking.
19792 @@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19793 * Returns zero on success, or -EFAULT on error.
19794 */
19795
19796 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19797 +#define __put_user(x, ptr) put_user((x), (ptr))
19798 +#else
19799 #define __put_user(x, ptr) \
19800 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19801 +#endif
19802
19803 #define __get_user_unaligned __get_user
19804 #define __put_user_unaligned __put_user
19805 @@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19806 #define get_user_ex(x, ptr) do { \
19807 unsigned long __gue_val; \
19808 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19809 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
19810 + (x) = (__typeof__(*(ptr)))__gue_val; \
19811 } while (0)
19812
19813 #define put_user_try uaccess_try
19814 @@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19815 __typeof__(ptr) __uval = (uval); \
19816 __typeof__(*(ptr)) __old = (old); \
19817 __typeof__(*(ptr)) __new = (new); \
19818 + pax_open_userland(); \
19819 switch (size) { \
19820 case 1: \
19821 { \
19822 asm volatile("\t" ASM_STAC "\n" \
19823 - "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19824 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19825 "2:\t" ASM_CLAC "\n" \
19826 "\t.section .fixup, \"ax\"\n" \
19827 "3:\tmov %3, %0\n" \
19828 "\tjmp 2b\n" \
19829 "\t.previous\n" \
19830 _ASM_EXTABLE(1b, 3b) \
19831 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19832 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19833 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19834 : "memory" \
19835 ); \
19836 @@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19837 case 2: \
19838 { \
19839 asm volatile("\t" ASM_STAC "\n" \
19840 - "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19841 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19842 "2:\t" ASM_CLAC "\n" \
19843 "\t.section .fixup, \"ax\"\n" \
19844 "3:\tmov %3, %0\n" \
19845 "\tjmp 2b\n" \
19846 "\t.previous\n" \
19847 _ASM_EXTABLE(1b, 3b) \
19848 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19849 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19850 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19851 : "memory" \
19852 ); \
19853 @@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19854 case 4: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857 - "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19858 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %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), "r" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870 @@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19871 __cmpxchg_wrong_size(); \
19872 \
19873 asm volatile("\t" ASM_STAC "\n" \
19874 - "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19875 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %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 @@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19888 default: \
19889 __cmpxchg_wrong_size(); \
19890 } \
19891 + pax_close_userland(); \
19892 *__uval = __old; \
19893 __ret; \
19894 })
19895 @@ -636,17 +713,6 @@ extern struct movsl_mask {
19896
19897 #define ARCH_HAS_NOCACHE_UACCESS 1
19898
19899 -#ifdef CONFIG_X86_32
19900 -# include <asm/uaccess_32.h>
19901 -#else
19902 -# include <asm/uaccess_64.h>
19903 -#endif
19904 -
19905 -unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19906 - unsigned n);
19907 -unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19908 - unsigned n);
19909 -
19910 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19911 # define copy_user_diag __compiletime_error
19912 #else
19913 @@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19914 extern void copy_user_diag("copy_from_user() buffer size is too small")
19915 copy_from_user_overflow(void);
19916 extern void copy_user_diag("copy_to_user() buffer size is too small")
19917 -copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19918 +copy_to_user_overflow(void);
19919
19920 #undef copy_user_diag
19921
19922 @@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19923
19924 extern void
19925 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19926 -__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19927 +__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19928 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19929
19930 #else
19931 @@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19932
19933 #endif
19934
19935 +#ifdef CONFIG_X86_32
19936 +# include <asm/uaccess_32.h>
19937 +#else
19938 +# include <asm/uaccess_64.h>
19939 +#endif
19940 +
19941 static inline unsigned long __must_check
19942 copy_from_user(void *to, const void __user *from, unsigned long n)
19943 {
19944 - int sz = __compiletime_object_size(to);
19945 + size_t sz = __compiletime_object_size(to);
19946
19947 might_fault();
19948
19949 @@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19950 * case, and do only runtime checking for non-constant sizes.
19951 */
19952
19953 - if (likely(sz < 0 || sz >= n))
19954 - n = _copy_from_user(to, from, n);
19955 - else if(__builtin_constant_p(n))
19956 - copy_from_user_overflow();
19957 - else
19958 - __copy_from_user_overflow(sz, n);
19959 + if (likely(sz != (size_t)-1 && sz < n)) {
19960 + if(__builtin_constant_p(n))
19961 + copy_from_user_overflow();
19962 + else
19963 + __copy_from_user_overflow(sz, n);
19964 + } else if (access_ok(VERIFY_READ, from, n))
19965 + n = __copy_from_user(to, from, n);
19966 + else if ((long)n > 0)
19967 + memset(to, 0, n);
19968
19969 return n;
19970 }
19971 @@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19972 static inline unsigned long __must_check
19973 copy_to_user(void __user *to, const void *from, unsigned long n)
19974 {
19975 - int sz = __compiletime_object_size(from);
19976 + size_t sz = __compiletime_object_size(from);
19977
19978 might_fault();
19979
19980 /* See the comment in copy_from_user() above. */
19981 - if (likely(sz < 0 || sz >= n))
19982 - n = _copy_to_user(to, from, n);
19983 - else if(__builtin_constant_p(n))
19984 - copy_to_user_overflow();
19985 - else
19986 - __copy_to_user_overflow(sz, n);
19987 + if (likely(sz != (size_t)-1 && sz < n)) {
19988 + if(__builtin_constant_p(n))
19989 + copy_to_user_overflow();
19990 + else
19991 + __copy_to_user_overflow(sz, n);
19992 + } else if (access_ok(VERIFY_WRITE, to, n))
19993 + n = __copy_to_user(to, from, n);
19994
19995 return n;
19996 }
19997 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19998 index 3c03a5d..1071638 100644
19999 --- a/arch/x86/include/asm/uaccess_32.h
20000 +++ b/arch/x86/include/asm/uaccess_32.h
20001 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20002 static __always_inline unsigned long __must_check
20003 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20004 {
20005 + if ((long)n < 0)
20006 + return n;
20007 +
20008 + check_object_size(from, n, true);
20009 +
20010 if (__builtin_constant_p(n)) {
20011 unsigned long ret;
20012
20013 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20014 __copy_to_user(void __user *to, const void *from, unsigned long n)
20015 {
20016 might_fault();
20017 +
20018 return __copy_to_user_inatomic(to, from, n);
20019 }
20020
20021 static __always_inline unsigned long
20022 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20023 {
20024 + if ((long)n < 0)
20025 + return n;
20026 +
20027 /* Avoid zeroing the tail if the copy fails..
20028 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20029 * but as the zeroing behaviour is only significant when n is not
20030 @@ -137,6 +146,12 @@ static __always_inline unsigned long
20031 __copy_from_user(void *to, const void __user *from, unsigned long n)
20032 {
20033 might_fault();
20034 +
20035 + if ((long)n < 0)
20036 + return n;
20037 +
20038 + check_object_size(to, n, false);
20039 +
20040 if (__builtin_constant_p(n)) {
20041 unsigned long ret;
20042
20043 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20044 const void __user *from, unsigned long n)
20045 {
20046 might_fault();
20047 +
20048 + if ((long)n < 0)
20049 + return n;
20050 +
20051 if (__builtin_constant_p(n)) {
20052 unsigned long ret;
20053
20054 @@ -181,7 +200,10 @@ static __always_inline unsigned long
20055 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20056 unsigned long n)
20057 {
20058 - return __copy_from_user_ll_nocache_nozero(to, from, n);
20059 + if ((long)n < 0)
20060 + return n;
20061 +
20062 + return __copy_from_user_ll_nocache_nozero(to, from, n);
20063 }
20064
20065 #endif /* _ASM_X86_UACCESS_32_H */
20066 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20067 index 12a26b9..206c200 100644
20068 --- a/arch/x86/include/asm/uaccess_64.h
20069 +++ b/arch/x86/include/asm/uaccess_64.h
20070 @@ -10,6 +10,9 @@
20071 #include <asm/alternative.h>
20072 #include <asm/cpufeature.h>
20073 #include <asm/page.h>
20074 +#include <asm/pgtable.h>
20075 +
20076 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
20077
20078 /*
20079 * Copy To/From Userspace
20080 @@ -17,14 +20,14 @@
20081
20082 /* Handles exceptions in both to and from, but doesn't do access_ok */
20083 __must_check unsigned long
20084 -copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
20085 +copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
20086 __must_check unsigned long
20087 -copy_user_generic_string(void *to, const void *from, unsigned len);
20088 +copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
20089 __must_check unsigned long
20090 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20091 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
20092
20093 static __always_inline __must_check unsigned long
20094 -copy_user_generic(void *to, const void *from, unsigned len)
20095 +copy_user_generic(void *to, const void *from, unsigned long len)
20096 {
20097 unsigned ret;
20098
20099 @@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20100 }
20101
20102 __must_check unsigned long
20103 -copy_in_user(void __user *to, const void __user *from, unsigned len);
20104 +copy_in_user(void __user *to, const void __user *from, unsigned long len);
20105
20106 static __always_inline __must_check
20107 -int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20108 +unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20109 {
20110 - int ret = 0;
20111 + size_t sz = __compiletime_object_size(dst);
20112 + unsigned ret = 0;
20113 +
20114 + if (size > INT_MAX)
20115 + return size;
20116 +
20117 + check_object_size(dst, size, false);
20118 +
20119 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20120 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20121 + return size;
20122 +#endif
20123 +
20124 + if (unlikely(sz != (size_t)-1 && sz < size)) {
20125 + if(__builtin_constant_p(size))
20126 + copy_from_user_overflow();
20127 + else
20128 + __copy_from_user_overflow(sz, size);
20129 + return size;
20130 + }
20131
20132 if (!__builtin_constant_p(size))
20133 - return copy_user_generic(dst, (__force void *)src, size);
20134 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20135 switch (size) {
20136 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20137 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20138 ret, "b", "b", "=q", 1);
20139 return ret;
20140 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20141 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20142 ret, "w", "w", "=r", 2);
20143 return ret;
20144 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20145 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20146 ret, "l", "k", "=r", 4);
20147 return ret;
20148 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20149 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20150 ret, "q", "", "=r", 8);
20151 return ret;
20152 case 10:
20153 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20154 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20155 ret, "q", "", "=r", 10);
20156 if (unlikely(ret))
20157 return ret;
20158 __get_user_asm(*(u16 *)(8 + (char *)dst),
20159 - (u16 __user *)(8 + (char __user *)src),
20160 + (const u16 __user *)(8 + (const char __user *)src),
20161 ret, "w", "w", "=r", 2);
20162 return ret;
20163 case 16:
20164 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20165 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20166 ret, "q", "", "=r", 16);
20167 if (unlikely(ret))
20168 return ret;
20169 __get_user_asm(*(u64 *)(8 + (char *)dst),
20170 - (u64 __user *)(8 + (char __user *)src),
20171 + (const u64 __user *)(8 + (const char __user *)src),
20172 ret, "q", "", "=r", 8);
20173 return ret;
20174 default:
20175 - return copy_user_generic(dst, (__force void *)src, size);
20176 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20177 }
20178 }
20179
20180 static __always_inline __must_check
20181 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
20182 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20183 {
20184 might_fault();
20185 return __copy_from_user_nocheck(dst, src, size);
20186 }
20187
20188 static __always_inline __must_check
20189 -int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20190 +unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20191 {
20192 - int ret = 0;
20193 + size_t sz = __compiletime_object_size(src);
20194 + unsigned ret = 0;
20195 +
20196 + if (size > INT_MAX)
20197 + return size;
20198 +
20199 + check_object_size(src, size, true);
20200 +
20201 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20202 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20203 + return size;
20204 +#endif
20205 +
20206 + if (unlikely(sz != (size_t)-1 && sz < size)) {
20207 + if(__builtin_constant_p(size))
20208 + copy_to_user_overflow();
20209 + else
20210 + __copy_to_user_overflow(sz, size);
20211 + return size;
20212 + }
20213
20214 if (!__builtin_constant_p(size))
20215 - return copy_user_generic((__force void *)dst, src, size);
20216 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20217 switch (size) {
20218 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20219 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20220 ret, "b", "b", "iq", 1);
20221 return ret;
20222 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20223 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20224 ret, "w", "w", "ir", 2);
20225 return ret;
20226 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20227 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20228 ret, "l", "k", "ir", 4);
20229 return ret;
20230 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20231 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20232 ret, "q", "", "er", 8);
20233 return ret;
20234 case 10:
20235 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20236 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20237 ret, "q", "", "er", 10);
20238 if (unlikely(ret))
20239 return ret;
20240 asm("":::"memory");
20241 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20242 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20243 ret, "w", "w", "ir", 2);
20244 return ret;
20245 case 16:
20246 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20247 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20248 ret, "q", "", "er", 16);
20249 if (unlikely(ret))
20250 return ret;
20251 asm("":::"memory");
20252 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20253 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20254 ret, "q", "", "er", 8);
20255 return ret;
20256 default:
20257 - return copy_user_generic((__force void *)dst, src, size);
20258 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20259 }
20260 }
20261
20262 static __always_inline __must_check
20263 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
20264 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20265 {
20266 might_fault();
20267 return __copy_to_user_nocheck(dst, src, size);
20268 }
20269
20270 static __always_inline __must_check
20271 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20272 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20273 {
20274 - int ret = 0;
20275 + unsigned ret = 0;
20276
20277 might_fault();
20278 +
20279 + if (size > INT_MAX)
20280 + return size;
20281 +
20282 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20283 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20284 + return size;
20285 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20286 + return size;
20287 +#endif
20288 +
20289 if (!__builtin_constant_p(size))
20290 - return copy_user_generic((__force void *)dst,
20291 - (__force void *)src, size);
20292 + return copy_user_generic((__force_kernel void *)____m(dst),
20293 + (__force_kernel const void *)____m(src), size);
20294 switch (size) {
20295 case 1: {
20296 u8 tmp;
20297 - __get_user_asm(tmp, (u8 __user *)src,
20298 + __get_user_asm(tmp, (const u8 __user *)src,
20299 ret, "b", "b", "=q", 1);
20300 if (likely(!ret))
20301 __put_user_asm(tmp, (u8 __user *)dst,
20302 @@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20303 }
20304 case 2: {
20305 u16 tmp;
20306 - __get_user_asm(tmp, (u16 __user *)src,
20307 + __get_user_asm(tmp, (const u16 __user *)src,
20308 ret, "w", "w", "=r", 2);
20309 if (likely(!ret))
20310 __put_user_asm(tmp, (u16 __user *)dst,
20311 @@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20312
20313 case 4: {
20314 u32 tmp;
20315 - __get_user_asm(tmp, (u32 __user *)src,
20316 + __get_user_asm(tmp, (const u32 __user *)src,
20317 ret, "l", "k", "=r", 4);
20318 if (likely(!ret))
20319 __put_user_asm(tmp, (u32 __user *)dst,
20320 @@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20321 }
20322 case 8: {
20323 u64 tmp;
20324 - __get_user_asm(tmp, (u64 __user *)src,
20325 + __get_user_asm(tmp, (const u64 __user *)src,
20326 ret, "q", "", "=r", 8);
20327 if (likely(!ret))
20328 __put_user_asm(tmp, (u64 __user *)dst,
20329 @@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20330 return ret;
20331 }
20332 default:
20333 - return copy_user_generic((__force void *)dst,
20334 - (__force void *)src, size);
20335 + return copy_user_generic((__force_kernel void *)____m(dst),
20336 + (__force_kernel const void *)____m(src), size);
20337 }
20338 }
20339
20340 -static __must_check __always_inline int
20341 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20342 +static __must_check __always_inline unsigned long
20343 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20344 {
20345 return __copy_from_user_nocheck(dst, src, size);
20346 }
20347
20348 -static __must_check __always_inline int
20349 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20350 +static __must_check __always_inline unsigned long
20351 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20352 {
20353 return __copy_to_user_nocheck(dst, src, size);
20354 }
20355
20356 -extern long __copy_user_nocache(void *dst, const void __user *src,
20357 - unsigned size, int zerorest);
20358 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20359 + unsigned long size, int zerorest);
20360
20361 -static inline int
20362 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20363 +static inline unsigned long
20364 +__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20365 {
20366 might_fault();
20367 +
20368 + if (size > INT_MAX)
20369 + return size;
20370 +
20371 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20372 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20373 + return size;
20374 +#endif
20375 +
20376 return __copy_user_nocache(dst, src, size, 1);
20377 }
20378
20379 -static inline int
20380 +static inline unsigned long
20381 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20382 - unsigned size)
20383 + unsigned long size)
20384 {
20385 + if (size > INT_MAX)
20386 + return size;
20387 +
20388 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20389 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20390 + return size;
20391 +#endif
20392 +
20393 return __copy_user_nocache(dst, src, size, 0);
20394 }
20395
20396 unsigned long
20397 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20398 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20399
20400 #endif /* _ASM_X86_UACCESS_64_H */
20401 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20402 index 5b238981..77fdd78 100644
20403 --- a/arch/x86/include/asm/word-at-a-time.h
20404 +++ b/arch/x86/include/asm/word-at-a-time.h
20405 @@ -11,7 +11,7 @@
20406 * and shift, for example.
20407 */
20408 struct word_at_a_time {
20409 - const unsigned long one_bits, high_bits;
20410 + unsigned long one_bits, high_bits;
20411 };
20412
20413 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20414 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20415 index e45e4da..44e8572 100644
20416 --- a/arch/x86/include/asm/x86_init.h
20417 +++ b/arch/x86/include/asm/x86_init.h
20418 @@ -129,7 +129,7 @@ struct x86_init_ops {
20419 struct x86_init_timers timers;
20420 struct x86_init_iommu iommu;
20421 struct x86_init_pci pci;
20422 -};
20423 +} __no_const;
20424
20425 /**
20426 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20427 @@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20428 void (*setup_percpu_clockev)(void);
20429 void (*early_percpu_clock_init)(void);
20430 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20431 -};
20432 +} __no_const;
20433
20434 struct timespec;
20435
20436 @@ -168,7 +168,7 @@ struct x86_platform_ops {
20437 void (*save_sched_clock_state)(void);
20438 void (*restore_sched_clock_state)(void);
20439 void (*apic_post_init)(void);
20440 -};
20441 +} __no_const;
20442
20443 struct pci_dev;
20444 struct msi_msg;
20445 @@ -185,7 +185,7 @@ struct x86_msi_ops {
20446 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20447 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20448 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20449 -};
20450 +} __no_const;
20451
20452 struct IO_APIC_route_entry;
20453 struct io_apic_irq_attr;
20454 @@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20455 unsigned int destination, int vector,
20456 struct io_apic_irq_attr *attr);
20457 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20458 -};
20459 +} __no_const;
20460
20461 extern struct x86_init_ops x86_init;
20462 extern struct x86_cpuinit_ops x86_cpuinit;
20463 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20464 index c949923..c22bfa4 100644
20465 --- a/arch/x86/include/asm/xen/page.h
20466 +++ b/arch/x86/include/asm/xen/page.h
20467 @@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20468 extern struct page *m2p_find_override(unsigned long mfn);
20469 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20470
20471 -static inline unsigned long pfn_to_mfn(unsigned long pfn)
20472 +static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20473 {
20474 unsigned long mfn;
20475
20476 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20477 index 7e7a79a..0824666 100644
20478 --- a/arch/x86/include/asm/xsave.h
20479 +++ b/arch/x86/include/asm/xsave.h
20480 @@ -228,12 +228,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20481 if (unlikely(err))
20482 return -EFAULT;
20483
20484 + pax_open_userland();
20485 __asm__ __volatile__(ASM_STAC "\n"
20486 - "1:"XSAVE"\n"
20487 + "1:"
20488 + __copyuser_seg
20489 + XSAVE"\n"
20490 "2: " ASM_CLAC "\n"
20491 xstate_fault
20492 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20493 : "memory");
20494 + pax_close_userland();
20495 return err;
20496 }
20497
20498 @@ -243,16 +247,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20499 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20500 {
20501 int err = 0;
20502 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20503 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20504 u32 lmask = mask;
20505 u32 hmask = mask >> 32;
20506
20507 + pax_open_userland();
20508 __asm__ __volatile__(ASM_STAC "\n"
20509 - "1:"XRSTOR"\n"
20510 + "1:"
20511 + __copyuser_seg
20512 + XRSTOR"\n"
20513 "2: " ASM_CLAC "\n"
20514 xstate_fault
20515 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20516 : "memory"); /* memory required? */
20517 + pax_close_userland();
20518 return err;
20519 }
20520
20521 diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20522 index d993e33..8db1b18 100644
20523 --- a/arch/x86/include/uapi/asm/e820.h
20524 +++ b/arch/x86/include/uapi/asm/e820.h
20525 @@ -58,7 +58,7 @@ struct e820map {
20526 #define ISA_START_ADDRESS 0xa0000
20527 #define ISA_END_ADDRESS 0x100000
20528
20529 -#define BIOS_BEGIN 0x000a0000
20530 +#define BIOS_BEGIN 0x000c0000
20531 #define BIOS_END 0x00100000
20532
20533 #define BIOS_ROM_BASE 0xffe00000
20534 diff --git a/arch/x86/include/uapi/asm/ldt.h b/arch/x86/include/uapi/asm/ldt.h
20535 index 46727eb..6e1aaf7 100644
20536 --- a/arch/x86/include/uapi/asm/ldt.h
20537 +++ b/arch/x86/include/uapi/asm/ldt.h
20538 @@ -28,6 +28,13 @@ struct user_desc {
20539 unsigned int seg_not_present:1;
20540 unsigned int useable:1;
20541 #ifdef __x86_64__
20542 + /*
20543 + * Because this bit is not present in 32-bit user code, user
20544 + * programs can pass uninitialized values here. Therefore, in
20545 + * any context in which a user_desc comes from a 32-bit program,
20546 + * the kernel must act as though lm == 0, regardless of the
20547 + * actual value.
20548 + */
20549 unsigned int lm:1;
20550 #endif
20551 };
20552 diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20553 index 7b0a55a..ad115bf 100644
20554 --- a/arch/x86/include/uapi/asm/ptrace-abi.h
20555 +++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20556 @@ -49,7 +49,6 @@
20557 #define EFLAGS 144
20558 #define RSP 152
20559 #define SS 160
20560 -#define ARGOFFSET R11
20561 #endif /* __ASSEMBLY__ */
20562
20563 /* top of stack page */
20564 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20565 index 8f1e774..9b4c381 100644
20566 --- a/arch/x86/kernel/Makefile
20567 +++ b/arch/x86/kernel/Makefile
20568 @@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20569 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20570 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20571 obj-y += probe_roms.o
20572 -obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20573 +obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20574 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20575 obj-$(CONFIG_X86_64) += mcount_64.o
20576 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20577 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20578 index a142e77..6222cdd 100644
20579 --- a/arch/x86/kernel/acpi/boot.c
20580 +++ b/arch/x86/kernel/acpi/boot.c
20581 @@ -1276,7 +1276,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20582 * If your system is blacklisted here, but you find that acpi=force
20583 * works for you, please contact linux-acpi@vger.kernel.org
20584 */
20585 -static struct dmi_system_id __initdata acpi_dmi_table[] = {
20586 +static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20587 /*
20588 * Boxes that need ACPI disabled
20589 */
20590 @@ -1351,7 +1351,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20591 };
20592
20593 /* second table for DMI checks that should run after early-quirks */
20594 -static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20595 +static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20596 /*
20597 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20598 * which includes some code which overrides all temperature
20599 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20600 index 3136820..e2c6577 100644
20601 --- a/arch/x86/kernel/acpi/sleep.c
20602 +++ b/arch/x86/kernel/acpi/sleep.c
20603 @@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20604 #else /* CONFIG_64BIT */
20605 #ifdef CONFIG_SMP
20606 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20607 +
20608 + pax_open_kernel();
20609 early_gdt_descr.address =
20610 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20611 + pax_close_kernel();
20612 +
20613 initial_gs = per_cpu_offset(smp_processor_id());
20614 #endif
20615 initial_code = (unsigned long)wakeup_long64;
20616 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20617 index 665c6b7..eae4d56 100644
20618 --- a/arch/x86/kernel/acpi/wakeup_32.S
20619 +++ b/arch/x86/kernel/acpi/wakeup_32.S
20620 @@ -29,13 +29,11 @@ wakeup_pmode_return:
20621 # and restore the stack ... but you need gdt for this to work
20622 movl saved_context_esp, %esp
20623
20624 - movl %cs:saved_magic, %eax
20625 - cmpl $0x12345678, %eax
20626 + cmpl $0x12345678, saved_magic
20627 jne bogus_magic
20628
20629 # jump to place where we left off
20630 - movl saved_eip, %eax
20631 - jmp *%eax
20632 + jmp *(saved_eip)
20633
20634 bogus_magic:
20635 jmp bogus_magic
20636 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20637 index 703130f..27a155d 100644
20638 --- a/arch/x86/kernel/alternative.c
20639 +++ b/arch/x86/kernel/alternative.c
20640 @@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20641 */
20642 for (a = start; a < end; a++) {
20643 instr = (u8 *)&a->instr_offset + a->instr_offset;
20644 +
20645 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20646 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20647 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20648 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20649 +#endif
20650 +
20651 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20652 BUG_ON(a->replacementlen > a->instrlen);
20653 BUG_ON(a->instrlen > sizeof(insnbuf));
20654 @@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20655 add_nops(insnbuf + a->replacementlen,
20656 a->instrlen - a->replacementlen);
20657
20658 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20659 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20660 + instr = ktva_ktla(instr);
20661 +#endif
20662 +
20663 text_poke_early(instr, insnbuf, a->instrlen);
20664 }
20665 }
20666 @@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20667 for (poff = start; poff < end; poff++) {
20668 u8 *ptr = (u8 *)poff + *poff;
20669
20670 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20671 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20672 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20673 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20674 +#endif
20675 +
20676 if (!*poff || ptr < text || ptr >= text_end)
20677 continue;
20678 /* turn DS segment override prefix into lock prefix */
20679 - if (*ptr == 0x3e)
20680 + if (*ktla_ktva(ptr) == 0x3e)
20681 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20682 }
20683 mutex_unlock(&text_mutex);
20684 @@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20685 for (poff = start; poff < end; poff++) {
20686 u8 *ptr = (u8 *)poff + *poff;
20687
20688 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20689 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20690 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20691 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20692 +#endif
20693 +
20694 if (!*poff || ptr < text || ptr >= text_end)
20695 continue;
20696 /* turn lock prefix into DS segment override prefix */
20697 - if (*ptr == 0xf0)
20698 + if (*ktla_ktva(ptr) == 0xf0)
20699 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20700 }
20701 mutex_unlock(&text_mutex);
20702 @@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20703
20704 BUG_ON(p->len > MAX_PATCH_LEN);
20705 /* prep the buffer with the original instructions */
20706 - memcpy(insnbuf, p->instr, p->len);
20707 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20708 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20709 (unsigned long)p->instr, p->len);
20710
20711 @@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20712 if (!uniproc_patched || num_possible_cpus() == 1)
20713 free_init_pages("SMP alternatives",
20714 (unsigned long)__smp_locks,
20715 - (unsigned long)__smp_locks_end);
20716 + PAGE_ALIGN((unsigned long)__smp_locks_end));
20717 #endif
20718
20719 apply_paravirt(__parainstructions, __parainstructions_end);
20720 @@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20721 * instructions. And on the local CPU you need to be protected again NMI or MCE
20722 * handlers seeing an inconsistent instruction while you patch.
20723 */
20724 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
20725 +void *__kprobes text_poke_early(void *addr, const void *opcode,
20726 size_t len)
20727 {
20728 unsigned long flags;
20729 local_irq_save(flags);
20730 - memcpy(addr, opcode, len);
20731 +
20732 + pax_open_kernel();
20733 + memcpy(ktla_ktva(addr), opcode, len);
20734 sync_core();
20735 + pax_close_kernel();
20736 +
20737 local_irq_restore(flags);
20738 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20739 that causes hangs on some VIA CPUs. */
20740 @@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20741 */
20742 void *text_poke(void *addr, const void *opcode, size_t len)
20743 {
20744 - unsigned long flags;
20745 - char *vaddr;
20746 + unsigned char *vaddr = ktla_ktva(addr);
20747 struct page *pages[2];
20748 - int i;
20749 + size_t i;
20750
20751 if (!core_kernel_text((unsigned long)addr)) {
20752 - pages[0] = vmalloc_to_page(addr);
20753 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20754 + pages[0] = vmalloc_to_page(vaddr);
20755 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20756 } else {
20757 - pages[0] = virt_to_page(addr);
20758 + pages[0] = virt_to_page(vaddr);
20759 WARN_ON(!PageReserved(pages[0]));
20760 - pages[1] = virt_to_page(addr + PAGE_SIZE);
20761 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20762 }
20763 BUG_ON(!pages[0]);
20764 - local_irq_save(flags);
20765 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20766 - if (pages[1])
20767 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20768 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20769 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20770 - clear_fixmap(FIX_TEXT_POKE0);
20771 - if (pages[1])
20772 - clear_fixmap(FIX_TEXT_POKE1);
20773 - local_flush_tlb();
20774 - sync_core();
20775 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
20776 - that causes hangs on some VIA CPUs. */
20777 + text_poke_early(addr, opcode, len);
20778 for (i = 0; i < len; i++)
20779 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20780 - local_irq_restore(flags);
20781 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20782 return addr;
20783 }
20784
20785 @@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20786 if (likely(!bp_patching_in_progress))
20787 return 0;
20788
20789 - if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20790 + if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20791 return 0;
20792
20793 /* set up the specified breakpoint handler */
20794 @@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20795 */
20796 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20797 {
20798 - unsigned char int3 = 0xcc;
20799 + const unsigned char int3 = 0xcc;
20800
20801 bp_int3_handler = handler;
20802 bp_int3_addr = (u8 *)addr + sizeof(int3);
20803 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20804 index ba6cc04..06fd971 100644
20805 --- a/arch/x86/kernel/apic/apic.c
20806 +++ b/arch/x86/kernel/apic/apic.c
20807 @@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20808 /*
20809 * Debug level, exported for io_apic.c
20810 */
20811 -unsigned int apic_verbosity;
20812 +int apic_verbosity;
20813
20814 int pic_mode;
20815
20816 @@ -1989,7 +1989,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20817 apic_write(APIC_ESR, 0);
20818 v = apic_read(APIC_ESR);
20819 ack_APIC_irq();
20820 - atomic_inc(&irq_err_count);
20821 + atomic_inc_unchecked(&irq_err_count);
20822
20823 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20824 smp_processor_id(), v);
20825 diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20826 index de918c4..32eed23 100644
20827 --- a/arch/x86/kernel/apic/apic_flat_64.c
20828 +++ b/arch/x86/kernel/apic/apic_flat_64.c
20829 @@ -154,7 +154,7 @@ static int flat_probe(void)
20830 return 1;
20831 }
20832
20833 -static struct apic apic_flat = {
20834 +static struct apic apic_flat __read_only = {
20835 .name = "flat",
20836 .probe = flat_probe,
20837 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20838 @@ -260,7 +260,7 @@ static int physflat_probe(void)
20839 return 0;
20840 }
20841
20842 -static struct apic apic_physflat = {
20843 +static struct apic apic_physflat __read_only = {
20844
20845 .name = "physical flat",
20846 .probe = physflat_probe,
20847 diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20848 index b205cdb..d8503ff 100644
20849 --- a/arch/x86/kernel/apic/apic_noop.c
20850 +++ b/arch/x86/kernel/apic/apic_noop.c
20851 @@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20852 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20853 }
20854
20855 -struct apic apic_noop = {
20856 +struct apic apic_noop __read_only = {
20857 .name = "noop",
20858 .probe = noop_probe,
20859 .acpi_madt_oem_check = NULL,
20860 diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20861 index c4a8d63..fe893ac 100644
20862 --- a/arch/x86/kernel/apic/bigsmp_32.c
20863 +++ b/arch/x86/kernel/apic/bigsmp_32.c
20864 @@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20865 return dmi_bigsmp;
20866 }
20867
20868 -static struct apic apic_bigsmp = {
20869 +static struct apic apic_bigsmp __read_only = {
20870
20871 .name = "bigsmp",
20872 .probe = probe_bigsmp,
20873 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20874 index 1183d54..6158e47 100644
20875 --- a/arch/x86/kernel/apic/io_apic.c
20876 +++ b/arch/x86/kernel/apic/io_apic.c
20877 @@ -1230,7 +1230,7 @@ out:
20878 }
20879 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20880
20881 -void lock_vector_lock(void)
20882 +void lock_vector_lock(void) __acquires(vector_lock)
20883 {
20884 /* Used to the online set of cpus does not change
20885 * during assign_irq_vector.
20886 @@ -1238,7 +1238,7 @@ void lock_vector_lock(void)
20887 raw_spin_lock(&vector_lock);
20888 }
20889
20890 -void unlock_vector_lock(void)
20891 +void unlock_vector_lock(void) __releases(vector_lock)
20892 {
20893 raw_spin_unlock(&vector_lock);
20894 }
20895 @@ -2465,7 +2465,7 @@ static void ack_apic_edge(struct irq_data *data)
20896 ack_APIC_irq();
20897 }
20898
20899 -atomic_t irq_mis_count;
20900 +atomic_unchecked_t irq_mis_count;
20901
20902 #ifdef CONFIG_GENERIC_PENDING_IRQ
20903 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20904 @@ -2606,7 +2606,7 @@ static void ack_apic_level(struct irq_data *data)
20905 * at the cpu.
20906 */
20907 if (!(v & (1 << (i & 0x1f)))) {
20908 - atomic_inc(&irq_mis_count);
20909 + atomic_inc_unchecked(&irq_mis_count);
20910
20911 eoi_ioapic_irq(irq, cfg);
20912 }
20913 diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20914 index bda4886..f9c7195 100644
20915 --- a/arch/x86/kernel/apic/probe_32.c
20916 +++ b/arch/x86/kernel/apic/probe_32.c
20917 @@ -72,7 +72,7 @@ static int probe_default(void)
20918 return 1;
20919 }
20920
20921 -static struct apic apic_default = {
20922 +static struct apic apic_default __read_only = {
20923
20924 .name = "default",
20925 .probe = probe_default,
20926 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20927 index e658f21..b695a1a 100644
20928 --- a/arch/x86/kernel/apic/x2apic_cluster.c
20929 +++ b/arch/x86/kernel/apic/x2apic_cluster.c
20930 @@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20931 return notifier_from_errno(err);
20932 }
20933
20934 -static struct notifier_block __refdata x2apic_cpu_notifier = {
20935 +static struct notifier_block x2apic_cpu_notifier = {
20936 .notifier_call = update_clusterinfo,
20937 };
20938
20939 @@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20940 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20941 }
20942
20943 -static struct apic apic_x2apic_cluster = {
20944 +static struct apic apic_x2apic_cluster __read_only = {
20945
20946 .name = "cluster x2apic",
20947 .probe = x2apic_cluster_probe,
20948 diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20949 index 6fae733..5ca17af 100644
20950 --- a/arch/x86/kernel/apic/x2apic_phys.c
20951 +++ b/arch/x86/kernel/apic/x2apic_phys.c
20952 @@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20953 return apic == &apic_x2apic_phys;
20954 }
20955
20956 -static struct apic apic_x2apic_phys = {
20957 +static struct apic apic_x2apic_phys __read_only = {
20958
20959 .name = "physical x2apic",
20960 .probe = x2apic_phys_probe,
20961 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20962 index 8e9dcfd..c61b3e4 100644
20963 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
20964 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20965 @@ -348,7 +348,7 @@ static int uv_probe(void)
20966 return apic == &apic_x2apic_uv_x;
20967 }
20968
20969 -static struct apic __refdata apic_x2apic_uv_x = {
20970 +static struct apic apic_x2apic_uv_x __read_only = {
20971
20972 .name = "UV large system",
20973 .probe = uv_probe,
20974 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20975 index 5848744..56cb598 100644
20976 --- a/arch/x86/kernel/apm_32.c
20977 +++ b/arch/x86/kernel/apm_32.c
20978 @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20979 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20980 * even though they are called in protected mode.
20981 */
20982 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20983 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20984 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20985
20986 static const char driver_version[] = "1.16ac"; /* no spaces */
20987 @@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
20988 BUG_ON(cpu != 0);
20989 gdt = get_cpu_gdt_table(cpu);
20990 save_desc_40 = gdt[0x40 / 8];
20991 +
20992 + pax_open_kernel();
20993 gdt[0x40 / 8] = bad_bios_desc;
20994 + pax_close_kernel();
20995
20996 apm_irq_save(flags);
20997 APM_DO_SAVE_SEGS;
20998 @@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
20999 &call->esi);
21000 APM_DO_RESTORE_SEGS;
21001 apm_irq_restore(flags);
21002 +
21003 + pax_open_kernel();
21004 gdt[0x40 / 8] = save_desc_40;
21005 + pax_close_kernel();
21006 +
21007 put_cpu();
21008
21009 return call->eax & 0xff;
21010 @@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
21011 BUG_ON(cpu != 0);
21012 gdt = get_cpu_gdt_table(cpu);
21013 save_desc_40 = gdt[0x40 / 8];
21014 +
21015 + pax_open_kernel();
21016 gdt[0x40 / 8] = bad_bios_desc;
21017 + pax_close_kernel();
21018
21019 apm_irq_save(flags);
21020 APM_DO_SAVE_SEGS;
21021 @@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
21022 &call->eax);
21023 APM_DO_RESTORE_SEGS;
21024 apm_irq_restore(flags);
21025 +
21026 + pax_open_kernel();
21027 gdt[0x40 / 8] = save_desc_40;
21028 + pax_close_kernel();
21029 +
21030 put_cpu();
21031 return error;
21032 }
21033 @@ -2350,12 +2364,15 @@ static int __init apm_init(void)
21034 * code to that CPU.
21035 */
21036 gdt = get_cpu_gdt_table(0);
21037 +
21038 + pax_open_kernel();
21039 set_desc_base(&gdt[APM_CS >> 3],
21040 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21041 set_desc_base(&gdt[APM_CS_16 >> 3],
21042 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21043 set_desc_base(&gdt[APM_DS >> 3],
21044 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21045 + pax_close_kernel();
21046
21047 proc_create("apm", 0, NULL, &apm_file_ops);
21048
21049 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21050 index 9f6b934..cf5ffb3 100644
21051 --- a/arch/x86/kernel/asm-offsets.c
21052 +++ b/arch/x86/kernel/asm-offsets.c
21053 @@ -32,6 +32,8 @@ void common(void) {
21054 OFFSET(TI_flags, thread_info, flags);
21055 OFFSET(TI_status, thread_info, status);
21056 OFFSET(TI_addr_limit, thread_info, addr_limit);
21057 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21058 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21059
21060 BLANK();
21061 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21062 @@ -52,8 +54,26 @@ void common(void) {
21063 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21064 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21065 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21066 +
21067 +#ifdef CONFIG_PAX_KERNEXEC
21068 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21069 #endif
21070
21071 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21072 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21073 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21074 +#ifdef CONFIG_X86_64
21075 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21076 +#endif
21077 +#endif
21078 +
21079 +#endif
21080 +
21081 + BLANK();
21082 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21083 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21084 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21085 +
21086 #ifdef CONFIG_XEN
21087 BLANK();
21088 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21089 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21090 index e7c798b..2b2019b 100644
21091 --- a/arch/x86/kernel/asm-offsets_64.c
21092 +++ b/arch/x86/kernel/asm-offsets_64.c
21093 @@ -77,6 +77,7 @@ int main(void)
21094 BLANK();
21095 #undef ENTRY
21096
21097 + DEFINE(TSS_size, sizeof(struct tss_struct));
21098 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21099 BLANK();
21100
21101 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21102 index e27b49d..85b106c 100644
21103 --- a/arch/x86/kernel/cpu/Makefile
21104 +++ b/arch/x86/kernel/cpu/Makefile
21105 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21106 CFLAGS_REMOVE_perf_event.o = -pg
21107 endif
21108
21109 -# Make sure load_percpu_segment has no stackprotector
21110 -nostackp := $(call cc-option, -fno-stack-protector)
21111 -CFLAGS_common.o := $(nostackp)
21112 -
21113 obj-y := intel_cacheinfo.o scattered.o topology.o
21114 obj-y += common.o
21115 obj-y += rdrand.o
21116 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21117 index 813d29d..6e542d4 100644
21118 --- a/arch/x86/kernel/cpu/amd.c
21119 +++ b/arch/x86/kernel/cpu/amd.c
21120 @@ -718,7 +718,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21121 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21122 {
21123 /* AMD errata T13 (order #21922) */
21124 - if ((c->x86 == 6)) {
21125 + if (c->x86 == 6) {
21126 /* Duron Rev A0 */
21127 if (c->x86_model == 3 && c->x86_mask == 0)
21128 size = 64;
21129 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21130 index cfa9b5b..19b5084 100644
21131 --- a/arch/x86/kernel/cpu/common.c
21132 +++ b/arch/x86/kernel/cpu/common.c
21133 @@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
21134
21135 static const struct cpu_dev *this_cpu = &default_cpu;
21136
21137 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21138 -#ifdef CONFIG_X86_64
21139 - /*
21140 - * We need valid kernel segments for data and code in long mode too
21141 - * IRET will check the segment types kkeil 2000/10/28
21142 - * Also sysret mandates a special GDT layout
21143 - *
21144 - * TLS descriptors are currently at a different place compared to i386.
21145 - * Hopefully nobody expects them at a fixed place (Wine?)
21146 - */
21147 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21148 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21149 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21150 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21151 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21152 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21153 -#else
21154 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21155 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21156 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21157 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21158 - /*
21159 - * Segments used for calling PnP BIOS have byte granularity.
21160 - * They code segments and data segments have fixed 64k limits,
21161 - * the transfer segment sizes are set at run time.
21162 - */
21163 - /* 32-bit code */
21164 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21165 - /* 16-bit code */
21166 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21167 - /* 16-bit data */
21168 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21169 - /* 16-bit data */
21170 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21171 - /* 16-bit data */
21172 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21173 - /*
21174 - * The APM segments have byte granularity and their bases
21175 - * are set at run time. All have 64k limits.
21176 - */
21177 - /* 32-bit code */
21178 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21179 - /* 16-bit code */
21180 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21181 - /* data */
21182 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21183 -
21184 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21185 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21186 - GDT_STACK_CANARY_INIT
21187 -#endif
21188 -} };
21189 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21190 -
21191 static int __init x86_xsave_setup(char *s)
21192 {
21193 if (strlen(s))
21194 @@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21195 }
21196 }
21197
21198 +#ifdef CONFIG_X86_64
21199 +static __init int setup_disable_pcid(char *arg)
21200 +{
21201 + setup_clear_cpu_cap(X86_FEATURE_PCID);
21202 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21203 +
21204 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21205 + if (clone_pgd_mask != ~(pgdval_t)0UL)
21206 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21207 +#endif
21208 +
21209 + return 1;
21210 +}
21211 +__setup("nopcid", setup_disable_pcid);
21212 +
21213 +static void setup_pcid(struct cpuinfo_x86 *c)
21214 +{
21215 + if (!cpu_has(c, X86_FEATURE_PCID)) {
21216 + clear_cpu_cap(c, X86_FEATURE_INVPCID);
21217 +
21218 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21219 + if (clone_pgd_mask != ~(pgdval_t)0UL) {
21220 + pax_open_kernel();
21221 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21222 + pax_close_kernel();
21223 + printk("PAX: slow and weak UDEREF enabled\n");
21224 + } else
21225 + printk("PAX: UDEREF disabled\n");
21226 +#endif
21227 +
21228 + return;
21229 + }
21230 +
21231 + printk("PAX: PCID detected\n");
21232 + set_in_cr4(X86_CR4_PCIDE);
21233 +
21234 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21235 + pax_open_kernel();
21236 + clone_pgd_mask = ~(pgdval_t)0UL;
21237 + pax_close_kernel();
21238 + if (pax_user_shadow_base)
21239 + printk("PAX: weak UDEREF enabled\n");
21240 + else {
21241 + set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21242 + printk("PAX: strong UDEREF enabled\n");
21243 + }
21244 +#endif
21245 +
21246 + if (cpu_has(c, X86_FEATURE_INVPCID))
21247 + printk("PAX: INVPCID detected\n");
21248 +}
21249 +#endif
21250 +
21251 /*
21252 * Some CPU features depend on higher CPUID levels, which may not always
21253 * be available due to CPUID level capping or broken virtualization
21254 @@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
21255 {
21256 struct desc_ptr gdt_descr;
21257
21258 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21259 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21260 gdt_descr.size = GDT_SIZE - 1;
21261 load_gdt(&gdt_descr);
21262 /* Reload the per-cpu base */
21263 @@ -895,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21264 setup_smep(c);
21265 setup_smap(c);
21266
21267 +#ifdef CONFIG_X86_64
21268 + setup_pcid(c);
21269 +#endif
21270 +
21271 /*
21272 * The vendor-specific functions might have changed features.
21273 * Now we do "generic changes."
21274 @@ -903,6 +906,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21275 /* Filter out anything that depends on CPUID levels we don't have */
21276 filter_cpuid_features(c, true);
21277
21278 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21279 + setup_clear_cpu_cap(X86_FEATURE_SEP);
21280 +#endif
21281 +
21282 /* If the model name is still unset, do table lookup. */
21283 if (!c->x86_model_id[0]) {
21284 const char *p;
21285 @@ -985,7 +992,7 @@ static void syscall32_cpu_init(void)
21286 void enable_sep_cpu(void)
21287 {
21288 int cpu = get_cpu();
21289 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
21290 + struct tss_struct *tss = init_tss + cpu;
21291
21292 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21293 put_cpu();
21294 @@ -1125,14 +1132,16 @@ static __init int setup_disablecpuid(char *arg)
21295 }
21296 __setup("clearcpuid=", setup_disablecpuid);
21297
21298 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21299 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
21300 +
21301 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21302 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21303 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21304 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21305
21306 #ifdef CONFIG_X86_64
21307 -struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21308 -struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21309 - (unsigned long) debug_idt_table };
21310 +struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21311 +const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21312
21313 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21314 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21315 @@ -1309,7 +1318,7 @@ void cpu_init(void)
21316 */
21317 load_ucode_ap();
21318
21319 - t = &per_cpu(init_tss, cpu);
21320 + t = init_tss + cpu;
21321 oist = &per_cpu(orig_ist, cpu);
21322
21323 #ifdef CONFIG_NUMA
21324 @@ -1341,7 +1350,6 @@ void cpu_init(void)
21325 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21326 barrier();
21327
21328 - x86_configure_nx();
21329 enable_x2apic();
21330
21331 /*
21332 @@ -1393,7 +1401,7 @@ void cpu_init(void)
21333 {
21334 int cpu = smp_processor_id();
21335 struct task_struct *curr = current;
21336 - struct tss_struct *t = &per_cpu(init_tss, cpu);
21337 + struct tss_struct *t = init_tss + cpu;
21338 struct thread_struct *thread = &curr->thread;
21339
21340 wait_for_master_cpu(cpu);
21341 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21342 index c703507..28535e3 100644
21343 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21344 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21345 @@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
21346 };
21347
21348 #ifdef CONFIG_AMD_NB
21349 +static struct attribute *default_attrs_amd_nb[] = {
21350 + &type.attr,
21351 + &level.attr,
21352 + &coherency_line_size.attr,
21353 + &physical_line_partition.attr,
21354 + &ways_of_associativity.attr,
21355 + &number_of_sets.attr,
21356 + &size.attr,
21357 + &shared_cpu_map.attr,
21358 + &shared_cpu_list.attr,
21359 + NULL,
21360 + NULL,
21361 + NULL,
21362 + NULL
21363 +};
21364 +
21365 static struct attribute **amd_l3_attrs(void)
21366 {
21367 static struct attribute **attrs;
21368 @@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
21369
21370 n = ARRAY_SIZE(default_attrs);
21371
21372 - if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21373 - n += 2;
21374 -
21375 - if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21376 - n += 1;
21377 -
21378 - attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21379 - if (attrs == NULL)
21380 - return attrs = default_attrs;
21381 -
21382 - for (n = 0; default_attrs[n]; n++)
21383 - attrs[n] = default_attrs[n];
21384 + attrs = default_attrs_amd_nb;
21385
21386 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21387 attrs[n++] = &cache_disable_0.attr;
21388 @@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
21389 .default_attrs = default_attrs,
21390 };
21391
21392 +#ifdef CONFIG_AMD_NB
21393 +static struct kobj_type ktype_cache_amd_nb = {
21394 + .sysfs_ops = &sysfs_ops,
21395 + .default_attrs = default_attrs_amd_nb,
21396 +};
21397 +#endif
21398 +
21399 static struct kobj_type ktype_percpu_entry = {
21400 .sysfs_ops = &sysfs_ops,
21401 };
21402 @@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
21403 return retval;
21404 }
21405
21406 +#ifdef CONFIG_AMD_NB
21407 + amd_l3_attrs();
21408 +#endif
21409 +
21410 for (i = 0; i < num_cache_leaves; i++) {
21411 + struct kobj_type *ktype;
21412 +
21413 this_object = INDEX_KOBJECT_PTR(cpu, i);
21414 this_object->cpu = cpu;
21415 this_object->index = i;
21416
21417 this_leaf = CPUID4_INFO_IDX(cpu, i);
21418
21419 - ktype_cache.default_attrs = default_attrs;
21420 + ktype = &ktype_cache;
21421 #ifdef CONFIG_AMD_NB
21422 if (this_leaf->base.nb)
21423 - ktype_cache.default_attrs = amd_l3_attrs();
21424 + ktype = &ktype_cache_amd_nb;
21425 #endif
21426 retval = kobject_init_and_add(&(this_object->kobj),
21427 - &ktype_cache,
21428 + ktype,
21429 per_cpu(ici_cache_kobject, cpu),
21430 "index%1lu", i);
21431 if (unlikely(retval)) {
21432 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21433 index 61a9668ce..b446a37 100644
21434 --- a/arch/x86/kernel/cpu/mcheck/mce.c
21435 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
21436 @@ -45,6 +45,7 @@
21437 #include <asm/processor.h>
21438 #include <asm/mce.h>
21439 #include <asm/msr.h>
21440 +#include <asm/local.h>
21441
21442 #include "mce-internal.h"
21443
21444 @@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
21445 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21446 m->cs, m->ip);
21447
21448 - if (m->cs == __KERNEL_CS)
21449 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21450 print_symbol("{%s}", m->ip);
21451 pr_cont("\n");
21452 }
21453 @@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
21454
21455 #define PANIC_TIMEOUT 5 /* 5 seconds */
21456
21457 -static atomic_t mce_paniced;
21458 +static atomic_unchecked_t mce_paniced;
21459
21460 static int fake_panic;
21461 -static atomic_t mce_fake_paniced;
21462 +static atomic_unchecked_t mce_fake_paniced;
21463
21464 /* Panic in progress. Enable interrupts and wait for final IPI */
21465 static void wait_for_panic(void)
21466 @@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21467 /*
21468 * Make sure only one CPU runs in machine check panic
21469 */
21470 - if (atomic_inc_return(&mce_paniced) > 1)
21471 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21472 wait_for_panic();
21473 barrier();
21474
21475 @@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21476 console_verbose();
21477 } else {
21478 /* Don't log too much for fake panic */
21479 - if (atomic_inc_return(&mce_fake_paniced) > 1)
21480 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21481 return;
21482 }
21483 /* First print corrected ones that are still unlogged */
21484 @@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21485 if (!fake_panic) {
21486 if (panic_timeout == 0)
21487 panic_timeout = mca_cfg.panic_timeout;
21488 - panic(msg);
21489 + panic("%s", msg);
21490 } else
21491 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21492 }
21493 @@ -697,7 +698,7 @@ static int mce_timed_out(u64 *t)
21494 * might have been modified by someone else.
21495 */
21496 rmb();
21497 - if (atomic_read(&mce_paniced))
21498 + if (atomic_read_unchecked(&mce_paniced))
21499 wait_for_panic();
21500 if (!mca_cfg.monarch_timeout)
21501 goto out;
21502 @@ -1674,7 +1675,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21503 }
21504
21505 /* Call the installed machine check handler for this CPU setup. */
21506 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
21507 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21508 unexpected_machine_check;
21509
21510 /*
21511 @@ -1697,7 +1698,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21512 return;
21513 }
21514
21515 + pax_open_kernel();
21516 machine_check_vector = do_machine_check;
21517 + pax_close_kernel();
21518
21519 __mcheck_cpu_init_generic();
21520 __mcheck_cpu_init_vendor(c);
21521 @@ -1711,7 +1714,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21522 */
21523
21524 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21525 -static int mce_chrdev_open_count; /* #times opened */
21526 +static local_t mce_chrdev_open_count; /* #times opened */
21527 static int mce_chrdev_open_exclu; /* already open exclusive? */
21528
21529 static int mce_chrdev_open(struct inode *inode, struct file *file)
21530 @@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21531 spin_lock(&mce_chrdev_state_lock);
21532
21533 if (mce_chrdev_open_exclu ||
21534 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21535 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21536 spin_unlock(&mce_chrdev_state_lock);
21537
21538 return -EBUSY;
21539 @@ -1727,7 +1730,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21540
21541 if (file->f_flags & O_EXCL)
21542 mce_chrdev_open_exclu = 1;
21543 - mce_chrdev_open_count++;
21544 + local_inc(&mce_chrdev_open_count);
21545
21546 spin_unlock(&mce_chrdev_state_lock);
21547
21548 @@ -1738,7 +1741,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21549 {
21550 spin_lock(&mce_chrdev_state_lock);
21551
21552 - mce_chrdev_open_count--;
21553 + local_dec(&mce_chrdev_open_count);
21554 mce_chrdev_open_exclu = 0;
21555
21556 spin_unlock(&mce_chrdev_state_lock);
21557 @@ -2413,7 +2416,7 @@ static __init void mce_init_banks(void)
21558
21559 for (i = 0; i < mca_cfg.banks; i++) {
21560 struct mce_bank *b = &mce_banks[i];
21561 - struct device_attribute *a = &b->attr;
21562 + device_attribute_no_const *a = &b->attr;
21563
21564 sysfs_attr_init(&a->attr);
21565 a->attr.name = b->attrname;
21566 @@ -2520,7 +2523,7 @@ struct dentry *mce_get_debugfs_dir(void)
21567 static void mce_reset(void)
21568 {
21569 cpu_missing = 0;
21570 - atomic_set(&mce_fake_paniced, 0);
21571 + atomic_set_unchecked(&mce_fake_paniced, 0);
21572 atomic_set(&mce_executing, 0);
21573 atomic_set(&mce_callin, 0);
21574 atomic_set(&global_nwo, 0);
21575 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21576 index a304298..49b6d06 100644
21577 --- a/arch/x86/kernel/cpu/mcheck/p5.c
21578 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
21579 @@ -10,6 +10,7 @@
21580 #include <asm/processor.h>
21581 #include <asm/mce.h>
21582 #include <asm/msr.h>
21583 +#include <asm/pgtable.h>
21584
21585 /* By default disabled */
21586 int mce_p5_enabled __read_mostly;
21587 @@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21588 if (!cpu_has(c, X86_FEATURE_MCE))
21589 return;
21590
21591 + pax_open_kernel();
21592 machine_check_vector = pentium_machine_check;
21593 + pax_close_kernel();
21594 /* Make sure the vector pointer is visible before we enable MCEs: */
21595 wmb();
21596
21597 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21598 index 7dc5564..1273569 100644
21599 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
21600 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21601 @@ -9,6 +9,7 @@
21602 #include <asm/processor.h>
21603 #include <asm/mce.h>
21604 #include <asm/msr.h>
21605 +#include <asm/pgtable.h>
21606
21607 /* Machine check handler for WinChip C6: */
21608 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21609 @@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21610 {
21611 u32 lo, hi;
21612
21613 + pax_open_kernel();
21614 machine_check_vector = winchip_machine_check;
21615 + pax_close_kernel();
21616 /* Make sure the vector pointer is visible before we enable MCEs: */
21617 wmb();
21618
21619 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21620 index 08fe6e8..35885b0 100644
21621 --- a/arch/x86/kernel/cpu/microcode/core.c
21622 +++ b/arch/x86/kernel/cpu/microcode/core.c
21623 @@ -526,7 +526,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21624 return NOTIFY_OK;
21625 }
21626
21627 -static struct notifier_block __refdata mc_cpu_notifier = {
21628 +static struct notifier_block mc_cpu_notifier = {
21629 .notifier_call = mc_cpu_callback,
21630 };
21631
21632 diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21633 index c6826d1..ad18e14a 100644
21634 --- a/arch/x86/kernel/cpu/microcode/intel.c
21635 +++ b/arch/x86/kernel/cpu/microcode/intel.c
21636 @@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21637
21638 static int get_ucode_user(void *to, const void *from, size_t n)
21639 {
21640 - return copy_from_user(to, from, n);
21641 + return copy_from_user(to, (const void __force_user *)from, n);
21642 }
21643
21644 static enum ucode_state
21645 request_microcode_user(int cpu, const void __user *buf, size_t size)
21646 {
21647 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21648 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21649 }
21650
21651 static void microcode_fini_cpu(int cpu)
21652 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21653 index ea5f363..cb0e905 100644
21654 --- a/arch/x86/kernel/cpu/mtrr/main.c
21655 +++ b/arch/x86/kernel/cpu/mtrr/main.c
21656 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21657 u64 size_or_mask, size_and_mask;
21658 static bool mtrr_aps_delayed_init;
21659
21660 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21661 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21662
21663 const struct mtrr_ops *mtrr_if;
21664
21665 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21666 index df5e41f..816c719 100644
21667 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21668 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21669 @@ -25,7 +25,7 @@ struct mtrr_ops {
21670 int (*validate_add_page)(unsigned long base, unsigned long size,
21671 unsigned int type);
21672 int (*have_wrcomb)(void);
21673 -};
21674 +} __do_const;
21675
21676 extern int generic_get_free_region(unsigned long base, unsigned long size,
21677 int replace_reg);
21678 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21679 index 143e5f5..5825081 100644
21680 --- a/arch/x86/kernel/cpu/perf_event.c
21681 +++ b/arch/x86/kernel/cpu/perf_event.c
21682 @@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
21683
21684 }
21685
21686 -static struct attribute_group x86_pmu_format_group = {
21687 +static attribute_group_no_const x86_pmu_format_group = {
21688 .name = "format",
21689 .attrs = NULL,
21690 };
21691 @@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
21692 NULL,
21693 };
21694
21695 -static struct attribute_group x86_pmu_events_group = {
21696 +static attribute_group_no_const x86_pmu_events_group = {
21697 .name = "events",
21698 .attrs = events_attr,
21699 };
21700 @@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
21701 if (idx > GDT_ENTRIES)
21702 return 0;
21703
21704 - desc = raw_cpu_ptr(gdt_page.gdt);
21705 + desc = get_cpu_gdt_table(smp_processor_id());
21706 }
21707
21708 return get_desc_base(desc + idx);
21709 @@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21710 break;
21711
21712 perf_callchain_store(entry, frame.return_address);
21713 - fp = frame.next_frame;
21714 + fp = (const void __force_user *)frame.next_frame;
21715 }
21716 }
21717
21718 diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21719 index 639d128..e92d7e5 100644
21720 --- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21721 +++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21722 @@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21723 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21724 {
21725 struct attribute **attrs;
21726 - struct attribute_group *attr_group;
21727 + attribute_group_no_const *attr_group;
21728 int i = 0, j;
21729
21730 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21731 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21732 index 944bf01..4a4392f 100644
21733 --- a/arch/x86/kernel/cpu/perf_event_intel.c
21734 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
21735 @@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21736 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21737
21738 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21739 - u64 capabilities;
21740 + u64 capabilities = x86_pmu.intel_cap.capabilities;
21741
21742 - rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21743 - x86_pmu.intel_cap.capabilities = capabilities;
21744 + if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21745 + x86_pmu.intel_cap.capabilities = capabilities;
21746 }
21747
21748 intel_ds_init();
21749 diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21750 index d64f275..26522ff 100644
21751 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21752 +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21753 @@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21754 NULL,
21755 };
21756
21757 -static struct attribute_group rapl_pmu_events_group = {
21758 +static attribute_group_no_const rapl_pmu_events_group __read_only = {
21759 .name = "events",
21760 .attrs = NULL, /* patched at runtime */
21761 };
21762 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21763 index 9762dbd..53d5d21 100644
21764 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21765 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21766 @@ -721,7 +721,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21767 static int __init uncore_type_init(struct intel_uncore_type *type)
21768 {
21769 struct intel_uncore_pmu *pmus;
21770 - struct attribute_group *attr_group;
21771 + attribute_group_no_const *attr_group;
21772 struct attribute **attrs;
21773 int i, j;
21774
21775 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21776 index 18eb78b..18747cc 100644
21777 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21778 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21779 @@ -114,7 +114,7 @@ struct intel_uncore_box {
21780 struct uncore_event_desc {
21781 struct kobj_attribute attr;
21782 const char *config;
21783 -};
21784 +} __do_const;
21785
21786 ssize_t uncore_event_show(struct kobject *kobj,
21787 struct kobj_attribute *attr, char *buf);
21788 diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21789 index 3225ae6c..ee3c6db 100644
21790 --- a/arch/x86/kernel/cpuid.c
21791 +++ b/arch/x86/kernel/cpuid.c
21792 @@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21793 return notifier_from_errno(err);
21794 }
21795
21796 -static struct notifier_block __refdata cpuid_class_cpu_notifier =
21797 +static struct notifier_block cpuid_class_cpu_notifier =
21798 {
21799 .notifier_call = cpuid_class_cpu_callback,
21800 };
21801 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21802 index f5ab56d..d3b201a 100644
21803 --- a/arch/x86/kernel/crash.c
21804 +++ b/arch/x86/kernel/crash.c
21805 @@ -104,7 +104,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21806 #ifdef CONFIG_X86_32
21807 struct pt_regs fixed_regs;
21808
21809 - if (!user_mode_vm(regs)) {
21810 + if (!user_mode(regs)) {
21811 crash_fixup_ss_esp(&fixed_regs, regs);
21812 regs = &fixed_regs;
21813 }
21814 diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21815 index afa64ad..dce67dd 100644
21816 --- a/arch/x86/kernel/crash_dump_64.c
21817 +++ b/arch/x86/kernel/crash_dump_64.c
21818 @@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21819 return -ENOMEM;
21820
21821 if (userbuf) {
21822 - if (copy_to_user(buf, vaddr + offset, csize)) {
21823 + if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21824 iounmap(vaddr);
21825 return -EFAULT;
21826 }
21827 diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21828 index f6dfd93..892ade4 100644
21829 --- a/arch/x86/kernel/doublefault.c
21830 +++ b/arch/x86/kernel/doublefault.c
21831 @@ -12,7 +12,7 @@
21832
21833 #define DOUBLEFAULT_STACKSIZE (1024)
21834 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21835 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21836 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21837
21838 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21839
21840 @@ -22,7 +22,7 @@ static void doublefault_fn(void)
21841 unsigned long gdt, tss;
21842
21843 native_store_gdt(&gdt_desc);
21844 - gdt = gdt_desc.address;
21845 + gdt = (unsigned long)gdt_desc.address;
21846
21847 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21848
21849 @@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21850 /* 0x2 bit is always set */
21851 .flags = X86_EFLAGS_SF | 0x2,
21852 .sp = STACK_START,
21853 - .es = __USER_DS,
21854 + .es = __KERNEL_DS,
21855 .cs = __KERNEL_CS,
21856 .ss = __KERNEL_DS,
21857 - .ds = __USER_DS,
21858 + .ds = __KERNEL_DS,
21859 .fs = __KERNEL_PERCPU,
21860
21861 .__cr3 = __pa_nodebug(swapper_pg_dir),
21862 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21863 index b74ebc7..2c95874 100644
21864 --- a/arch/x86/kernel/dumpstack.c
21865 +++ b/arch/x86/kernel/dumpstack.c
21866 @@ -2,6 +2,9 @@
21867 * Copyright (C) 1991, 1992 Linus Torvalds
21868 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21869 */
21870 +#ifdef CONFIG_GRKERNSEC_HIDESYM
21871 +#define __INCLUDED_BY_HIDESYM 1
21872 +#endif
21873 #include <linux/kallsyms.h>
21874 #include <linux/kprobes.h>
21875 #include <linux/uaccess.h>
21876 @@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21877
21878 void printk_address(unsigned long address)
21879 {
21880 - pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21881 + pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21882 }
21883
21884 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21885 static void
21886 print_ftrace_graph_addr(unsigned long addr, void *data,
21887 const struct stacktrace_ops *ops,
21888 - struct thread_info *tinfo, int *graph)
21889 + struct task_struct *task, int *graph)
21890 {
21891 - struct task_struct *task;
21892 unsigned long ret_addr;
21893 int index;
21894
21895 if (addr != (unsigned long)return_to_handler)
21896 return;
21897
21898 - task = tinfo->task;
21899 index = task->curr_ret_stack;
21900
21901 if (!task->ret_stack || index < *graph)
21902 @@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21903 static inline void
21904 print_ftrace_graph_addr(unsigned long addr, void *data,
21905 const struct stacktrace_ops *ops,
21906 - struct thread_info *tinfo, int *graph)
21907 + struct task_struct *task, int *graph)
21908 { }
21909 #endif
21910
21911 @@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21912 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21913 */
21914
21915 -static inline int valid_stack_ptr(struct thread_info *tinfo,
21916 - void *p, unsigned int size, void *end)
21917 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21918 {
21919 - void *t = tinfo;
21920 if (end) {
21921 if (p < end && p >= (end-THREAD_SIZE))
21922 return 1;
21923 @@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21924 }
21925
21926 unsigned long
21927 -print_context_stack(struct thread_info *tinfo,
21928 +print_context_stack(struct task_struct *task, void *stack_start,
21929 unsigned long *stack, unsigned long bp,
21930 const struct stacktrace_ops *ops, void *data,
21931 unsigned long *end, int *graph)
21932 {
21933 struct stack_frame *frame = (struct stack_frame *)bp;
21934
21935 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21936 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21937 unsigned long addr;
21938
21939 addr = *stack;
21940 @@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21941 } else {
21942 ops->address(data, addr, 0);
21943 }
21944 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21945 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21946 }
21947 stack++;
21948 }
21949 @@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21950 EXPORT_SYMBOL_GPL(print_context_stack);
21951
21952 unsigned long
21953 -print_context_stack_bp(struct thread_info *tinfo,
21954 +print_context_stack_bp(struct task_struct *task, void *stack_start,
21955 unsigned long *stack, unsigned long bp,
21956 const struct stacktrace_ops *ops, void *data,
21957 unsigned long *end, int *graph)
21958 @@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21959 struct stack_frame *frame = (struct stack_frame *)bp;
21960 unsigned long *ret_addr = &frame->return_address;
21961
21962 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21963 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21964 unsigned long addr = *ret_addr;
21965
21966 if (!__kernel_text_address(addr))
21967 @@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21968 ops->address(data, addr, 1);
21969 frame = frame->next_frame;
21970 ret_addr = &frame->return_address;
21971 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21972 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21973 }
21974
21975 return (unsigned long)frame;
21976 @@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21977 static void print_trace_address(void *data, unsigned long addr, int reliable)
21978 {
21979 touch_nmi_watchdog();
21980 - printk(data);
21981 + printk("%s", (char *)data);
21982 printk_stack_address(addr, reliable);
21983 }
21984
21985 @@ -225,6 +224,8 @@ unsigned long oops_begin(void)
21986 EXPORT_SYMBOL_GPL(oops_begin);
21987 NOKPROBE_SYMBOL(oops_begin);
21988
21989 +extern void gr_handle_kernel_exploit(void);
21990 +
21991 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21992 {
21993 if (regs && kexec_should_crash(current))
21994 @@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21995 panic("Fatal exception in interrupt");
21996 if (panic_on_oops)
21997 panic("Fatal exception");
21998 - do_exit(signr);
21999 +
22000 + gr_handle_kernel_exploit();
22001 +
22002 + do_group_exit(signr);
22003 }
22004 NOKPROBE_SYMBOL(oops_end);
22005
22006 @@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22007 print_modules();
22008 show_regs(regs);
22009 #ifdef CONFIG_X86_32
22010 - if (user_mode_vm(regs)) {
22011 + if (user_mode(regs)) {
22012 sp = regs->sp;
22013 ss = regs->ss & 0xffff;
22014 } else {
22015 @@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22016 unsigned long flags = oops_begin();
22017 int sig = SIGSEGV;
22018
22019 - if (!user_mode_vm(regs))
22020 + if (!user_mode(regs))
22021 report_bug(regs->ip, regs);
22022
22023 if (__die(str, regs, err))
22024 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22025 index 5abd4cd..c65733b 100644
22026 --- a/arch/x86/kernel/dumpstack_32.c
22027 +++ b/arch/x86/kernel/dumpstack_32.c
22028 @@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22029 bp = stack_frame(task, regs);
22030
22031 for (;;) {
22032 - struct thread_info *context;
22033 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22034 void *end_stack;
22035
22036 end_stack = is_hardirq_stack(stack, cpu);
22037 if (!end_stack)
22038 end_stack = is_softirq_stack(stack, cpu);
22039
22040 - context = task_thread_info(task);
22041 - bp = ops->walk_stack(context, stack, bp, ops, data,
22042 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22043 end_stack, &graph);
22044
22045 /* Stop if not on irq stack */
22046 @@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22047 int i;
22048
22049 show_regs_print_info(KERN_EMERG);
22050 - __show_regs(regs, !user_mode_vm(regs));
22051 + __show_regs(regs, !user_mode(regs));
22052
22053 /*
22054 * When in-kernel, we also print out the stack and code at the
22055 * time of the fault..
22056 */
22057 - if (!user_mode_vm(regs)) {
22058 + if (!user_mode(regs)) {
22059 unsigned int code_prologue = code_bytes * 43 / 64;
22060 unsigned int code_len = code_bytes;
22061 unsigned char c;
22062 u8 *ip;
22063 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22064
22065 pr_emerg("Stack:\n");
22066 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22067
22068 pr_emerg("Code:");
22069
22070 - ip = (u8 *)regs->ip - code_prologue;
22071 + ip = (u8 *)regs->ip - code_prologue + cs_base;
22072 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22073 /* try starting at IP */
22074 - ip = (u8 *)regs->ip;
22075 + ip = (u8 *)regs->ip + cs_base;
22076 code_len = code_len - code_prologue + 1;
22077 }
22078 for (i = 0; i < code_len; i++, ip++) {
22079 @@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22080 pr_cont(" Bad EIP value.");
22081 break;
22082 }
22083 - if (ip == (u8 *)regs->ip)
22084 + if (ip == (u8 *)regs->ip + cs_base)
22085 pr_cont(" <%02x>", c);
22086 else
22087 pr_cont(" %02x", c);
22088 @@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22089 {
22090 unsigned short ud2;
22091
22092 + ip = ktla_ktva(ip);
22093 if (ip < PAGE_OFFSET)
22094 return 0;
22095 if (probe_kernel_address((unsigned short *)ip, ud2))
22096 @@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22097
22098 return ud2 == 0x0b0f;
22099 }
22100 +
22101 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22102 +void pax_check_alloca(unsigned long size)
22103 +{
22104 + unsigned long sp = (unsigned long)&sp, stack_left;
22105 +
22106 + /* all kernel stacks are of the same size */
22107 + stack_left = sp & (THREAD_SIZE - 1);
22108 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22109 +}
22110 +EXPORT_SYMBOL(pax_check_alloca);
22111 +#endif
22112 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22113 index ff86f19..a20c62c 100644
22114 --- a/arch/x86/kernel/dumpstack_64.c
22115 +++ b/arch/x86/kernel/dumpstack_64.c
22116 @@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22117 const struct stacktrace_ops *ops, void *data)
22118 {
22119 const unsigned cpu = get_cpu();
22120 - struct thread_info *tinfo;
22121 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22122 unsigned long dummy;
22123 unsigned used = 0;
22124 int graph = 0;
22125 int done = 0;
22126 + void *stack_start;
22127
22128 if (!task)
22129 task = current;
22130 @@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22131 * current stack address. If the stacks consist of nested
22132 * exceptions
22133 */
22134 - tinfo = task_thread_info(task);
22135 while (!done) {
22136 unsigned long *stack_end;
22137 enum stack_type stype;
22138 @@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22139 if (ops->stack(data, id) < 0)
22140 break;
22141
22142 - bp = ops->walk_stack(tinfo, stack, bp, ops,
22143 + bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22144 data, stack_end, &graph);
22145 ops->stack(data, "<EOE>");
22146 /*
22147 @@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22148 * second-to-last pointer (index -2 to end) in the
22149 * exception stack:
22150 */
22151 + if ((u16)stack_end[-1] != __KERNEL_DS)
22152 + goto out;
22153 stack = (unsigned long *) stack_end[-2];
22154 done = 0;
22155 break;
22156 @@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22157
22158 if (ops->stack(data, "IRQ") < 0)
22159 break;
22160 - bp = ops->walk_stack(tinfo, stack, bp,
22161 + bp = ops->walk_stack(task, irq_stack, stack, bp,
22162 ops, data, stack_end, &graph);
22163 /*
22164 * We link to the next stack (which would be
22165 @@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22166 /*
22167 * This handles the process stack:
22168 */
22169 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22170 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22171 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22172 +out:
22173 put_cpu();
22174 }
22175 EXPORT_SYMBOL(dump_trace);
22176 @@ -349,3 +352,50 @@ int is_valid_bugaddr(unsigned long ip)
22177
22178 return ud2 == 0x0b0f;
22179 }
22180 +
22181 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22182 +void pax_check_alloca(unsigned long size)
22183 +{
22184 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22185 + unsigned cpu, used;
22186 + char *id;
22187 +
22188 + /* check the process stack first */
22189 + stack_start = (unsigned long)task_stack_page(current);
22190 + stack_end = stack_start + THREAD_SIZE;
22191 + if (likely(stack_start <= sp && sp < stack_end)) {
22192 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
22193 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22194 + return;
22195 + }
22196 +
22197 + cpu = get_cpu();
22198 +
22199 + /* check the irq stacks */
22200 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22201 + stack_start = stack_end - IRQ_STACK_SIZE;
22202 + if (stack_start <= sp && sp < stack_end) {
22203 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22204 + put_cpu();
22205 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22206 + return;
22207 + }
22208 +
22209 + /* check the exception stacks */
22210 + used = 0;
22211 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22212 + stack_start = stack_end - EXCEPTION_STKSZ;
22213 + if (stack_end && stack_start <= sp && sp < stack_end) {
22214 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22215 + put_cpu();
22216 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22217 + return;
22218 + }
22219 +
22220 + put_cpu();
22221 +
22222 + /* unknown stack */
22223 + BUG();
22224 +}
22225 +EXPORT_SYMBOL(pax_check_alloca);
22226 +#endif
22227 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22228 index 49f8864..1cc6d07 100644
22229 --- a/arch/x86/kernel/e820.c
22230 +++ b/arch/x86/kernel/e820.c
22231 @@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22232
22233 static void early_panic(char *msg)
22234 {
22235 - early_printk(msg);
22236 - panic(msg);
22237 + early_printk("%s", msg);
22238 + panic("%s", msg);
22239 }
22240
22241 static int userdef __initdata;
22242 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22243 index 01d1c18..8073693 100644
22244 --- a/arch/x86/kernel/early_printk.c
22245 +++ b/arch/x86/kernel/early_printk.c
22246 @@ -7,6 +7,7 @@
22247 #include <linux/pci_regs.h>
22248 #include <linux/pci_ids.h>
22249 #include <linux/errno.h>
22250 +#include <linux/sched.h>
22251 #include <asm/io.h>
22252 #include <asm/processor.h>
22253 #include <asm/fcntl.h>
22254 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22255 index 344b63f..ccdac7a 100644
22256 --- a/arch/x86/kernel/entry_32.S
22257 +++ b/arch/x86/kernel/entry_32.S
22258 @@ -177,13 +177,153 @@
22259 /*CFI_REL_OFFSET gs, PT_GS*/
22260 .endm
22261 .macro SET_KERNEL_GS reg
22262 +
22263 +#ifdef CONFIG_CC_STACKPROTECTOR
22264 movl $(__KERNEL_STACK_CANARY), \reg
22265 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22266 + movl $(__USER_DS), \reg
22267 +#else
22268 + xorl \reg, \reg
22269 +#endif
22270 +
22271 movl \reg, %gs
22272 .endm
22273
22274 #endif /* CONFIG_X86_32_LAZY_GS */
22275
22276 -.macro SAVE_ALL
22277 +.macro pax_enter_kernel
22278 +#ifdef CONFIG_PAX_KERNEXEC
22279 + call pax_enter_kernel
22280 +#endif
22281 +.endm
22282 +
22283 +.macro pax_exit_kernel
22284 +#ifdef CONFIG_PAX_KERNEXEC
22285 + call pax_exit_kernel
22286 +#endif
22287 +.endm
22288 +
22289 +#ifdef CONFIG_PAX_KERNEXEC
22290 +ENTRY(pax_enter_kernel)
22291 +#ifdef CONFIG_PARAVIRT
22292 + pushl %eax
22293 + pushl %ecx
22294 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22295 + mov %eax, %esi
22296 +#else
22297 + mov %cr0, %esi
22298 +#endif
22299 + bts $16, %esi
22300 + jnc 1f
22301 + mov %cs, %esi
22302 + cmp $__KERNEL_CS, %esi
22303 + jz 3f
22304 + ljmp $__KERNEL_CS, $3f
22305 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22306 +2:
22307 +#ifdef CONFIG_PARAVIRT
22308 + mov %esi, %eax
22309 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22310 +#else
22311 + mov %esi, %cr0
22312 +#endif
22313 +3:
22314 +#ifdef CONFIG_PARAVIRT
22315 + popl %ecx
22316 + popl %eax
22317 +#endif
22318 + ret
22319 +ENDPROC(pax_enter_kernel)
22320 +
22321 +ENTRY(pax_exit_kernel)
22322 +#ifdef CONFIG_PARAVIRT
22323 + pushl %eax
22324 + pushl %ecx
22325 +#endif
22326 + mov %cs, %esi
22327 + cmp $__KERNEXEC_KERNEL_CS, %esi
22328 + jnz 2f
22329 +#ifdef CONFIG_PARAVIRT
22330 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22331 + mov %eax, %esi
22332 +#else
22333 + mov %cr0, %esi
22334 +#endif
22335 + btr $16, %esi
22336 + ljmp $__KERNEL_CS, $1f
22337 +1:
22338 +#ifdef CONFIG_PARAVIRT
22339 + mov %esi, %eax
22340 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22341 +#else
22342 + mov %esi, %cr0
22343 +#endif
22344 +2:
22345 +#ifdef CONFIG_PARAVIRT
22346 + popl %ecx
22347 + popl %eax
22348 +#endif
22349 + ret
22350 +ENDPROC(pax_exit_kernel)
22351 +#endif
22352 +
22353 + .macro pax_erase_kstack
22354 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22355 + call pax_erase_kstack
22356 +#endif
22357 + .endm
22358 +
22359 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22360 +/*
22361 + * ebp: thread_info
22362 + */
22363 +ENTRY(pax_erase_kstack)
22364 + pushl %edi
22365 + pushl %ecx
22366 + pushl %eax
22367 +
22368 + mov TI_lowest_stack(%ebp), %edi
22369 + mov $-0xBEEF, %eax
22370 + std
22371 +
22372 +1: mov %edi, %ecx
22373 + and $THREAD_SIZE_asm - 1, %ecx
22374 + shr $2, %ecx
22375 + repne scasl
22376 + jecxz 2f
22377 +
22378 + cmp $2*16, %ecx
22379 + jc 2f
22380 +
22381 + mov $2*16, %ecx
22382 + repe scasl
22383 + jecxz 2f
22384 + jne 1b
22385 +
22386 +2: cld
22387 + mov %esp, %ecx
22388 + sub %edi, %ecx
22389 +
22390 + cmp $THREAD_SIZE_asm, %ecx
22391 + jb 3f
22392 + ud2
22393 +3:
22394 +
22395 + shr $2, %ecx
22396 + rep stosl
22397 +
22398 + mov TI_task_thread_sp0(%ebp), %edi
22399 + sub $128, %edi
22400 + mov %edi, TI_lowest_stack(%ebp)
22401 +
22402 + popl %eax
22403 + popl %ecx
22404 + popl %edi
22405 + ret
22406 +ENDPROC(pax_erase_kstack)
22407 +#endif
22408 +
22409 +.macro __SAVE_ALL _DS
22410 cld
22411 PUSH_GS
22412 pushl_cfi %fs
22413 @@ -206,7 +346,7 @@
22414 CFI_REL_OFFSET ecx, 0
22415 pushl_cfi %ebx
22416 CFI_REL_OFFSET ebx, 0
22417 - movl $(__USER_DS), %edx
22418 + movl $\_DS, %edx
22419 movl %edx, %ds
22420 movl %edx, %es
22421 movl $(__KERNEL_PERCPU), %edx
22422 @@ -214,6 +354,15 @@
22423 SET_KERNEL_GS %edx
22424 .endm
22425
22426 +.macro SAVE_ALL
22427 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22428 + __SAVE_ALL __KERNEL_DS
22429 + pax_enter_kernel
22430 +#else
22431 + __SAVE_ALL __USER_DS
22432 +#endif
22433 +.endm
22434 +
22435 .macro RESTORE_INT_REGS
22436 popl_cfi %ebx
22437 CFI_RESTORE ebx
22438 @@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
22439 popfl_cfi
22440 jmp syscall_exit
22441 CFI_ENDPROC
22442 -END(ret_from_fork)
22443 +ENDPROC(ret_from_fork)
22444
22445 ENTRY(ret_from_kernel_thread)
22446 CFI_STARTPROC
22447 @@ -340,7 +489,15 @@ ret_from_intr:
22448 andl $SEGMENT_RPL_MASK, %eax
22449 #endif
22450 cmpl $USER_RPL, %eax
22451 +
22452 +#ifdef CONFIG_PAX_KERNEXEC
22453 + jae resume_userspace
22454 +
22455 + pax_exit_kernel
22456 + jmp resume_kernel
22457 +#else
22458 jb resume_kernel # not returning to v8086 or userspace
22459 +#endif
22460
22461 ENTRY(resume_userspace)
22462 LOCKDEP_SYS_EXIT
22463 @@ -352,8 +509,8 @@ ENTRY(resume_userspace)
22464 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22465 # int/exception return?
22466 jne work_pending
22467 - jmp restore_all
22468 -END(ret_from_exception)
22469 + jmp restore_all_pax
22470 +ENDPROC(ret_from_exception)
22471
22472 #ifdef CONFIG_PREEMPT
22473 ENTRY(resume_kernel)
22474 @@ -365,7 +522,7 @@ need_resched:
22475 jz restore_all
22476 call preempt_schedule_irq
22477 jmp need_resched
22478 -END(resume_kernel)
22479 +ENDPROC(resume_kernel)
22480 #endif
22481 CFI_ENDPROC
22482
22483 @@ -395,30 +552,45 @@ sysenter_past_esp:
22484 /*CFI_REL_OFFSET cs, 0*/
22485 /*
22486 * Push current_thread_info()->sysenter_return to the stack.
22487 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22488 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
22489 */
22490 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22491 + pushl_cfi $0
22492 CFI_REL_OFFSET eip, 0
22493
22494 pushl_cfi %eax
22495 SAVE_ALL
22496 + GET_THREAD_INFO(%ebp)
22497 + movl TI_sysenter_return(%ebp),%ebp
22498 + movl %ebp,PT_EIP(%esp)
22499 ENABLE_INTERRUPTS(CLBR_NONE)
22500
22501 /*
22502 * Load the potential sixth argument from user stack.
22503 * Careful about security.
22504 */
22505 + movl PT_OLDESP(%esp),%ebp
22506 +
22507 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22508 + mov PT_OLDSS(%esp),%ds
22509 +1: movl %ds:(%ebp),%ebp
22510 + push %ss
22511 + pop %ds
22512 +#else
22513 cmpl $__PAGE_OFFSET-3,%ebp
22514 jae syscall_fault
22515 ASM_STAC
22516 1: movl (%ebp),%ebp
22517 ASM_CLAC
22518 +#endif
22519 +
22520 movl %ebp,PT_EBP(%esp)
22521 _ASM_EXTABLE(1b,syscall_fault)
22522
22523 GET_THREAD_INFO(%ebp)
22524
22525 +#ifdef CONFIG_PAX_RANDKSTACK
22526 + pax_erase_kstack
22527 +#endif
22528 +
22529 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22530 jnz sysenter_audit
22531 sysenter_do_call:
22532 @@ -434,12 +606,24 @@ sysenter_after_call:
22533 testl $_TIF_ALLWORK_MASK, %ecx
22534 jne sysexit_audit
22535 sysenter_exit:
22536 +
22537 +#ifdef CONFIG_PAX_RANDKSTACK
22538 + pushl_cfi %eax
22539 + movl %esp, %eax
22540 + call pax_randomize_kstack
22541 + popl_cfi %eax
22542 +#endif
22543 +
22544 + pax_erase_kstack
22545 +
22546 /* if something modifies registers it must also disable sysexit */
22547 movl PT_EIP(%esp), %edx
22548 movl PT_OLDESP(%esp), %ecx
22549 xorl %ebp,%ebp
22550 TRACE_IRQS_ON
22551 1: mov PT_FS(%esp), %fs
22552 +2: mov PT_DS(%esp), %ds
22553 +3: mov PT_ES(%esp), %es
22554 PTGS_TO_GS
22555 ENABLE_INTERRUPTS_SYSEXIT
22556
22557 @@ -453,6 +637,9 @@ sysenter_audit:
22558 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22559 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22560 call __audit_syscall_entry
22561 +
22562 + pax_erase_kstack
22563 +
22564 popl_cfi %ecx /* get that remapped edx off the stack */
22565 popl_cfi %ecx /* get that remapped esi off the stack */
22566 movl PT_EAX(%esp),%eax /* reload syscall number */
22567 @@ -479,10 +666,16 @@ sysexit_audit:
22568
22569 CFI_ENDPROC
22570 .pushsection .fixup,"ax"
22571 -2: movl $0,PT_FS(%esp)
22572 +4: movl $0,PT_FS(%esp)
22573 + jmp 1b
22574 +5: movl $0,PT_DS(%esp)
22575 + jmp 1b
22576 +6: movl $0,PT_ES(%esp)
22577 jmp 1b
22578 .popsection
22579 - _ASM_EXTABLE(1b,2b)
22580 + _ASM_EXTABLE(1b,4b)
22581 + _ASM_EXTABLE(2b,5b)
22582 + _ASM_EXTABLE(3b,6b)
22583 PTGS_TO_GS_EX
22584 ENDPROC(ia32_sysenter_target)
22585
22586 @@ -493,6 +686,11 @@ ENTRY(system_call)
22587 pushl_cfi %eax # save orig_eax
22588 SAVE_ALL
22589 GET_THREAD_INFO(%ebp)
22590 +
22591 +#ifdef CONFIG_PAX_RANDKSTACK
22592 + pax_erase_kstack
22593 +#endif
22594 +
22595 # system call tracing in operation / emulation
22596 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22597 jnz syscall_trace_entry
22598 @@ -512,6 +710,15 @@ syscall_exit:
22599 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22600 jne syscall_exit_work
22601
22602 +restore_all_pax:
22603 +
22604 +#ifdef CONFIG_PAX_RANDKSTACK
22605 + movl %esp, %eax
22606 + call pax_randomize_kstack
22607 +#endif
22608 +
22609 + pax_erase_kstack
22610 +
22611 restore_all:
22612 TRACE_IRQS_IRET
22613 restore_all_notrace:
22614 @@ -566,14 +773,34 @@ ldt_ss:
22615 * compensating for the offset by changing to the ESPFIX segment with
22616 * a base address that matches for the difference.
22617 */
22618 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22619 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22620 mov %esp, %edx /* load kernel esp */
22621 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22622 mov %dx, %ax /* eax: new kernel esp */
22623 sub %eax, %edx /* offset (low word is 0) */
22624 +#ifdef CONFIG_SMP
22625 + movl PER_CPU_VAR(cpu_number), %ebx
22626 + shll $PAGE_SHIFT_asm, %ebx
22627 + addl $cpu_gdt_table, %ebx
22628 +#else
22629 + movl $cpu_gdt_table, %ebx
22630 +#endif
22631 shr $16, %edx
22632 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22633 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22634 +
22635 +#ifdef CONFIG_PAX_KERNEXEC
22636 + mov %cr0, %esi
22637 + btr $16, %esi
22638 + mov %esi, %cr0
22639 +#endif
22640 +
22641 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22642 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22643 +
22644 +#ifdef CONFIG_PAX_KERNEXEC
22645 + bts $16, %esi
22646 + mov %esi, %cr0
22647 +#endif
22648 +
22649 pushl_cfi $__ESPFIX_SS
22650 pushl_cfi %eax /* new kernel esp */
22651 /* Disable interrupts, but do not irqtrace this section: we
22652 @@ -603,20 +830,18 @@ work_resched:
22653 movl TI_flags(%ebp), %ecx
22654 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22655 # than syscall tracing?
22656 - jz restore_all
22657 + jz restore_all_pax
22658 testb $_TIF_NEED_RESCHED, %cl
22659 jnz work_resched
22660
22661 work_notifysig: # deal with pending signals and
22662 # notify-resume requests
22663 + movl %esp, %eax
22664 #ifdef CONFIG_VM86
22665 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22666 - movl %esp, %eax
22667 jne work_notifysig_v86 # returning to kernel-space or
22668 # vm86-space
22669 1:
22670 -#else
22671 - movl %esp, %eax
22672 #endif
22673 TRACE_IRQS_ON
22674 ENABLE_INTERRUPTS(CLBR_NONE)
22675 @@ -637,7 +862,7 @@ work_notifysig_v86:
22676 movl %eax, %esp
22677 jmp 1b
22678 #endif
22679 -END(work_pending)
22680 +ENDPROC(work_pending)
22681
22682 # perform syscall exit tracing
22683 ALIGN
22684 @@ -645,11 +870,14 @@ syscall_trace_entry:
22685 movl $-ENOSYS,PT_EAX(%esp)
22686 movl %esp, %eax
22687 call syscall_trace_enter
22688 +
22689 + pax_erase_kstack
22690 +
22691 /* What it returned is what we'll actually use. */
22692 cmpl $(NR_syscalls), %eax
22693 jnae syscall_call
22694 jmp syscall_exit
22695 -END(syscall_trace_entry)
22696 +ENDPROC(syscall_trace_entry)
22697
22698 # perform syscall exit tracing
22699 ALIGN
22700 @@ -662,26 +890,30 @@ syscall_exit_work:
22701 movl %esp, %eax
22702 call syscall_trace_leave
22703 jmp resume_userspace
22704 -END(syscall_exit_work)
22705 +ENDPROC(syscall_exit_work)
22706 CFI_ENDPROC
22707
22708 RING0_INT_FRAME # can't unwind into user space anyway
22709 syscall_fault:
22710 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22711 + push %ss
22712 + pop %ds
22713 +#endif
22714 ASM_CLAC
22715 GET_THREAD_INFO(%ebp)
22716 movl $-EFAULT,PT_EAX(%esp)
22717 jmp resume_userspace
22718 -END(syscall_fault)
22719 +ENDPROC(syscall_fault)
22720
22721 syscall_badsys:
22722 movl $-ENOSYS,%eax
22723 jmp syscall_after_call
22724 -END(syscall_badsys)
22725 +ENDPROC(syscall_badsys)
22726
22727 sysenter_badsys:
22728 movl $-ENOSYS,%eax
22729 jmp sysenter_after_call
22730 -END(sysenter_badsys)
22731 +ENDPROC(sysenter_badsys)
22732 CFI_ENDPROC
22733
22734 .macro FIXUP_ESPFIX_STACK
22735 @@ -694,8 +926,15 @@ END(sysenter_badsys)
22736 */
22737 #ifdef CONFIG_X86_ESPFIX32
22738 /* fixup the stack */
22739 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22740 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22741 +#ifdef CONFIG_SMP
22742 + movl PER_CPU_VAR(cpu_number), %ebx
22743 + shll $PAGE_SHIFT_asm, %ebx
22744 + addl $cpu_gdt_table, %ebx
22745 +#else
22746 + movl $cpu_gdt_table, %ebx
22747 +#endif
22748 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22749 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22750 shl $16, %eax
22751 addl %esp, %eax /* the adjusted stack pointer */
22752 pushl_cfi $__KERNEL_DS
22753 @@ -751,7 +990,7 @@ vector=vector+1
22754 .endr
22755 2: jmp common_interrupt
22756 .endr
22757 -END(irq_entries_start)
22758 +ENDPROC(irq_entries_start)
22759
22760 .previous
22761 END(interrupt)
22762 @@ -808,7 +1047,7 @@ ENTRY(coprocessor_error)
22763 pushl_cfi $do_coprocessor_error
22764 jmp error_code
22765 CFI_ENDPROC
22766 -END(coprocessor_error)
22767 +ENDPROC(coprocessor_error)
22768
22769 ENTRY(simd_coprocessor_error)
22770 RING0_INT_FRAME
22771 @@ -821,7 +1060,7 @@ ENTRY(simd_coprocessor_error)
22772 .section .altinstructions,"a"
22773 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22774 .previous
22775 -.section .altinstr_replacement,"ax"
22776 +.section .altinstr_replacement,"a"
22777 663: pushl $do_simd_coprocessor_error
22778 664:
22779 .previous
22780 @@ -830,7 +1069,7 @@ ENTRY(simd_coprocessor_error)
22781 #endif
22782 jmp error_code
22783 CFI_ENDPROC
22784 -END(simd_coprocessor_error)
22785 +ENDPROC(simd_coprocessor_error)
22786
22787 ENTRY(device_not_available)
22788 RING0_INT_FRAME
22789 @@ -839,18 +1078,18 @@ ENTRY(device_not_available)
22790 pushl_cfi $do_device_not_available
22791 jmp error_code
22792 CFI_ENDPROC
22793 -END(device_not_available)
22794 +ENDPROC(device_not_available)
22795
22796 #ifdef CONFIG_PARAVIRT
22797 ENTRY(native_iret)
22798 iret
22799 _ASM_EXTABLE(native_iret, iret_exc)
22800 -END(native_iret)
22801 +ENDPROC(native_iret)
22802
22803 ENTRY(native_irq_enable_sysexit)
22804 sti
22805 sysexit
22806 -END(native_irq_enable_sysexit)
22807 +ENDPROC(native_irq_enable_sysexit)
22808 #endif
22809
22810 ENTRY(overflow)
22811 @@ -860,7 +1099,7 @@ ENTRY(overflow)
22812 pushl_cfi $do_overflow
22813 jmp error_code
22814 CFI_ENDPROC
22815 -END(overflow)
22816 +ENDPROC(overflow)
22817
22818 ENTRY(bounds)
22819 RING0_INT_FRAME
22820 @@ -869,7 +1108,7 @@ ENTRY(bounds)
22821 pushl_cfi $do_bounds
22822 jmp error_code
22823 CFI_ENDPROC
22824 -END(bounds)
22825 +ENDPROC(bounds)
22826
22827 ENTRY(invalid_op)
22828 RING0_INT_FRAME
22829 @@ -878,7 +1117,7 @@ ENTRY(invalid_op)
22830 pushl_cfi $do_invalid_op
22831 jmp error_code
22832 CFI_ENDPROC
22833 -END(invalid_op)
22834 +ENDPROC(invalid_op)
22835
22836 ENTRY(coprocessor_segment_overrun)
22837 RING0_INT_FRAME
22838 @@ -887,7 +1126,7 @@ ENTRY(coprocessor_segment_overrun)
22839 pushl_cfi $do_coprocessor_segment_overrun
22840 jmp error_code
22841 CFI_ENDPROC
22842 -END(coprocessor_segment_overrun)
22843 +ENDPROC(coprocessor_segment_overrun)
22844
22845 ENTRY(invalid_TSS)
22846 RING0_EC_FRAME
22847 @@ -895,7 +1134,7 @@ ENTRY(invalid_TSS)
22848 pushl_cfi $do_invalid_TSS
22849 jmp error_code
22850 CFI_ENDPROC
22851 -END(invalid_TSS)
22852 +ENDPROC(invalid_TSS)
22853
22854 ENTRY(segment_not_present)
22855 RING0_EC_FRAME
22856 @@ -903,7 +1142,7 @@ ENTRY(segment_not_present)
22857 pushl_cfi $do_segment_not_present
22858 jmp error_code
22859 CFI_ENDPROC
22860 -END(segment_not_present)
22861 +ENDPROC(segment_not_present)
22862
22863 ENTRY(stack_segment)
22864 RING0_EC_FRAME
22865 @@ -911,7 +1150,7 @@ ENTRY(stack_segment)
22866 pushl_cfi $do_stack_segment
22867 jmp error_code
22868 CFI_ENDPROC
22869 -END(stack_segment)
22870 +ENDPROC(stack_segment)
22871
22872 ENTRY(alignment_check)
22873 RING0_EC_FRAME
22874 @@ -919,7 +1158,7 @@ ENTRY(alignment_check)
22875 pushl_cfi $do_alignment_check
22876 jmp error_code
22877 CFI_ENDPROC
22878 -END(alignment_check)
22879 +ENDPROC(alignment_check)
22880
22881 ENTRY(divide_error)
22882 RING0_INT_FRAME
22883 @@ -928,7 +1167,7 @@ ENTRY(divide_error)
22884 pushl_cfi $do_divide_error
22885 jmp error_code
22886 CFI_ENDPROC
22887 -END(divide_error)
22888 +ENDPROC(divide_error)
22889
22890 #ifdef CONFIG_X86_MCE
22891 ENTRY(machine_check)
22892 @@ -938,7 +1177,7 @@ ENTRY(machine_check)
22893 pushl_cfi machine_check_vector
22894 jmp error_code
22895 CFI_ENDPROC
22896 -END(machine_check)
22897 +ENDPROC(machine_check)
22898 #endif
22899
22900 ENTRY(spurious_interrupt_bug)
22901 @@ -948,7 +1187,7 @@ ENTRY(spurious_interrupt_bug)
22902 pushl_cfi $do_spurious_interrupt_bug
22903 jmp error_code
22904 CFI_ENDPROC
22905 -END(spurious_interrupt_bug)
22906 +ENDPROC(spurious_interrupt_bug)
22907
22908 #ifdef CONFIG_XEN
22909 /* Xen doesn't set %esp to be precisely what the normal sysenter
22910 @@ -1054,7 +1293,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22911
22912 ENTRY(mcount)
22913 ret
22914 -END(mcount)
22915 +ENDPROC(mcount)
22916
22917 ENTRY(ftrace_caller)
22918 pushl %eax
22919 @@ -1084,7 +1323,7 @@ ftrace_graph_call:
22920 .globl ftrace_stub
22921 ftrace_stub:
22922 ret
22923 -END(ftrace_caller)
22924 +ENDPROC(ftrace_caller)
22925
22926 ENTRY(ftrace_regs_caller)
22927 pushf /* push flags before compare (in cs location) */
22928 @@ -1182,7 +1421,7 @@ trace:
22929 popl %ecx
22930 popl %eax
22931 jmp ftrace_stub
22932 -END(mcount)
22933 +ENDPROC(mcount)
22934 #endif /* CONFIG_DYNAMIC_FTRACE */
22935 #endif /* CONFIG_FUNCTION_TRACER */
22936
22937 @@ -1200,7 +1439,7 @@ ENTRY(ftrace_graph_caller)
22938 popl %ecx
22939 popl %eax
22940 ret
22941 -END(ftrace_graph_caller)
22942 +ENDPROC(ftrace_graph_caller)
22943
22944 .globl return_to_handler
22945 return_to_handler:
22946 @@ -1261,15 +1500,18 @@ error_code:
22947 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22948 REG_TO_PTGS %ecx
22949 SET_KERNEL_GS %ecx
22950 - movl $(__USER_DS), %ecx
22951 + movl $(__KERNEL_DS), %ecx
22952 movl %ecx, %ds
22953 movl %ecx, %es
22954 +
22955 + pax_enter_kernel
22956 +
22957 TRACE_IRQS_OFF
22958 movl %esp,%eax # pt_regs pointer
22959 call *%edi
22960 jmp ret_from_exception
22961 CFI_ENDPROC
22962 -END(page_fault)
22963 +ENDPROC(page_fault)
22964
22965 /*
22966 * Debug traps and NMI can happen at the one SYSENTER instruction
22967 @@ -1312,7 +1554,7 @@ debug_stack_correct:
22968 call do_debug
22969 jmp ret_from_exception
22970 CFI_ENDPROC
22971 -END(debug)
22972 +ENDPROC(debug)
22973
22974 /*
22975 * NMI is doubly nasty. It can happen _while_ we're handling
22976 @@ -1352,6 +1594,9 @@ nmi_stack_correct:
22977 xorl %edx,%edx # zero error code
22978 movl %esp,%eax # pt_regs pointer
22979 call do_nmi
22980 +
22981 + pax_exit_kernel
22982 +
22983 jmp restore_all_notrace
22984 CFI_ENDPROC
22985
22986 @@ -1389,13 +1634,16 @@ nmi_espfix_stack:
22987 FIXUP_ESPFIX_STACK # %eax == %esp
22988 xorl %edx,%edx # zero error code
22989 call do_nmi
22990 +
22991 + pax_exit_kernel
22992 +
22993 RESTORE_REGS
22994 lss 12+4(%esp), %esp # back to espfix stack
22995 CFI_ADJUST_CFA_OFFSET -24
22996 jmp irq_return
22997 #endif
22998 CFI_ENDPROC
22999 -END(nmi)
23000 +ENDPROC(nmi)
23001
23002 ENTRY(int3)
23003 RING0_INT_FRAME
23004 @@ -1408,14 +1656,14 @@ ENTRY(int3)
23005 call do_int3
23006 jmp ret_from_exception
23007 CFI_ENDPROC
23008 -END(int3)
23009 +ENDPROC(int3)
23010
23011 ENTRY(general_protection)
23012 RING0_EC_FRAME
23013 pushl_cfi $do_general_protection
23014 jmp error_code
23015 CFI_ENDPROC
23016 -END(general_protection)
23017 +ENDPROC(general_protection)
23018
23019 #ifdef CONFIG_KVM_GUEST
23020 ENTRY(async_page_fault)
23021 @@ -1424,6 +1672,6 @@ ENTRY(async_page_fault)
23022 pushl_cfi $do_async_page_fault
23023 jmp error_code
23024 CFI_ENDPROC
23025 -END(async_page_fault)
23026 +ENDPROC(async_page_fault)
23027 #endif
23028
23029 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23030 index c0226ab..96a8ab7 100644
23031 --- a/arch/x86/kernel/entry_64.S
23032 +++ b/arch/x86/kernel/entry_64.S
23033 @@ -59,6 +59,8 @@
23034 #include <asm/smap.h>
23035 #include <asm/pgtable_types.h>
23036 #include <linux/err.h>
23037 +#include <asm/pgtable.h>
23038 +#include <asm/alternative-asm.h>
23039
23040 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23041 #include <linux/elf-em.h>
23042 @@ -81,6 +83,430 @@ ENTRY(native_usergs_sysret64)
23043 ENDPROC(native_usergs_sysret64)
23044 #endif /* CONFIG_PARAVIRT */
23045
23046 + .macro ljmpq sel, off
23047 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23048 + .byte 0x48; ljmp *1234f(%rip)
23049 + .pushsection .rodata
23050 + .align 16
23051 + 1234: .quad \off; .word \sel
23052 + .popsection
23053 +#else
23054 + pushq $\sel
23055 + pushq $\off
23056 + lretq
23057 +#endif
23058 + .endm
23059 +
23060 + .macro pax_enter_kernel
23061 + pax_set_fptr_mask
23062 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23063 + call pax_enter_kernel
23064 +#endif
23065 + .endm
23066 +
23067 + .macro pax_exit_kernel
23068 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23069 + call pax_exit_kernel
23070 +#endif
23071 +
23072 + .endm
23073 +
23074 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23075 +ENTRY(pax_enter_kernel)
23076 + pushq %rdi
23077 +
23078 +#ifdef CONFIG_PARAVIRT
23079 + PV_SAVE_REGS(CLBR_RDI)
23080 +#endif
23081 +
23082 +#ifdef CONFIG_PAX_KERNEXEC
23083 + GET_CR0_INTO_RDI
23084 + bts $16,%rdi
23085 + jnc 3f
23086 + mov %cs,%edi
23087 + cmp $__KERNEL_CS,%edi
23088 + jnz 2f
23089 +1:
23090 +#endif
23091 +
23092 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23093 + 661: jmp 111f
23094 + .pushsection .altinstr_replacement, "a"
23095 + 662: ASM_NOP2
23096 + .popsection
23097 + .pushsection .altinstructions, "a"
23098 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23099 + .popsection
23100 + GET_CR3_INTO_RDI
23101 + cmp $0,%dil
23102 + jnz 112f
23103 + mov $__KERNEL_DS,%edi
23104 + mov %edi,%ss
23105 + jmp 111f
23106 +112: cmp $1,%dil
23107 + jz 113f
23108 + ud2
23109 +113: sub $4097,%rdi
23110 + bts $63,%rdi
23111 + SET_RDI_INTO_CR3
23112 + mov $__UDEREF_KERNEL_DS,%edi
23113 + mov %edi,%ss
23114 +111:
23115 +#endif
23116 +
23117 +#ifdef CONFIG_PARAVIRT
23118 + PV_RESTORE_REGS(CLBR_RDI)
23119 +#endif
23120 +
23121 + popq %rdi
23122 + pax_force_retaddr
23123 + retq
23124 +
23125 +#ifdef CONFIG_PAX_KERNEXEC
23126 +2: ljmpq __KERNEL_CS,1b
23127 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
23128 +4: SET_RDI_INTO_CR0
23129 + jmp 1b
23130 +#endif
23131 +ENDPROC(pax_enter_kernel)
23132 +
23133 +ENTRY(pax_exit_kernel)
23134 + pushq %rdi
23135 +
23136 +#ifdef CONFIG_PARAVIRT
23137 + PV_SAVE_REGS(CLBR_RDI)
23138 +#endif
23139 +
23140 +#ifdef CONFIG_PAX_KERNEXEC
23141 + mov %cs,%rdi
23142 + cmp $__KERNEXEC_KERNEL_CS,%edi
23143 + jz 2f
23144 + GET_CR0_INTO_RDI
23145 + bts $16,%rdi
23146 + jnc 4f
23147 +1:
23148 +#endif
23149 +
23150 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23151 + 661: jmp 111f
23152 + .pushsection .altinstr_replacement, "a"
23153 + 662: ASM_NOP2
23154 + .popsection
23155 + .pushsection .altinstructions, "a"
23156 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23157 + .popsection
23158 + mov %ss,%edi
23159 + cmp $__UDEREF_KERNEL_DS,%edi
23160 + jnz 111f
23161 + GET_CR3_INTO_RDI
23162 + cmp $0,%dil
23163 + jz 112f
23164 + ud2
23165 +112: add $4097,%rdi
23166 + bts $63,%rdi
23167 + SET_RDI_INTO_CR3
23168 + mov $__KERNEL_DS,%edi
23169 + mov %edi,%ss
23170 +111:
23171 +#endif
23172 +
23173 +#ifdef CONFIG_PARAVIRT
23174 + PV_RESTORE_REGS(CLBR_RDI);
23175 +#endif
23176 +
23177 + popq %rdi
23178 + pax_force_retaddr
23179 + retq
23180 +
23181 +#ifdef CONFIG_PAX_KERNEXEC
23182 +2: GET_CR0_INTO_RDI
23183 + btr $16,%rdi
23184 + jnc 4f
23185 + ljmpq __KERNEL_CS,3f
23186 +3: SET_RDI_INTO_CR0
23187 + jmp 1b
23188 +4: ud2
23189 + jmp 4b
23190 +#endif
23191 +ENDPROC(pax_exit_kernel)
23192 +#endif
23193 +
23194 + .macro pax_enter_kernel_user
23195 + pax_set_fptr_mask
23196 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23197 + call pax_enter_kernel_user
23198 +#endif
23199 + .endm
23200 +
23201 + .macro pax_exit_kernel_user
23202 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23203 + call pax_exit_kernel_user
23204 +#endif
23205 +#ifdef CONFIG_PAX_RANDKSTACK
23206 + pushq %rax
23207 + pushq %r11
23208 + call pax_randomize_kstack
23209 + popq %r11
23210 + popq %rax
23211 +#endif
23212 + .endm
23213 +
23214 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23215 +ENTRY(pax_enter_kernel_user)
23216 + pushq %rdi
23217 + pushq %rbx
23218 +
23219 +#ifdef CONFIG_PARAVIRT
23220 + PV_SAVE_REGS(CLBR_RDI)
23221 +#endif
23222 +
23223 + 661: jmp 111f
23224 + .pushsection .altinstr_replacement, "a"
23225 + 662: ASM_NOP2
23226 + .popsection
23227 + .pushsection .altinstructions, "a"
23228 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23229 + .popsection
23230 + GET_CR3_INTO_RDI
23231 + cmp $1,%dil
23232 + jnz 4f
23233 + sub $4097,%rdi
23234 + bts $63,%rdi
23235 + SET_RDI_INTO_CR3
23236 + jmp 3f
23237 +111:
23238 +
23239 + GET_CR3_INTO_RDI
23240 + mov %rdi,%rbx
23241 + add $__START_KERNEL_map,%rbx
23242 + sub phys_base(%rip),%rbx
23243 +
23244 +#ifdef CONFIG_PARAVIRT
23245 + cmpl $0, pv_info+PARAVIRT_enabled
23246 + jz 1f
23247 + pushq %rdi
23248 + i = 0
23249 + .rept USER_PGD_PTRS
23250 + mov i*8(%rbx),%rsi
23251 + mov $0,%sil
23252 + lea i*8(%rbx),%rdi
23253 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23254 + i = i + 1
23255 + .endr
23256 + popq %rdi
23257 + jmp 2f
23258 +1:
23259 +#endif
23260 +
23261 + i = 0
23262 + .rept USER_PGD_PTRS
23263 + movb $0,i*8(%rbx)
23264 + i = i + 1
23265 + .endr
23266 +
23267 +2: SET_RDI_INTO_CR3
23268 +
23269 +#ifdef CONFIG_PAX_KERNEXEC
23270 + GET_CR0_INTO_RDI
23271 + bts $16,%rdi
23272 + SET_RDI_INTO_CR0
23273 +#endif
23274 +
23275 +3:
23276 +
23277 +#ifdef CONFIG_PARAVIRT
23278 + PV_RESTORE_REGS(CLBR_RDI)
23279 +#endif
23280 +
23281 + popq %rbx
23282 + popq %rdi
23283 + pax_force_retaddr
23284 + retq
23285 +4: ud2
23286 +ENDPROC(pax_enter_kernel_user)
23287 +
23288 +ENTRY(pax_exit_kernel_user)
23289 + pushq %rdi
23290 + pushq %rbx
23291 +
23292 +#ifdef CONFIG_PARAVIRT
23293 + PV_SAVE_REGS(CLBR_RDI)
23294 +#endif
23295 +
23296 + GET_CR3_INTO_RDI
23297 + 661: jmp 1f
23298 + .pushsection .altinstr_replacement, "a"
23299 + 662: ASM_NOP2
23300 + .popsection
23301 + .pushsection .altinstructions, "a"
23302 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23303 + .popsection
23304 + cmp $0,%dil
23305 + jnz 3f
23306 + add $4097,%rdi
23307 + bts $63,%rdi
23308 + SET_RDI_INTO_CR3
23309 + jmp 2f
23310 +1:
23311 +
23312 + mov %rdi,%rbx
23313 +
23314 +#ifdef CONFIG_PAX_KERNEXEC
23315 + GET_CR0_INTO_RDI
23316 + btr $16,%rdi
23317 + jnc 3f
23318 + SET_RDI_INTO_CR0
23319 +#endif
23320 +
23321 + add $__START_KERNEL_map,%rbx
23322 + sub phys_base(%rip),%rbx
23323 +
23324 +#ifdef CONFIG_PARAVIRT
23325 + cmpl $0, pv_info+PARAVIRT_enabled
23326 + jz 1f
23327 + i = 0
23328 + .rept USER_PGD_PTRS
23329 + mov i*8(%rbx),%rsi
23330 + mov $0x67,%sil
23331 + lea i*8(%rbx),%rdi
23332 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23333 + i = i + 1
23334 + .endr
23335 + jmp 2f
23336 +1:
23337 +#endif
23338 +
23339 + i = 0
23340 + .rept USER_PGD_PTRS
23341 + movb $0x67,i*8(%rbx)
23342 + i = i + 1
23343 + .endr
23344 +2:
23345 +
23346 +#ifdef CONFIG_PARAVIRT
23347 + PV_RESTORE_REGS(CLBR_RDI)
23348 +#endif
23349 +
23350 + popq %rbx
23351 + popq %rdi
23352 + pax_force_retaddr
23353 + retq
23354 +3: ud2
23355 +ENDPROC(pax_exit_kernel_user)
23356 +#endif
23357 +
23358 + .macro pax_enter_kernel_nmi
23359 + pax_set_fptr_mask
23360 +
23361 +#ifdef CONFIG_PAX_KERNEXEC
23362 + GET_CR0_INTO_RDI
23363 + bts $16,%rdi
23364 + jc 110f
23365 + SET_RDI_INTO_CR0
23366 + or $2,%ebx
23367 +110:
23368 +#endif
23369 +
23370 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23371 + 661: jmp 111f
23372 + .pushsection .altinstr_replacement, "a"
23373 + 662: ASM_NOP2
23374 + .popsection
23375 + .pushsection .altinstructions, "a"
23376 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23377 + .popsection
23378 + GET_CR3_INTO_RDI
23379 + cmp $0,%dil
23380 + jz 111f
23381 + sub $4097,%rdi
23382 + or $4,%ebx
23383 + bts $63,%rdi
23384 + SET_RDI_INTO_CR3
23385 + mov $__UDEREF_KERNEL_DS,%edi
23386 + mov %edi,%ss
23387 +111:
23388 +#endif
23389 + .endm
23390 +
23391 + .macro pax_exit_kernel_nmi
23392 +#ifdef CONFIG_PAX_KERNEXEC
23393 + btr $1,%ebx
23394 + jnc 110f
23395 + GET_CR0_INTO_RDI
23396 + btr $16,%rdi
23397 + SET_RDI_INTO_CR0
23398 +110:
23399 +#endif
23400 +
23401 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23402 + btr $2,%ebx
23403 + jnc 111f
23404 + GET_CR3_INTO_RDI
23405 + add $4097,%rdi
23406 + bts $63,%rdi
23407 + SET_RDI_INTO_CR3
23408 + mov $__KERNEL_DS,%edi
23409 + mov %edi,%ss
23410 +111:
23411 +#endif
23412 + .endm
23413 +
23414 + .macro pax_erase_kstack
23415 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23416 + call pax_erase_kstack
23417 +#endif
23418 + .endm
23419 +
23420 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23421 +ENTRY(pax_erase_kstack)
23422 + pushq %rdi
23423 + pushq %rcx
23424 + pushq %rax
23425 + pushq %r11
23426 +
23427 + GET_THREAD_INFO(%r11)
23428 + mov TI_lowest_stack(%r11), %rdi
23429 + mov $-0xBEEF, %rax
23430 + std
23431 +
23432 +1: mov %edi, %ecx
23433 + and $THREAD_SIZE_asm - 1, %ecx
23434 + shr $3, %ecx
23435 + repne scasq
23436 + jecxz 2f
23437 +
23438 + cmp $2*8, %ecx
23439 + jc 2f
23440 +
23441 + mov $2*8, %ecx
23442 + repe scasq
23443 + jecxz 2f
23444 + jne 1b
23445 +
23446 +2: cld
23447 + mov %esp, %ecx
23448 + sub %edi, %ecx
23449 +
23450 + cmp $THREAD_SIZE_asm, %rcx
23451 + jb 3f
23452 + ud2
23453 +3:
23454 +
23455 + shr $3, %ecx
23456 + rep stosq
23457 +
23458 + mov TI_task_thread_sp0(%r11), %rdi
23459 + sub $256, %rdi
23460 + mov %rdi, TI_lowest_stack(%r11)
23461 +
23462 + popq %r11
23463 + popq %rax
23464 + popq %rcx
23465 + popq %rdi
23466 + pax_force_retaddr
23467 + ret
23468 +ENDPROC(pax_erase_kstack)
23469 +#endif
23470
23471 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23472 #ifdef CONFIG_TRACE_IRQFLAGS
23473 @@ -117,7 +543,7 @@ ENDPROC(native_usergs_sysret64)
23474 .endm
23475
23476 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23477 - bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23478 + bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23479 jnc 1f
23480 TRACE_IRQS_ON_DEBUG
23481 1:
23482 @@ -155,27 +581,6 @@ ENDPROC(native_usergs_sysret64)
23483 movq \tmp,R11+\offset(%rsp)
23484 .endm
23485
23486 - .macro FAKE_STACK_FRAME child_rip
23487 - /* push in order ss, rsp, eflags, cs, rip */
23488 - xorl %eax, %eax
23489 - pushq_cfi $__KERNEL_DS /* ss */
23490 - /*CFI_REL_OFFSET ss,0*/
23491 - pushq_cfi %rax /* rsp */
23492 - CFI_REL_OFFSET rsp,0
23493 - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23494 - /*CFI_REL_OFFSET rflags,0*/
23495 - pushq_cfi $__KERNEL_CS /* cs */
23496 - /*CFI_REL_OFFSET cs,0*/
23497 - pushq_cfi \child_rip /* rip */
23498 - CFI_REL_OFFSET rip,0
23499 - pushq_cfi %rax /* orig rax */
23500 - .endm
23501 -
23502 - .macro UNFAKE_STACK_FRAME
23503 - addq $8*6, %rsp
23504 - CFI_ADJUST_CFA_OFFSET -(6*8)
23505 - .endm
23506 -
23507 /*
23508 * initial frame state for interrupts (and exceptions without error code)
23509 */
23510 @@ -241,25 +646,26 @@ ENDPROC(native_usergs_sysret64)
23511 /* save partial stack frame */
23512 .macro SAVE_ARGS_IRQ
23513 cld
23514 - /* start from rbp in pt_regs and jump over */
23515 - movq_cfi rdi, (RDI-RBP)
23516 - movq_cfi rsi, (RSI-RBP)
23517 - movq_cfi rdx, (RDX-RBP)
23518 - movq_cfi rcx, (RCX-RBP)
23519 - movq_cfi rax, (RAX-RBP)
23520 - movq_cfi r8, (R8-RBP)
23521 - movq_cfi r9, (R9-RBP)
23522 - movq_cfi r10, (R10-RBP)
23523 - movq_cfi r11, (R11-RBP)
23524 + /* start from r15 in pt_regs and jump over */
23525 + movq_cfi rdi, RDI
23526 + movq_cfi rsi, RSI
23527 + movq_cfi rdx, RDX
23528 + movq_cfi rcx, RCX
23529 + movq_cfi rax, RAX
23530 + movq_cfi r8, R8
23531 + movq_cfi r9, R9
23532 + movq_cfi r10, R10
23533 + movq_cfi r11, R11
23534 + movq_cfi r12, R12
23535
23536 /* Save rbp so that we can unwind from get_irq_regs() */
23537 - movq_cfi rbp, 0
23538 + movq_cfi rbp, RBP
23539
23540 /* Save previous stack value */
23541 movq %rsp, %rsi
23542
23543 - leaq -RBP(%rsp),%rdi /* arg1 for handler */
23544 - testl $3, CS-RBP(%rsi)
23545 + movq %rsp,%rdi /* arg1 for handler */
23546 + testb $3, CS(%rsi)
23547 je 1f
23548 SWAPGS
23549 /*
23550 @@ -279,6 +685,18 @@ ENDPROC(native_usergs_sysret64)
23551 0x06 /* DW_OP_deref */, \
23552 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23553 0x22 /* DW_OP_plus */
23554 +
23555 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23556 + testb $3, CS(%rdi)
23557 + jnz 1f
23558 + pax_enter_kernel
23559 + jmp 2f
23560 +1: pax_enter_kernel_user
23561 +2:
23562 +#else
23563 + pax_enter_kernel
23564 +#endif
23565 +
23566 /* We entered an interrupt context - irqs are off: */
23567 TRACE_IRQS_OFF
23568 .endm
23569 @@ -308,9 +726,52 @@ ENTRY(save_paranoid)
23570 js 1f /* negative -> in kernel */
23571 SWAPGS
23572 xorl %ebx,%ebx
23573 -1: ret
23574 +1:
23575 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23576 + testb $3, CS+8(%rsp)
23577 + jnz 1f
23578 + pax_enter_kernel
23579 + jmp 2f
23580 +1: pax_enter_kernel_user
23581 +2:
23582 +#else
23583 + pax_enter_kernel
23584 +#endif
23585 + pax_force_retaddr
23586 + ret
23587 CFI_ENDPROC
23588 -END(save_paranoid)
23589 +ENDPROC(save_paranoid)
23590 +
23591 +ENTRY(save_paranoid_nmi)
23592 + XCPT_FRAME 1 RDI+8
23593 + cld
23594 + movq_cfi rdi, RDI+8
23595 + movq_cfi rsi, RSI+8
23596 + movq_cfi rdx, RDX+8
23597 + movq_cfi rcx, RCX+8
23598 + movq_cfi rax, RAX+8
23599 + movq_cfi r8, R8+8
23600 + movq_cfi r9, R9+8
23601 + movq_cfi r10, R10+8
23602 + movq_cfi r11, R11+8
23603 + movq_cfi rbx, RBX+8
23604 + movq_cfi rbp, RBP+8
23605 + movq_cfi r12, R12+8
23606 + movq_cfi r13, R13+8
23607 + movq_cfi r14, R14+8
23608 + movq_cfi r15, R15+8
23609 + movl $1,%ebx
23610 + movl $MSR_GS_BASE,%ecx
23611 + rdmsr
23612 + testl %edx,%edx
23613 + js 1f /* negative -> in kernel */
23614 + SWAPGS
23615 + xorl %ebx,%ebx
23616 +1: pax_enter_kernel_nmi
23617 + pax_force_retaddr
23618 + ret
23619 + CFI_ENDPROC
23620 +ENDPROC(save_paranoid_nmi)
23621
23622 /*
23623 * A newly forked process directly context switches into this address.
23624 @@ -331,7 +792,7 @@ ENTRY(ret_from_fork)
23625
23626 RESTORE_REST
23627
23628 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23629 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23630 jz 1f
23631
23632 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23633 @@ -341,15 +802,13 @@ ENTRY(ret_from_fork)
23634 jmp ret_from_sys_call # go to the SYSRET fastpath
23635
23636 1:
23637 - subq $REST_SKIP, %rsp # leave space for volatiles
23638 - CFI_ADJUST_CFA_OFFSET REST_SKIP
23639 movq %rbp, %rdi
23640 call *%rbx
23641 movl $0, RAX(%rsp)
23642 RESTORE_REST
23643 jmp int_ret_from_sys_call
23644 CFI_ENDPROC
23645 -END(ret_from_fork)
23646 +ENDPROC(ret_from_fork)
23647
23648 /*
23649 * System call entry. Up to 6 arguments in registers are supported.
23650 @@ -386,7 +845,7 @@ END(ret_from_fork)
23651 ENTRY(system_call)
23652 CFI_STARTPROC simple
23653 CFI_SIGNAL_FRAME
23654 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23655 + CFI_DEF_CFA rsp,0
23656 CFI_REGISTER rip,rcx
23657 /*CFI_REGISTER rflags,r11*/
23658 SWAPGS_UNSAFE_STACK
23659 @@ -399,16 +858,23 @@ GLOBAL(system_call_after_swapgs)
23660
23661 movq %rsp,PER_CPU_VAR(old_rsp)
23662 movq PER_CPU_VAR(kernel_stack),%rsp
23663 + SAVE_ARGS 8*6, 0, rax_enosys=1
23664 + pax_enter_kernel_user
23665 +
23666 +#ifdef CONFIG_PAX_RANDKSTACK
23667 + pax_erase_kstack
23668 +#endif
23669 +
23670 /*
23671 * No need to follow this irqs off/on section - it's straight
23672 * and short:
23673 */
23674 ENABLE_INTERRUPTS(CLBR_NONE)
23675 - SAVE_ARGS 8, 0, rax_enosys=1
23676 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23677 movq %rcx,RIP-ARGOFFSET(%rsp)
23678 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23679 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23680 + GET_THREAD_INFO(%rcx)
23681 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23682 jnz tracesys
23683 system_call_fastpath:
23684 #if __SYSCALL_MASK == ~0
23685 @@ -432,10 +898,13 @@ sysret_check:
23686 LOCKDEP_SYS_EXIT
23687 DISABLE_INTERRUPTS(CLBR_NONE)
23688 TRACE_IRQS_OFF
23689 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23690 + GET_THREAD_INFO(%rcx)
23691 + movl TI_flags(%rcx),%edx
23692 andl %edi,%edx
23693 jnz sysret_careful
23694 CFI_REMEMBER_STATE
23695 + pax_exit_kernel_user
23696 + pax_erase_kstack
23697 /*
23698 * sysretq will re-enable interrupts:
23699 */
23700 @@ -494,12 +963,15 @@ sysret_audit:
23701
23702 /* Do syscall tracing */
23703 tracesys:
23704 - leaq -REST_SKIP(%rsp), %rdi
23705 + movq %rsp, %rdi
23706 movq $AUDIT_ARCH_X86_64, %rsi
23707 call syscall_trace_enter_phase1
23708 test %rax, %rax
23709 jnz tracesys_phase2 /* if needed, run the slow path */
23710 - LOAD_ARGS 0 /* else restore clobbered regs */
23711 +
23712 + pax_erase_kstack
23713 +
23714 + LOAD_ARGS /* else restore clobbered regs */
23715 jmp system_call_fastpath /* and return to the fast path */
23716
23717 tracesys_phase2:
23718 @@ -510,12 +982,14 @@ tracesys_phase2:
23719 movq %rax,%rdx
23720 call syscall_trace_enter_phase2
23721
23722 + pax_erase_kstack
23723 +
23724 /*
23725 * Reload arg registers from stack in case ptrace changed them.
23726 * We don't reload %rax because syscall_trace_entry_phase2() returned
23727 * the value it wants us to use in the table lookup.
23728 */
23729 - LOAD_ARGS ARGOFFSET, 1
23730 + LOAD_ARGS 1
23731 RESTORE_REST
23732 #if __SYSCALL_MASK == ~0
23733 cmpq $__NR_syscall_max,%rax
23734 @@ -545,7 +1019,9 @@ GLOBAL(int_with_check)
23735 andl %edi,%edx
23736 jnz int_careful
23737 andl $~TS_COMPAT,TI_status(%rcx)
23738 - jmp retint_swapgs
23739 + pax_exit_kernel_user
23740 + pax_erase_kstack
23741 + jmp retint_swapgs_pax
23742
23743 /* Either reschedule or signal or syscall exit tracking needed. */
23744 /* First do a reschedule test. */
23745 @@ -591,7 +1067,7 @@ int_restore_rest:
23746 TRACE_IRQS_OFF
23747 jmp int_with_check
23748 CFI_ENDPROC
23749 -END(system_call)
23750 +ENDPROC(system_call)
23751
23752 .macro FORK_LIKE func
23753 ENTRY(stub_\func)
23754 @@ -604,9 +1080,10 @@ ENTRY(stub_\func)
23755 DEFAULT_FRAME 0 8 /* offset 8: return address */
23756 call sys_\func
23757 RESTORE_TOP_OF_STACK %r11, 8
23758 - ret $REST_SKIP /* pop extended registers */
23759 + pax_force_retaddr
23760 + ret
23761 CFI_ENDPROC
23762 -END(stub_\func)
23763 +ENDPROC(stub_\func)
23764 .endm
23765
23766 .macro FIXED_FRAME label,func
23767 @@ -616,9 +1093,10 @@ ENTRY(\label)
23768 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23769 call \func
23770 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23771 + pax_force_retaddr
23772 ret
23773 CFI_ENDPROC
23774 -END(\label)
23775 +ENDPROC(\label)
23776 .endm
23777
23778 FORK_LIKE clone
23779 @@ -626,19 +1104,6 @@ END(\label)
23780 FORK_LIKE vfork
23781 FIXED_FRAME stub_iopl, sys_iopl
23782
23783 -ENTRY(ptregscall_common)
23784 - DEFAULT_FRAME 1 8 /* offset 8: return address */
23785 - RESTORE_TOP_OF_STACK %r11, 8
23786 - movq_cfi_restore R15+8, r15
23787 - movq_cfi_restore R14+8, r14
23788 - movq_cfi_restore R13+8, r13
23789 - movq_cfi_restore R12+8, r12
23790 - movq_cfi_restore RBP+8, rbp
23791 - movq_cfi_restore RBX+8, rbx
23792 - ret $REST_SKIP /* pop extended registers */
23793 - CFI_ENDPROC
23794 -END(ptregscall_common)
23795 -
23796 ENTRY(stub_execve)
23797 CFI_STARTPROC
23798 addq $8, %rsp
23799 @@ -650,7 +1115,7 @@ ENTRY(stub_execve)
23800 RESTORE_REST
23801 jmp int_ret_from_sys_call
23802 CFI_ENDPROC
23803 -END(stub_execve)
23804 +ENDPROC(stub_execve)
23805
23806 /*
23807 * sigreturn is special because it needs to restore all registers on return.
23808 @@ -667,7 +1132,7 @@ ENTRY(stub_rt_sigreturn)
23809 RESTORE_REST
23810 jmp int_ret_from_sys_call
23811 CFI_ENDPROC
23812 -END(stub_rt_sigreturn)
23813 +ENDPROC(stub_rt_sigreturn)
23814
23815 #ifdef CONFIG_X86_X32_ABI
23816 ENTRY(stub_x32_rt_sigreturn)
23817 @@ -681,7 +1146,7 @@ ENTRY(stub_x32_rt_sigreturn)
23818 RESTORE_REST
23819 jmp int_ret_from_sys_call
23820 CFI_ENDPROC
23821 -END(stub_x32_rt_sigreturn)
23822 +ENDPROC(stub_x32_rt_sigreturn)
23823
23824 ENTRY(stub_x32_execve)
23825 CFI_STARTPROC
23826 @@ -695,7 +1160,7 @@ ENTRY(stub_x32_execve)
23827 RESTORE_REST
23828 jmp int_ret_from_sys_call
23829 CFI_ENDPROC
23830 -END(stub_x32_execve)
23831 +ENDPROC(stub_x32_execve)
23832
23833 #endif
23834
23835 @@ -732,7 +1197,7 @@ vector=vector+1
23836 2: jmp common_interrupt
23837 .endr
23838 CFI_ENDPROC
23839 -END(irq_entries_start)
23840 +ENDPROC(irq_entries_start)
23841
23842 .previous
23843 END(interrupt)
23844 @@ -749,8 +1214,8 @@ END(interrupt)
23845 /* 0(%rsp): ~(interrupt number) */
23846 .macro interrupt func
23847 /* reserve pt_regs for scratch regs and rbp */
23848 - subq $ORIG_RAX-RBP, %rsp
23849 - CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23850 + subq $ORIG_RAX, %rsp
23851 + CFI_ADJUST_CFA_OFFSET ORIG_RAX
23852 SAVE_ARGS_IRQ
23853 call \func
23854 .endm
23855 @@ -773,14 +1238,14 @@ ret_from_intr:
23856
23857 /* Restore saved previous stack */
23858 popq %rsi
23859 - CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23860 - leaq ARGOFFSET-RBP(%rsi), %rsp
23861 + CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23862 + movq %rsi, %rsp
23863 CFI_DEF_CFA_REGISTER rsp
23864 - CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23865 + CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23866
23867 exit_intr:
23868 GET_THREAD_INFO(%rcx)
23869 - testl $3,CS-ARGOFFSET(%rsp)
23870 + testb $3,CS-ARGOFFSET(%rsp)
23871 je retint_kernel
23872
23873 /* Interrupt came from user space */
23874 @@ -802,12 +1267,35 @@ retint_swapgs: /* return to user-space */
23875 * The iretq could re-enable interrupts:
23876 */
23877 DISABLE_INTERRUPTS(CLBR_ANY)
23878 + pax_exit_kernel_user
23879 +retint_swapgs_pax:
23880 TRACE_IRQS_IRETQ
23881 SWAPGS
23882 jmp restore_args
23883
23884 retint_restore_args: /* return to kernel space */
23885 DISABLE_INTERRUPTS(CLBR_ANY)
23886 + pax_exit_kernel
23887 +
23888 +#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23889 + /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23890 + * namely calling EFI runtime services with a phys mapping. We're
23891 + * starting off with NOPs and patch in the real instrumentation
23892 + * (BTS/OR) before starting any userland process; even before starting
23893 + * up the APs.
23894 + */
23895 + .pushsection .altinstr_replacement, "a"
23896 + 601: pax_force_retaddr (RIP-ARGOFFSET)
23897 + 602:
23898 + .popsection
23899 + 603: .fill 602b-601b, 1, 0x90
23900 + .pushsection .altinstructions, "a"
23901 + altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23902 + .popsection
23903 +#else
23904 + pax_force_retaddr (RIP-ARGOFFSET)
23905 +#endif
23906 +
23907 /*
23908 * The iretq could re-enable interrupts:
23909 */
23910 @@ -845,15 +1333,15 @@ native_irq_return_ldt:
23911 SWAPGS
23912 movq PER_CPU_VAR(espfix_waddr),%rdi
23913 movq %rax,(0*8)(%rdi) /* RAX */
23914 - movq (2*8)(%rsp),%rax /* RIP */
23915 + movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23916 movq %rax,(1*8)(%rdi)
23917 - movq (3*8)(%rsp),%rax /* CS */
23918 + movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23919 movq %rax,(2*8)(%rdi)
23920 - movq (4*8)(%rsp),%rax /* RFLAGS */
23921 + movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23922 movq %rax,(3*8)(%rdi)
23923 - movq (6*8)(%rsp),%rax /* SS */
23924 + movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23925 movq %rax,(5*8)(%rdi)
23926 - movq (5*8)(%rsp),%rax /* RSP */
23927 + movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23928 movq %rax,(4*8)(%rdi)
23929 andl $0xffff0000,%eax
23930 popq_cfi %rdi
23931 @@ -907,7 +1395,7 @@ ENTRY(retint_kernel)
23932 jmp exit_intr
23933 #endif
23934 CFI_ENDPROC
23935 -END(common_interrupt)
23936 +ENDPROC(common_interrupt)
23937
23938 /*
23939 * APIC interrupts.
23940 @@ -921,7 +1409,7 @@ ENTRY(\sym)
23941 interrupt \do_sym
23942 jmp ret_from_intr
23943 CFI_ENDPROC
23944 -END(\sym)
23945 +ENDPROC(\sym)
23946 .endm
23947
23948 #ifdef CONFIG_TRACING
23949 @@ -994,7 +1482,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23950 /*
23951 * Exception entry points.
23952 */
23953 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23954 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23955
23956 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23957 ENTRY(\sym)
23958 @@ -1045,6 +1533,12 @@ ENTRY(\sym)
23959 .endif
23960
23961 .if \shift_ist != -1
23962 +#ifdef CONFIG_SMP
23963 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23964 + lea init_tss(%r13), %r13
23965 +#else
23966 + lea init_tss(%rip), %r13
23967 +#endif
23968 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23969 .endif
23970
23971 @@ -1061,7 +1555,7 @@ ENTRY(\sym)
23972 .endif
23973
23974 CFI_ENDPROC
23975 -END(\sym)
23976 +ENDPROC(\sym)
23977 .endm
23978
23979 #ifdef CONFIG_TRACING
23980 @@ -1102,9 +1596,10 @@ gs_change:
23981 2: mfence /* workaround */
23982 SWAPGS
23983 popfq_cfi
23984 + pax_force_retaddr
23985 ret
23986 CFI_ENDPROC
23987 -END(native_load_gs_index)
23988 +ENDPROC(native_load_gs_index)
23989
23990 _ASM_EXTABLE(gs_change,bad_gs)
23991 .section .fixup,"ax"
23992 @@ -1132,9 +1627,10 @@ ENTRY(do_softirq_own_stack)
23993 CFI_DEF_CFA_REGISTER rsp
23994 CFI_ADJUST_CFA_OFFSET -8
23995 decl PER_CPU_VAR(irq_count)
23996 + pax_force_retaddr
23997 ret
23998 CFI_ENDPROC
23999 -END(do_softirq_own_stack)
24000 +ENDPROC(do_softirq_own_stack)
24001
24002 #ifdef CONFIG_XEN
24003 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24004 @@ -1172,7 +1668,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24005 decl PER_CPU_VAR(irq_count)
24006 jmp error_exit
24007 CFI_ENDPROC
24008 -END(xen_do_hypervisor_callback)
24009 +ENDPROC(xen_do_hypervisor_callback)
24010
24011 /*
24012 * Hypervisor uses this for application faults while it executes.
24013 @@ -1231,7 +1727,7 @@ ENTRY(xen_failsafe_callback)
24014 SAVE_ALL
24015 jmp error_exit
24016 CFI_ENDPROC
24017 -END(xen_failsafe_callback)
24018 +ENDPROC(xen_failsafe_callback)
24019
24020 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24021 xen_hvm_callback_vector xen_evtchn_do_upcall
24022 @@ -1278,18 +1774,33 @@ ENTRY(paranoid_exit)
24023 DEFAULT_FRAME
24024 DISABLE_INTERRUPTS(CLBR_NONE)
24025 TRACE_IRQS_OFF_DEBUG
24026 - testl %ebx,%ebx /* swapgs needed? */
24027 + testl $1,%ebx /* swapgs needed? */
24028 jnz paranoid_restore
24029 - testl $3,CS(%rsp)
24030 + testb $3,CS(%rsp)
24031 jnz paranoid_userspace
24032 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24033 + pax_exit_kernel
24034 + TRACE_IRQS_IRETQ 0
24035 + SWAPGS_UNSAFE_STACK
24036 + RESTORE_ALL 8
24037 + pax_force_retaddr_bts
24038 + jmp irq_return
24039 +#endif
24040 paranoid_swapgs:
24041 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24042 + pax_exit_kernel_user
24043 +#else
24044 + pax_exit_kernel
24045 +#endif
24046 TRACE_IRQS_IRETQ 0
24047 SWAPGS_UNSAFE_STACK
24048 RESTORE_ALL 8
24049 jmp irq_return
24050 paranoid_restore:
24051 + pax_exit_kernel
24052 TRACE_IRQS_IRETQ_DEBUG 0
24053 RESTORE_ALL 8
24054 + pax_force_retaddr_bts
24055 jmp irq_return
24056 paranoid_userspace:
24057 GET_THREAD_INFO(%rcx)
24058 @@ -1318,7 +1829,7 @@ paranoid_schedule:
24059 TRACE_IRQS_OFF
24060 jmp paranoid_userspace
24061 CFI_ENDPROC
24062 -END(paranoid_exit)
24063 +ENDPROC(paranoid_exit)
24064
24065 /*
24066 * Exception entry point. This expects an error code/orig_rax on the stack.
24067 @@ -1345,12 +1856,23 @@ ENTRY(error_entry)
24068 movq %r14, R14+8(%rsp)
24069 movq %r15, R15+8(%rsp)
24070 xorl %ebx,%ebx
24071 - testl $3,CS+8(%rsp)
24072 + testb $3,CS+8(%rsp)
24073 je error_kernelspace
24074 error_swapgs:
24075 SWAPGS
24076 error_sti:
24077 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24078 + testb $3, CS+8(%rsp)
24079 + jnz 1f
24080 + pax_enter_kernel
24081 + jmp 2f
24082 +1: pax_enter_kernel_user
24083 +2:
24084 +#else
24085 + pax_enter_kernel
24086 +#endif
24087 TRACE_IRQS_OFF
24088 + pax_force_retaddr
24089 ret
24090
24091 /*
24092 @@ -1385,7 +1907,7 @@ error_bad_iret:
24093 decl %ebx /* Return to usergs */
24094 jmp error_sti
24095 CFI_ENDPROC
24096 -END(error_entry)
24097 +ENDPROC(error_entry)
24098
24099
24100 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24101 @@ -1396,7 +1918,7 @@ ENTRY(error_exit)
24102 DISABLE_INTERRUPTS(CLBR_NONE)
24103 TRACE_IRQS_OFF
24104 GET_THREAD_INFO(%rcx)
24105 - testl %eax,%eax
24106 + testl $1,%eax
24107 jne retint_kernel
24108 LOCKDEP_SYS_EXIT_IRQ
24109 movl TI_flags(%rcx),%edx
24110 @@ -1405,7 +1927,7 @@ ENTRY(error_exit)
24111 jnz retint_careful
24112 jmp retint_swapgs
24113 CFI_ENDPROC
24114 -END(error_exit)
24115 +ENDPROC(error_exit)
24116
24117 /*
24118 * Test if a given stack is an NMI stack or not.
24119 @@ -1463,9 +1985,11 @@ ENTRY(nmi)
24120 * If %cs was not the kernel segment, then the NMI triggered in user
24121 * space, which means it is definitely not nested.
24122 */
24123 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24124 + je 1f
24125 cmpl $__KERNEL_CS, 16(%rsp)
24126 jne first_nmi
24127 -
24128 +1:
24129 /*
24130 * Check the special variable on the stack to see if NMIs are
24131 * executing.
24132 @@ -1499,8 +2023,7 @@ nested_nmi:
24133
24134 1:
24135 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24136 - leaq -1*8(%rsp), %rdx
24137 - movq %rdx, %rsp
24138 + subq $8, %rsp
24139 CFI_ADJUST_CFA_OFFSET 1*8
24140 leaq -10*8(%rsp), %rdx
24141 pushq_cfi $__KERNEL_DS
24142 @@ -1518,6 +2041,7 @@ nested_nmi_out:
24143 CFI_RESTORE rdx
24144
24145 /* No need to check faults here */
24146 +# pax_force_retaddr_bts
24147 INTERRUPT_RETURN
24148
24149 CFI_RESTORE_STATE
24150 @@ -1614,13 +2138,13 @@ end_repeat_nmi:
24151 subq $ORIG_RAX-R15, %rsp
24152 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24153 /*
24154 - * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24155 + * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24156 * as we should not be calling schedule in NMI context.
24157 * Even with normal interrupts enabled. An NMI should not be
24158 * setting NEED_RESCHED or anything that normal interrupts and
24159 * exceptions might do.
24160 */
24161 - call save_paranoid
24162 + call save_paranoid_nmi
24163 DEFAULT_FRAME 0
24164
24165 /*
24166 @@ -1630,9 +2154,9 @@ end_repeat_nmi:
24167 * NMI itself takes a page fault, the page fault that was preempted
24168 * will read the information from the NMI page fault and not the
24169 * origin fault. Save it off and restore it if it changes.
24170 - * Use the r12 callee-saved register.
24171 + * Use the r13 callee-saved register.
24172 */
24173 - movq %cr2, %r12
24174 + movq %cr2, %r13
24175
24176 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24177 movq %rsp,%rdi
24178 @@ -1641,29 +2165,34 @@ end_repeat_nmi:
24179
24180 /* Did the NMI take a page fault? Restore cr2 if it did */
24181 movq %cr2, %rcx
24182 - cmpq %rcx, %r12
24183 + cmpq %rcx, %r13
24184 je 1f
24185 - movq %r12, %cr2
24186 + movq %r13, %cr2
24187 1:
24188
24189 - testl %ebx,%ebx /* swapgs needed? */
24190 + testl $1,%ebx /* swapgs needed? */
24191 jnz nmi_restore
24192 nmi_swapgs:
24193 SWAPGS_UNSAFE_STACK
24194 nmi_restore:
24195 + pax_exit_kernel_nmi
24196 /* Pop the extra iret frame at once */
24197 RESTORE_ALL 6*8
24198 + testb $3, 8(%rsp)
24199 + jnz 1f
24200 + pax_force_retaddr_bts
24201 +1:
24202
24203 /* Clear the NMI executing stack variable */
24204 movq $0, 5*8(%rsp)
24205 jmp irq_return
24206 CFI_ENDPROC
24207 -END(nmi)
24208 +ENDPROC(nmi)
24209
24210 ENTRY(ignore_sysret)
24211 CFI_STARTPROC
24212 mov $-ENOSYS,%eax
24213 sysret
24214 CFI_ENDPROC
24215 -END(ignore_sysret)
24216 +ENDPROC(ignore_sysret)
24217
24218 diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24219 index 94d857f..5bce89c 100644
24220 --- a/arch/x86/kernel/espfix_64.c
24221 +++ b/arch/x86/kernel/espfix_64.c
24222 @@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24223 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24224 static void *espfix_pages[ESPFIX_MAX_PAGES];
24225
24226 -static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24227 - __aligned(PAGE_SIZE);
24228 +static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24229
24230 static unsigned int page_random, slot_random;
24231
24232 @@ -122,14 +121,17 @@ static void init_espfix_random(void)
24233 void __init init_espfix_bsp(void)
24234 {
24235 pgd_t *pgd_p;
24236 - pteval_t ptemask;
24237 -
24238 - ptemask = __supported_pte_mask;
24239 + unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24240
24241 /* Install the espfix pud into the kernel page directory */
24242 - pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24243 + pgd_p = &init_level4_pgt[index];
24244 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24245
24246 +#ifdef CONFIG_PAX_PER_CPU_PGD
24247 + clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24248 + clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24249 +#endif
24250 +
24251 /* Randomize the locations */
24252 init_espfix_random();
24253
24254 @@ -197,7 +199,7 @@ void init_espfix_ap(void)
24255 set_pte(&pte_p[n*PTE_STRIDE], pte);
24256
24257 /* Job is done for this CPU and any CPU which shares this page */
24258 - ACCESS_ONCE(espfix_pages[page]) = stack_page;
24259 + ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24260
24261 unlock_done:
24262 mutex_unlock(&espfix_init_mutex);
24263 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24264 index 3386dc9..28bdf81 100644
24265 --- a/arch/x86/kernel/ftrace.c
24266 +++ b/arch/x86/kernel/ftrace.c
24267 @@ -88,7 +88,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24268 * kernel identity mapping to modify code.
24269 */
24270 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24271 - ip = (unsigned long)__va(__pa_symbol(ip));
24272 + ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24273
24274 return ip;
24275 }
24276 @@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24277 {
24278 unsigned char replaced[MCOUNT_INSN_SIZE];
24279
24280 + ip = ktla_ktva(ip);
24281 +
24282 /*
24283 * Note: Due to modules and __init, code can
24284 * disappear and change, we need to protect against faulting
24285 @@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24286 unsigned char old[MCOUNT_INSN_SIZE];
24287 int ret;
24288
24289 - memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24290 + memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24291
24292 ftrace_update_func = ip;
24293 /* Make sure the breakpoints see the ftrace_update_func update */
24294 @@ -310,7 +312,7 @@ static int add_break(unsigned long ip, const char *old)
24295 unsigned char replaced[MCOUNT_INSN_SIZE];
24296 unsigned char brk = BREAKPOINT_INSTRUCTION;
24297
24298 - if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24299 + if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24300 return -EFAULT;
24301
24302 /* Make sure it is what we expect it to be */
24303 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24304 index eda1a86..8f6df48 100644
24305 --- a/arch/x86/kernel/head64.c
24306 +++ b/arch/x86/kernel/head64.c
24307 @@ -67,12 +67,12 @@ again:
24308 pgd = *pgd_p;
24309
24310 /*
24311 - * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24312 - * critical -- __PAGE_OFFSET would point us back into the dynamic
24313 + * The use of __early_va rather than __va here is critical:
24314 + * __va would point us back into the dynamic
24315 * range and we might end up looping forever...
24316 */
24317 if (pgd)
24318 - pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24319 + pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24320 else {
24321 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24322 reset_early_page_tables();
24323 @@ -82,13 +82,13 @@ again:
24324 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24325 for (i = 0; i < PTRS_PER_PUD; i++)
24326 pud_p[i] = 0;
24327 - *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24328 + *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24329 }
24330 pud_p += pud_index(address);
24331 pud = *pud_p;
24332
24333 if (pud)
24334 - pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24335 + pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24336 else {
24337 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24338 reset_early_page_tables();
24339 @@ -98,7 +98,7 @@ again:
24340 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24341 for (i = 0; i < PTRS_PER_PMD; i++)
24342 pmd_p[i] = 0;
24343 - *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24344 + *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24345 }
24346 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24347 pmd_p[pmd_index(address)] = pmd;
24348 @@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24349 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24350 early_printk("Kernel alive\n");
24351
24352 - clear_page(init_level4_pgt);
24353 /* set init_level4_pgt kernel high mapping*/
24354 init_level4_pgt[511] = early_level4_pgt[511];
24355
24356 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24357 index f36bd42..0ab4474 100644
24358 --- a/arch/x86/kernel/head_32.S
24359 +++ b/arch/x86/kernel/head_32.S
24360 @@ -26,6 +26,12 @@
24361 /* Physical address */
24362 #define pa(X) ((X) - __PAGE_OFFSET)
24363
24364 +#ifdef CONFIG_PAX_KERNEXEC
24365 +#define ta(X) (X)
24366 +#else
24367 +#define ta(X) ((X) - __PAGE_OFFSET)
24368 +#endif
24369 +
24370 /*
24371 * References to members of the new_cpu_data structure.
24372 */
24373 @@ -55,11 +61,7 @@
24374 * and small than max_low_pfn, otherwise will waste some page table entries
24375 */
24376
24377 -#if PTRS_PER_PMD > 1
24378 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24379 -#else
24380 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24381 -#endif
24382 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24383
24384 /* Number of possible pages in the lowmem region */
24385 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24386 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24387 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24388
24389 /*
24390 + * Real beginning of normal "text" segment
24391 + */
24392 +ENTRY(stext)
24393 +ENTRY(_stext)
24394 +
24395 +/*
24396 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24397 * %esi points to the real-mode code as a 32-bit pointer.
24398 * CS and DS must be 4 GB flat segments, but we don't depend on
24399 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24400 * can.
24401 */
24402 __HEAD
24403 +
24404 +#ifdef CONFIG_PAX_KERNEXEC
24405 + jmp startup_32
24406 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24407 +.fill PAGE_SIZE-5,1,0xcc
24408 +#endif
24409 +
24410 ENTRY(startup_32)
24411 movl pa(stack_start),%ecx
24412
24413 @@ -106,6 +121,59 @@ ENTRY(startup_32)
24414 2:
24415 leal -__PAGE_OFFSET(%ecx),%esp
24416
24417 +#ifdef CONFIG_SMP
24418 + movl $pa(cpu_gdt_table),%edi
24419 + movl $__per_cpu_load,%eax
24420 + movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24421 + rorl $16,%eax
24422 + movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24423 + movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24424 + movl $__per_cpu_end - 1,%eax
24425 + subl $__per_cpu_start,%eax
24426 + movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24427 +#endif
24428 +
24429 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24430 + movl $NR_CPUS,%ecx
24431 + movl $pa(cpu_gdt_table),%edi
24432 +1:
24433 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24434 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24435 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24436 + addl $PAGE_SIZE_asm,%edi
24437 + loop 1b
24438 +#endif
24439 +
24440 +#ifdef CONFIG_PAX_KERNEXEC
24441 + movl $pa(boot_gdt),%edi
24442 + movl $__LOAD_PHYSICAL_ADDR,%eax
24443 + movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24444 + rorl $16,%eax
24445 + movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24446 + movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24447 + rorl $16,%eax
24448 +
24449 + ljmp $(__BOOT_CS),$1f
24450 +1:
24451 +
24452 + movl $NR_CPUS,%ecx
24453 + movl $pa(cpu_gdt_table),%edi
24454 + addl $__PAGE_OFFSET,%eax
24455 +1:
24456 + movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24457 + movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24458 + movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24459 + movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24460 + rorl $16,%eax
24461 + movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24462 + movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24463 + movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24464 + movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24465 + rorl $16,%eax
24466 + addl $PAGE_SIZE_asm,%edi
24467 + loop 1b
24468 +#endif
24469 +
24470 /*
24471 * Clear BSS first so that there are no surprises...
24472 */
24473 @@ -201,8 +269,11 @@ ENTRY(startup_32)
24474 movl %eax, pa(max_pfn_mapped)
24475
24476 /* Do early initialization of the fixmap area */
24477 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24478 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24479 +#ifdef CONFIG_COMPAT_VDSO
24480 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24481 +#else
24482 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24483 +#endif
24484 #else /* Not PAE */
24485
24486 page_pde_offset = (__PAGE_OFFSET >> 20);
24487 @@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24488 movl %eax, pa(max_pfn_mapped)
24489
24490 /* Do early initialization of the fixmap area */
24491 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24492 - movl %eax,pa(initial_page_table+0xffc)
24493 +#ifdef CONFIG_COMPAT_VDSO
24494 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24495 +#else
24496 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24497 +#endif
24498 #endif
24499
24500 #ifdef CONFIG_PARAVIRT
24501 @@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24502 cmpl $num_subarch_entries, %eax
24503 jae bad_subarch
24504
24505 - movl pa(subarch_entries)(,%eax,4), %eax
24506 - subl $__PAGE_OFFSET, %eax
24507 - jmp *%eax
24508 + jmp *pa(subarch_entries)(,%eax,4)
24509
24510 bad_subarch:
24511 WEAK(lguest_entry)
24512 @@ -261,10 +333,10 @@ WEAK(xen_entry)
24513 __INITDATA
24514
24515 subarch_entries:
24516 - .long default_entry /* normal x86/PC */
24517 - .long lguest_entry /* lguest hypervisor */
24518 - .long xen_entry /* Xen hypervisor */
24519 - .long default_entry /* Moorestown MID */
24520 + .long ta(default_entry) /* normal x86/PC */
24521 + .long ta(lguest_entry) /* lguest hypervisor */
24522 + .long ta(xen_entry) /* Xen hypervisor */
24523 + .long ta(default_entry) /* Moorestown MID */
24524 num_subarch_entries = (. - subarch_entries) / 4
24525 .previous
24526 #else
24527 @@ -354,6 +426,7 @@ default_entry:
24528 movl pa(mmu_cr4_features),%eax
24529 movl %eax,%cr4
24530
24531 +#ifdef CONFIG_X86_PAE
24532 testb $X86_CR4_PAE, %al # check if PAE is enabled
24533 jz enable_paging
24534
24535 @@ -382,6 +455,9 @@ default_entry:
24536 /* Make changes effective */
24537 wrmsr
24538
24539 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24540 +#endif
24541 +
24542 enable_paging:
24543
24544 /*
24545 @@ -449,14 +525,20 @@ is486:
24546 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24547 movl %eax,%ss # after changing gdt.
24548
24549 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
24550 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24551 movl %eax,%ds
24552 movl %eax,%es
24553
24554 movl $(__KERNEL_PERCPU), %eax
24555 movl %eax,%fs # set this cpu's percpu
24556
24557 +#ifdef CONFIG_CC_STACKPROTECTOR
24558 movl $(__KERNEL_STACK_CANARY),%eax
24559 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24560 + movl $(__USER_DS),%eax
24561 +#else
24562 + xorl %eax,%eax
24563 +#endif
24564 movl %eax,%gs
24565
24566 xorl %eax,%eax # Clear LDT
24567 @@ -512,8 +594,11 @@ setup_once:
24568 * relocation. Manually set base address in stack canary
24569 * segment descriptor.
24570 */
24571 - movl $gdt_page,%eax
24572 + movl $cpu_gdt_table,%eax
24573 movl $stack_canary,%ecx
24574 +#ifdef CONFIG_SMP
24575 + addl $__per_cpu_load,%ecx
24576 +#endif
24577 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24578 shrl $16, %ecx
24579 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24580 @@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24581 cmpl $2,(%esp) # X86_TRAP_NMI
24582 je is_nmi # Ignore NMI
24583
24584 - cmpl $2,%ss:early_recursion_flag
24585 + cmpl $1,%ss:early_recursion_flag
24586 je hlt_loop
24587 incl %ss:early_recursion_flag
24588
24589 @@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24590 pushl (20+6*4)(%esp) /* trapno */
24591 pushl $fault_msg
24592 call printk
24593 -#endif
24594 call dump_stack
24595 +#endif
24596 hlt_loop:
24597 hlt
24598 jmp hlt_loop
24599 @@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24600 /* This is the default interrupt "handler" :-) */
24601 ALIGN
24602 ignore_int:
24603 - cld
24604 #ifdef CONFIG_PRINTK
24605 + cmpl $2,%ss:early_recursion_flag
24606 + je hlt_loop
24607 + incl %ss:early_recursion_flag
24608 + cld
24609 pushl %eax
24610 pushl %ecx
24611 pushl %edx
24612 @@ -617,9 +705,6 @@ ignore_int:
24613 movl $(__KERNEL_DS),%eax
24614 movl %eax,%ds
24615 movl %eax,%es
24616 - cmpl $2,early_recursion_flag
24617 - je hlt_loop
24618 - incl early_recursion_flag
24619 pushl 16(%esp)
24620 pushl 24(%esp)
24621 pushl 32(%esp)
24622 @@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24623 /*
24624 * BSS section
24625 */
24626 -__PAGE_ALIGNED_BSS
24627 - .align PAGE_SIZE
24628 #ifdef CONFIG_X86_PAE
24629 +.section .initial_pg_pmd,"a",@progbits
24630 initial_pg_pmd:
24631 .fill 1024*KPMDS,4,0
24632 #else
24633 +.section .initial_page_table,"a",@progbits
24634 ENTRY(initial_page_table)
24635 .fill 1024,4,0
24636 #endif
24637 +.section .initial_pg_fixmap,"a",@progbits
24638 initial_pg_fixmap:
24639 .fill 1024,4,0
24640 +.section .empty_zero_page,"a",@progbits
24641 ENTRY(empty_zero_page)
24642 .fill 4096,1,0
24643 +.section .swapper_pg_dir,"a",@progbits
24644 ENTRY(swapper_pg_dir)
24645 +#ifdef CONFIG_X86_PAE
24646 + .fill 4,8,0
24647 +#else
24648 .fill 1024,4,0
24649 +#endif
24650
24651 /*
24652 * This starts the data section.
24653 */
24654 #ifdef CONFIG_X86_PAE
24655 -__PAGE_ALIGNED_DATA
24656 - /* Page-aligned for the benefit of paravirt? */
24657 - .align PAGE_SIZE
24658 +.section .initial_page_table,"a",@progbits
24659 ENTRY(initial_page_table)
24660 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24661 # if KPMDS == 3
24662 @@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24663 # error "Kernel PMDs should be 1, 2 or 3"
24664 # endif
24665 .align PAGE_SIZE /* needs to be page-sized too */
24666 +
24667 +#ifdef CONFIG_PAX_PER_CPU_PGD
24668 +ENTRY(cpu_pgd)
24669 + .rept 2*NR_CPUS
24670 + .fill 4,8,0
24671 + .endr
24672 +#endif
24673 +
24674 #endif
24675
24676 .data
24677 .balign 4
24678 ENTRY(stack_start)
24679 - .long init_thread_union+THREAD_SIZE
24680 + .long init_thread_union+THREAD_SIZE-8
24681
24682 __INITRODATA
24683 int_msg:
24684 @@ -727,7 +825,7 @@ fault_msg:
24685 * segment size, and 32-bit linear address value:
24686 */
24687
24688 - .data
24689 +.section .rodata,"a",@progbits
24690 .globl boot_gdt_descr
24691 .globl idt_descr
24692
24693 @@ -736,7 +834,7 @@ fault_msg:
24694 .word 0 # 32 bit align gdt_desc.address
24695 boot_gdt_descr:
24696 .word __BOOT_DS+7
24697 - .long boot_gdt - __PAGE_OFFSET
24698 + .long pa(boot_gdt)
24699
24700 .word 0 # 32-bit align idt_desc.address
24701 idt_descr:
24702 @@ -747,7 +845,7 @@ idt_descr:
24703 .word 0 # 32 bit align gdt_desc.address
24704 ENTRY(early_gdt_descr)
24705 .word GDT_ENTRIES*8-1
24706 - .long gdt_page /* Overwritten for secondary CPUs */
24707 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
24708
24709 /*
24710 * The boot_gdt must mirror the equivalent in setup.S and is
24711 @@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24712 .align L1_CACHE_BYTES
24713 ENTRY(boot_gdt)
24714 .fill GDT_ENTRY_BOOT_CS,8,0
24715 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24716 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24717 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24718 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24719 +
24720 + .align PAGE_SIZE_asm
24721 +ENTRY(cpu_gdt_table)
24722 + .rept NR_CPUS
24723 + .quad 0x0000000000000000 /* NULL descriptor */
24724 + .quad 0x0000000000000000 /* 0x0b reserved */
24725 + .quad 0x0000000000000000 /* 0x13 reserved */
24726 + .quad 0x0000000000000000 /* 0x1b reserved */
24727 +
24728 +#ifdef CONFIG_PAX_KERNEXEC
24729 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24730 +#else
24731 + .quad 0x0000000000000000 /* 0x20 unused */
24732 +#endif
24733 +
24734 + .quad 0x0000000000000000 /* 0x28 unused */
24735 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24736 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24737 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24738 + .quad 0x0000000000000000 /* 0x4b reserved */
24739 + .quad 0x0000000000000000 /* 0x53 reserved */
24740 + .quad 0x0000000000000000 /* 0x5b reserved */
24741 +
24742 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24743 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24744 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24745 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24746 +
24747 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24748 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24749 +
24750 + /*
24751 + * Segments used for calling PnP BIOS have byte granularity.
24752 + * The code segments and data segments have fixed 64k limits,
24753 + * the transfer segment sizes are set at run time.
24754 + */
24755 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
24756 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
24757 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
24758 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
24759 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
24760 +
24761 + /*
24762 + * The APM segments have byte granularity and their bases
24763 + * are set at run time. All have 64k limits.
24764 + */
24765 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24766 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24767 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
24768 +
24769 + .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24770 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24771 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24772 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24773 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24774 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24775 +
24776 + /* Be sure this is zeroed to avoid false validations in Xen */
24777 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24778 + .endr
24779 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24780 index a468c0a..8b5a879 100644
24781 --- a/arch/x86/kernel/head_64.S
24782 +++ b/arch/x86/kernel/head_64.S
24783 @@ -20,6 +20,8 @@
24784 #include <asm/processor-flags.h>
24785 #include <asm/percpu.h>
24786 #include <asm/nops.h>
24787 +#include <asm/cpufeature.h>
24788 +#include <asm/alternative-asm.h>
24789
24790 #ifdef CONFIG_PARAVIRT
24791 #include <asm/asm-offsets.h>
24792 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24793 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24794 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24795 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24796 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
24797 +L3_VMALLOC_START = pud_index(VMALLOC_START)
24798 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
24799 +L3_VMALLOC_END = pud_index(VMALLOC_END)
24800 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24801 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24802
24803 .text
24804 __HEAD
24805 @@ -89,11 +97,24 @@ startup_64:
24806 * Fixup the physical addresses in the page table
24807 */
24808 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24809 + addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24810 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24811 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24812 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24813 + addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24814
24815 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24816 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24817 + addq %rbp, level3_ident_pgt + (0*8)(%rip)
24818 +#ifndef CONFIG_XEN
24819 + addq %rbp, level3_ident_pgt + (1*8)(%rip)
24820 +#endif
24821 +
24822 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24823 +
24824 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24825 + addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24826
24827 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24828 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24829
24830 /*
24831 * Set up the identity mapping for the switchover. These
24832 @@ -174,11 +195,12 @@ ENTRY(secondary_startup_64)
24833 * after the boot processor executes this code.
24834 */
24835
24836 + orq $-1, %rbp
24837 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24838 1:
24839
24840 - /* Enable PAE mode and PGE */
24841 - movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24842 + /* Enable PAE mode and PSE/PGE */
24843 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24844 movq %rcx, %cr4
24845
24846 /* Setup early boot stage 4 level pagetables. */
24847 @@ -199,10 +221,19 @@ ENTRY(secondary_startup_64)
24848 movl $MSR_EFER, %ecx
24849 rdmsr
24850 btsl $_EFER_SCE, %eax /* Enable System Call */
24851 - btl $20,%edi /* No Execute supported? */
24852 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24853 jnc 1f
24854 btsl $_EFER_NX, %eax
24855 + cmpq $-1, %rbp
24856 + je 1f
24857 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24858 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24859 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24860 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24861 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24862 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24863 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24864 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24865 1: wrmsr /* Make changes effective */
24866
24867 /* Setup cr0 */
24868 @@ -282,6 +313,7 @@ ENTRY(secondary_startup_64)
24869 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24870 * address given in m16:64.
24871 */
24872 + pax_set_fptr_mask
24873 movq initial_code(%rip),%rax
24874 pushq $0 # fake return address to stop unwinder
24875 pushq $__KERNEL_CS # set correct cs
24876 @@ -313,7 +345,7 @@ ENDPROC(start_cpu0)
24877 .quad INIT_PER_CPU_VAR(irq_stack_union)
24878
24879 GLOBAL(stack_start)
24880 - .quad init_thread_union+THREAD_SIZE-8
24881 + .quad init_thread_union+THREAD_SIZE-16
24882 .word 0
24883 __FINITDATA
24884
24885 @@ -391,7 +423,7 @@ ENTRY(early_idt_handler)
24886 call dump_stack
24887 #ifdef CONFIG_KALLSYMS
24888 leaq early_idt_ripmsg(%rip),%rdi
24889 - movq 40(%rsp),%rsi # %rip again
24890 + movq 88(%rsp),%rsi # %rip again
24891 call __print_symbol
24892 #endif
24893 #endif /* EARLY_PRINTK */
24894 @@ -420,6 +452,7 @@ ENDPROC(early_idt_handler)
24895 early_recursion_flag:
24896 .long 0
24897
24898 + .section .rodata,"a",@progbits
24899 #ifdef CONFIG_EARLY_PRINTK
24900 early_idt_msg:
24901 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24902 @@ -447,29 +480,52 @@ NEXT_PAGE(early_level4_pgt)
24903 NEXT_PAGE(early_dynamic_pgts)
24904 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24905
24906 - .data
24907 + .section .rodata,"a",@progbits
24908
24909 -#ifndef CONFIG_XEN
24910 NEXT_PAGE(init_level4_pgt)
24911 - .fill 512,8,0
24912 -#else
24913 -NEXT_PAGE(init_level4_pgt)
24914 - .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24915 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24916 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24917 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
24918 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24919 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
24920 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24921 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24922 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24923 .org init_level4_pgt + L4_START_KERNEL*8, 0
24924 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24925 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24926
24927 +#ifdef CONFIG_PAX_PER_CPU_PGD
24928 +NEXT_PAGE(cpu_pgd)
24929 + .rept 2*NR_CPUS
24930 + .fill 512,8,0
24931 + .endr
24932 +#endif
24933 +
24934 NEXT_PAGE(level3_ident_pgt)
24935 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24936 +#ifdef CONFIG_XEN
24937 .fill 511, 8, 0
24938 +#else
24939 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24940 + .fill 510,8,0
24941 +#endif
24942 +
24943 +NEXT_PAGE(level3_vmalloc_start_pgt)
24944 + .fill 512,8,0
24945 +
24946 +NEXT_PAGE(level3_vmalloc_end_pgt)
24947 + .fill 512,8,0
24948 +
24949 +NEXT_PAGE(level3_vmemmap_pgt)
24950 + .fill L3_VMEMMAP_START,8,0
24951 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24952 +
24953 NEXT_PAGE(level2_ident_pgt)
24954 - /* Since I easily can, map the first 1G.
24955 + /* Since I easily can, map the first 2G.
24956 * Don't set NX because code runs from these pages.
24957 */
24958 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24959 -#endif
24960 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24961
24962 NEXT_PAGE(level3_kernel_pgt)
24963 .fill L3_START_KERNEL,8,0
24964 @@ -477,6 +533,9 @@ NEXT_PAGE(level3_kernel_pgt)
24965 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24966 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24967
24968 +NEXT_PAGE(level2_vmemmap_pgt)
24969 + .fill 512,8,0
24970 +
24971 NEXT_PAGE(level2_kernel_pgt)
24972 /*
24973 * 512 MB kernel mapping. We spend a full page on this pagetable
24974 @@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
24975 NEXT_PAGE(level2_fixmap_pgt)
24976 .fill 506,8,0
24977 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24978 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24979 - .fill 5,8,0
24980 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24981 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24982 + .fill 4,8,0
24983
24984 NEXT_PAGE(level1_fixmap_pgt)
24985 .fill 512,8,0
24986
24987 +NEXT_PAGE(level1_vsyscall_pgt)
24988 + .fill 512,8,0
24989 +
24990 #undef PMDS
24991
24992 - .data
24993 + .align PAGE_SIZE
24994 +ENTRY(cpu_gdt_table)
24995 + .rept NR_CPUS
24996 + .quad 0x0000000000000000 /* NULL descriptor */
24997 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24998 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
24999 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
25000 + .quad 0x00cffb000000ffff /* __USER32_CS */
25001 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25002 + .quad 0x00affb000000ffff /* __USER_CS */
25003 +
25004 +#ifdef CONFIG_PAX_KERNEXEC
25005 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25006 +#else
25007 + .quad 0x0 /* unused */
25008 +#endif
25009 +
25010 + .quad 0,0 /* TSS */
25011 + .quad 0,0 /* LDT */
25012 + .quad 0,0,0 /* three TLS descriptors */
25013 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
25014 + /* asm/segment.h:GDT_ENTRIES must match this */
25015 +
25016 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25017 + .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25018 +#else
25019 + .quad 0x0 /* unused */
25020 +#endif
25021 +
25022 + /* zero the remaining page */
25023 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25024 + .endr
25025 +
25026 .align 16
25027 .globl early_gdt_descr
25028 early_gdt_descr:
25029 .word GDT_ENTRIES*8-1
25030 early_gdt_descr_base:
25031 - .quad INIT_PER_CPU_VAR(gdt_page)
25032 + .quad cpu_gdt_table
25033
25034 ENTRY(phys_base)
25035 /* This must match the first entry in level2_kernel_pgt */
25036 .quad 0x0000000000000000
25037
25038 #include "../../x86/xen/xen-head.S"
25039 -
25040 - __PAGE_ALIGNED_BSS
25041 +
25042 + .section .rodata,"a",@progbits
25043 NEXT_PAGE(empty_zero_page)
25044 .skip PAGE_SIZE
25045 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25046 index 05fd74f..c3548b1 100644
25047 --- a/arch/x86/kernel/i386_ksyms_32.c
25048 +++ b/arch/x86/kernel/i386_ksyms_32.c
25049 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25050 EXPORT_SYMBOL(cmpxchg8b_emu);
25051 #endif
25052
25053 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
25054 +
25055 /* Networking helper routines. */
25056 EXPORT_SYMBOL(csum_partial_copy_generic);
25057 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25058 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25059
25060 EXPORT_SYMBOL(__get_user_1);
25061 EXPORT_SYMBOL(__get_user_2);
25062 @@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25063 EXPORT_SYMBOL(___preempt_schedule_context);
25064 #endif
25065 #endif
25066 +
25067 +#ifdef CONFIG_PAX_KERNEXEC
25068 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25069 +#endif
25070 +
25071 +#ifdef CONFIG_PAX_PER_CPU_PGD
25072 +EXPORT_SYMBOL(cpu_pgd);
25073 +#endif
25074 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25075 index a9a4229..6f4d476 100644
25076 --- a/arch/x86/kernel/i387.c
25077 +++ b/arch/x86/kernel/i387.c
25078 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25079 static inline bool interrupted_user_mode(void)
25080 {
25081 struct pt_regs *regs = get_irq_regs();
25082 - return regs && user_mode_vm(regs);
25083 + return regs && user_mode(regs);
25084 }
25085
25086 /*
25087 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25088 index e7cc537..67d7372 100644
25089 --- a/arch/x86/kernel/i8259.c
25090 +++ b/arch/x86/kernel/i8259.c
25091 @@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25092 static void make_8259A_irq(unsigned int irq)
25093 {
25094 disable_irq_nosync(irq);
25095 - io_apic_irqs &= ~(1<<irq);
25096 + io_apic_irqs &= ~(1UL<<irq);
25097 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25098 enable_irq(irq);
25099 }
25100 @@ -208,7 +208,7 @@ spurious_8259A_irq:
25101 "spurious 8259A interrupt: IRQ%d.\n", irq);
25102 spurious_irq_mask |= irqmask;
25103 }
25104 - atomic_inc(&irq_err_count);
25105 + atomic_inc_unchecked(&irq_err_count);
25106 /*
25107 * Theoretically we do not have to handle this IRQ,
25108 * but in Linux this does not cause problems and is
25109 @@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25110 /* (slave's support for AEOI in flat mode is to be investigated) */
25111 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25112
25113 + pax_open_kernel();
25114 if (auto_eoi)
25115 /*
25116 * In AEOI mode we just have to mask the interrupt
25117 * when acking.
25118 */
25119 - i8259A_chip.irq_mask_ack = disable_8259A_irq;
25120 + *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25121 else
25122 - i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25123 + *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25124 + pax_close_kernel();
25125
25126 udelay(100); /* wait for 8259A to initialize */
25127
25128 diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25129 index a979b5b..1d6db75 100644
25130 --- a/arch/x86/kernel/io_delay.c
25131 +++ b/arch/x86/kernel/io_delay.c
25132 @@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25133 * Quirk table for systems that misbehave (lock up, etc.) if port
25134 * 0x80 is used:
25135 */
25136 -static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25137 +static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25138 {
25139 .callback = dmi_io_delay_0xed_port,
25140 .ident = "Compaq Presario V6000",
25141 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25142 index 4ddaf66..49d5c18 100644
25143 --- a/arch/x86/kernel/ioport.c
25144 +++ b/arch/x86/kernel/ioport.c
25145 @@ -6,6 +6,7 @@
25146 #include <linux/sched.h>
25147 #include <linux/kernel.h>
25148 #include <linux/capability.h>
25149 +#include <linux/security.h>
25150 #include <linux/errno.h>
25151 #include <linux/types.h>
25152 #include <linux/ioport.h>
25153 @@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25154 return -EINVAL;
25155 if (turn_on && !capable(CAP_SYS_RAWIO))
25156 return -EPERM;
25157 +#ifdef CONFIG_GRKERNSEC_IO
25158 + if (turn_on && grsec_disable_privio) {
25159 + gr_handle_ioperm();
25160 + return -ENODEV;
25161 + }
25162 +#endif
25163
25164 /*
25165 * If it's the first ioperm() call in this thread's lifetime, set the
25166 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25167 * because the ->io_bitmap_max value must match the bitmap
25168 * contents:
25169 */
25170 - tss = &per_cpu(init_tss, get_cpu());
25171 + tss = init_tss + get_cpu();
25172
25173 if (turn_on)
25174 bitmap_clear(t->io_bitmap_ptr, from, num);
25175 @@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25176 if (level > old) {
25177 if (!capable(CAP_SYS_RAWIO))
25178 return -EPERM;
25179 +#ifdef CONFIG_GRKERNSEC_IO
25180 + if (grsec_disable_privio) {
25181 + gr_handle_iopl();
25182 + return -ENODEV;
25183 + }
25184 +#endif
25185 }
25186 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25187 t->iopl = level << 12;
25188 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25189 index 922d285..6d20692 100644
25190 --- a/arch/x86/kernel/irq.c
25191 +++ b/arch/x86/kernel/irq.c
25192 @@ -22,7 +22,7 @@
25193 #define CREATE_TRACE_POINTS
25194 #include <asm/trace/irq_vectors.h>
25195
25196 -atomic_t irq_err_count;
25197 +atomic_unchecked_t irq_err_count;
25198
25199 /* Function pointer for generic interrupt vector handling */
25200 void (*x86_platform_ipi_callback)(void) = NULL;
25201 @@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25202 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25203 seq_printf(p, " Hypervisor callback interrupts\n");
25204 #endif
25205 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25206 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25207 #if defined(CONFIG_X86_IO_APIC)
25208 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25209 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25210 #endif
25211 return 0;
25212 }
25213 @@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25214
25215 u64 arch_irq_stat(void)
25216 {
25217 - u64 sum = atomic_read(&irq_err_count);
25218 + u64 sum = atomic_read_unchecked(&irq_err_count);
25219 return sum;
25220 }
25221
25222 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25223 index 63ce838..2ea3e06 100644
25224 --- a/arch/x86/kernel/irq_32.c
25225 +++ b/arch/x86/kernel/irq_32.c
25226 @@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25227
25228 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25229
25230 +extern void gr_handle_kernel_exploit(void);
25231 +
25232 int sysctl_panic_on_stackoverflow __read_mostly;
25233
25234 /* Debugging check for stack overflow: is there less than 1KB free? */
25235 @@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25236 __asm__ __volatile__("andl %%esp,%0" :
25237 "=r" (sp) : "0" (THREAD_SIZE - 1));
25238
25239 - return sp < (sizeof(struct thread_info) + STACK_WARN);
25240 + return sp < STACK_WARN;
25241 }
25242
25243 static void print_stack_overflow(void)
25244 {
25245 printk(KERN_WARNING "low stack detected by irq handler\n");
25246 dump_stack();
25247 + gr_handle_kernel_exploit();
25248 if (sysctl_panic_on_stackoverflow)
25249 panic("low stack detected by irq handler - check messages\n");
25250 }
25251 @@ -84,10 +87,9 @@ static inline void *current_stack(void)
25252 static inline int
25253 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25254 {
25255 - struct irq_stack *curstk, *irqstk;
25256 + struct irq_stack *irqstk;
25257 u32 *isp, *prev_esp, arg1, arg2;
25258
25259 - curstk = (struct irq_stack *) current_stack();
25260 irqstk = __this_cpu_read(hardirq_stack);
25261
25262 /*
25263 @@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25264 * handler) we can't do that and just have to keep using the
25265 * current stack (which is the irq stack already after all)
25266 */
25267 - if (unlikely(curstk == irqstk))
25268 + if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25269 return 0;
25270
25271 - isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25272 + isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25273
25274 /* Save the next esp at the bottom of the stack */
25275 prev_esp = (u32 *)irqstk;
25276 *prev_esp = current_stack_pointer;
25277
25278 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25279 + __set_fs(MAKE_MM_SEG(0));
25280 +#endif
25281 +
25282 if (unlikely(overflow))
25283 call_on_stack(print_stack_overflow, isp);
25284
25285 @@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25286 : "0" (irq), "1" (desc), "2" (isp),
25287 "D" (desc->handle_irq)
25288 : "memory", "cc", "ecx");
25289 +
25290 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25291 + __set_fs(current_thread_info()->addr_limit);
25292 +#endif
25293 +
25294 return 1;
25295 }
25296
25297 @@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25298 */
25299 void irq_ctx_init(int cpu)
25300 {
25301 - struct irq_stack *irqstk;
25302 -
25303 if (per_cpu(hardirq_stack, cpu))
25304 return;
25305
25306 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25307 - THREADINFO_GFP,
25308 - THREAD_SIZE_ORDER));
25309 - per_cpu(hardirq_stack, cpu) = irqstk;
25310 -
25311 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25312 - THREADINFO_GFP,
25313 - THREAD_SIZE_ORDER));
25314 - per_cpu(softirq_stack, cpu) = irqstk;
25315 -
25316 - printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25317 - cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25318 + per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25319 + per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25320 }
25321
25322 void do_softirq_own_stack(void)
25323 {
25324 - struct thread_info *curstk;
25325 struct irq_stack *irqstk;
25326 u32 *isp, *prev_esp;
25327
25328 - curstk = current_stack();
25329 irqstk = __this_cpu_read(softirq_stack);
25330
25331 /* build the stack frame on the softirq stack */
25332 @@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25333 prev_esp = (u32 *)irqstk;
25334 *prev_esp = current_stack_pointer;
25335
25336 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25337 + __set_fs(MAKE_MM_SEG(0));
25338 +#endif
25339 +
25340 call_on_stack(__do_softirq, isp);
25341 +
25342 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25343 + __set_fs(current_thread_info()->addr_limit);
25344 +#endif
25345 +
25346 }
25347
25348 bool handle_irq(unsigned irq, struct pt_regs *regs)
25349 @@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25350 if (unlikely(!desc))
25351 return false;
25352
25353 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25354 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25355 if (unlikely(overflow))
25356 print_stack_overflow();
25357 desc->handle_irq(irq, desc);
25358 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25359 index e4b503d..824fce8 100644
25360 --- a/arch/x86/kernel/irq_64.c
25361 +++ b/arch/x86/kernel/irq_64.c
25362 @@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25363 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25364 EXPORT_PER_CPU_SYMBOL(irq_regs);
25365
25366 +extern void gr_handle_kernel_exploit(void);
25367 +
25368 int sysctl_panic_on_stackoverflow;
25369
25370 /*
25371 @@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25372 u64 estack_top, estack_bottom;
25373 u64 curbase = (u64)task_stack_page(current);
25374
25375 - if (user_mode_vm(regs))
25376 + if (user_mode(regs))
25377 return;
25378
25379 if (regs->sp >= curbase + sizeof(struct thread_info) +
25380 @@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25381 irq_stack_top, irq_stack_bottom,
25382 estack_top, estack_bottom);
25383
25384 + gr_handle_kernel_exploit();
25385 +
25386 if (sysctl_panic_on_stackoverflow)
25387 panic("low stack detected by irq handler - check messages\n");
25388 #endif
25389 diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25390 index 26d5a55..a01160a 100644
25391 --- a/arch/x86/kernel/jump_label.c
25392 +++ b/arch/x86/kernel/jump_label.c
25393 @@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25394 * Jump label is enabled for the first time.
25395 * So we expect a default_nop...
25396 */
25397 - if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25398 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25399 != 0))
25400 bug_at((void *)entry->code, __LINE__);
25401 } else {
25402 @@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25403 * ...otherwise expect an ideal_nop. Otherwise
25404 * something went horribly wrong.
25405 */
25406 - if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25407 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25408 != 0))
25409 bug_at((void *)entry->code, __LINE__);
25410 }
25411 @@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25412 * are converting the default nop to the ideal nop.
25413 */
25414 if (init) {
25415 - if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25416 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25417 bug_at((void *)entry->code, __LINE__);
25418 } else {
25419 code.jump = 0xe9;
25420 code.offset = entry->target -
25421 (entry->code + JUMP_LABEL_NOP_SIZE);
25422 - if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25423 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25424 bug_at((void *)entry->code, __LINE__);
25425 }
25426 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25427 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25428 index 7ec1d5f..5a7d130 100644
25429 --- a/arch/x86/kernel/kgdb.c
25430 +++ b/arch/x86/kernel/kgdb.c
25431 @@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25432 #ifdef CONFIG_X86_32
25433 switch (regno) {
25434 case GDB_SS:
25435 - if (!user_mode_vm(regs))
25436 + if (!user_mode(regs))
25437 *(unsigned long *)mem = __KERNEL_DS;
25438 break;
25439 case GDB_SP:
25440 - if (!user_mode_vm(regs))
25441 + if (!user_mode(regs))
25442 *(unsigned long *)mem = kernel_stack_pointer(regs);
25443 break;
25444 case GDB_GS:
25445 @@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25446 bp->attr.bp_addr = breakinfo[breakno].addr;
25447 bp->attr.bp_len = breakinfo[breakno].len;
25448 bp->attr.bp_type = breakinfo[breakno].type;
25449 - info->address = breakinfo[breakno].addr;
25450 + if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25451 + info->address = ktla_ktva(breakinfo[breakno].addr);
25452 + else
25453 + info->address = breakinfo[breakno].addr;
25454 info->len = breakinfo[breakno].len;
25455 info->type = breakinfo[breakno].type;
25456 val = arch_install_hw_breakpoint(bp);
25457 @@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25458 case 'k':
25459 /* clear the trace bit */
25460 linux_regs->flags &= ~X86_EFLAGS_TF;
25461 - atomic_set(&kgdb_cpu_doing_single_step, -1);
25462 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25463
25464 /* set the trace bit if we're stepping */
25465 if (remcomInBuffer[0] == 's') {
25466 linux_regs->flags |= X86_EFLAGS_TF;
25467 - atomic_set(&kgdb_cpu_doing_single_step,
25468 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25469 raw_smp_processor_id());
25470 }
25471
25472 @@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25473
25474 switch (cmd) {
25475 case DIE_DEBUG:
25476 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25477 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25478 if (user_mode(regs))
25479 return single_step_cont(regs, args);
25480 break;
25481 @@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25482 #endif /* CONFIG_DEBUG_RODATA */
25483
25484 bpt->type = BP_BREAKPOINT;
25485 - err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25486 + err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25487 BREAK_INSTR_SIZE);
25488 if (err)
25489 return err;
25490 - err = probe_kernel_write((char *)bpt->bpt_addr,
25491 + err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25492 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25493 #ifdef CONFIG_DEBUG_RODATA
25494 if (!err)
25495 @@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25496 return -EBUSY;
25497 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25498 BREAK_INSTR_SIZE);
25499 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25500 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25501 if (err)
25502 return err;
25503 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25504 @@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25505 if (mutex_is_locked(&text_mutex))
25506 goto knl_write;
25507 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25508 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25509 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25510 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25511 goto knl_write;
25512 return err;
25513 knl_write:
25514 #endif /* CONFIG_DEBUG_RODATA */
25515 - return probe_kernel_write((char *)bpt->bpt_addr,
25516 + return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25517 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25518 }
25519
25520 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25521 index 67e6d19..731ed28 100644
25522 --- a/arch/x86/kernel/kprobes/core.c
25523 +++ b/arch/x86/kernel/kprobes/core.c
25524 @@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25525 s32 raddr;
25526 } __packed *insn;
25527
25528 - insn = (struct __arch_relative_insn *)from;
25529 + insn = (struct __arch_relative_insn *)ktla_ktva(from);
25530 +
25531 + pax_open_kernel();
25532 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25533 insn->op = op;
25534 + pax_close_kernel();
25535 }
25536
25537 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25538 @@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25539 kprobe_opcode_t opcode;
25540 kprobe_opcode_t *orig_opcodes = opcodes;
25541
25542 - if (search_exception_tables((unsigned long)opcodes))
25543 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25544 return 0; /* Page fault may occur on this address. */
25545
25546 retry:
25547 @@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25548 * for the first byte, we can recover the original instruction
25549 * from it and kp->opcode.
25550 */
25551 - memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25552 + memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25553 buf[0] = kp->opcode;
25554 - return (unsigned long)buf;
25555 + return ktva_ktla((unsigned long)buf);
25556 }
25557
25558 /*
25559 @@ -336,7 +339,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25560 /* Another subsystem puts a breakpoint, failed to recover */
25561 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25562 return 0;
25563 + pax_open_kernel();
25564 memcpy(dest, insn.kaddr, insn.length);
25565 + pax_close_kernel();
25566
25567 #ifdef CONFIG_X86_64
25568 if (insn_rip_relative(&insn)) {
25569 @@ -363,7 +368,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25570 return 0;
25571 }
25572 disp = (u8 *) dest + insn_offset_displacement(&insn);
25573 + pax_open_kernel();
25574 *(s32 *) disp = (s32) newdisp;
25575 + pax_close_kernel();
25576 }
25577 #endif
25578 return insn.length;
25579 @@ -505,7 +512,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25580 * nor set current_kprobe, because it doesn't use single
25581 * stepping.
25582 */
25583 - regs->ip = (unsigned long)p->ainsn.insn;
25584 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25585 preempt_enable_no_resched();
25586 return;
25587 }
25588 @@ -522,9 +529,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25589 regs->flags &= ~X86_EFLAGS_IF;
25590 /* single step inline if the instruction is an int3 */
25591 if (p->opcode == BREAKPOINT_INSTRUCTION)
25592 - regs->ip = (unsigned long)p->addr;
25593 + regs->ip = ktla_ktva((unsigned long)p->addr);
25594 else
25595 - regs->ip = (unsigned long)p->ainsn.insn;
25596 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25597 }
25598 NOKPROBE_SYMBOL(setup_singlestep);
25599
25600 @@ -574,7 +581,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25601 struct kprobe *p;
25602 struct kprobe_ctlblk *kcb;
25603
25604 - if (user_mode_vm(regs))
25605 + if (user_mode(regs))
25606 return 0;
25607
25608 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25609 @@ -609,7 +616,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25610 setup_singlestep(p, regs, kcb, 0);
25611 return 1;
25612 }
25613 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
25614 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25615 /*
25616 * The breakpoint instruction was removed right
25617 * after we hit it. Another cpu has removed
25618 @@ -656,6 +663,9 @@ static void __used kretprobe_trampoline_holder(void)
25619 " movq %rax, 152(%rsp)\n"
25620 RESTORE_REGS_STRING
25621 " popfq\n"
25622 +#ifdef KERNEXEC_PLUGIN
25623 + " btsq $63,(%rsp)\n"
25624 +#endif
25625 #else
25626 " pushf\n"
25627 SAVE_REGS_STRING
25628 @@ -796,7 +806,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25629 struct kprobe_ctlblk *kcb)
25630 {
25631 unsigned long *tos = stack_addr(regs);
25632 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25633 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25634 unsigned long orig_ip = (unsigned long)p->addr;
25635 kprobe_opcode_t *insn = p->ainsn.insn;
25636
25637 @@ -979,7 +989,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25638 struct die_args *args = data;
25639 int ret = NOTIFY_DONE;
25640
25641 - if (args->regs && user_mode_vm(args->regs))
25642 + if (args->regs && user_mode(args->regs))
25643 return ret;
25644
25645 if (val == DIE_GPF) {
25646 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25647 index f1314d0..15f3154 100644
25648 --- a/arch/x86/kernel/kprobes/opt.c
25649 +++ b/arch/x86/kernel/kprobes/opt.c
25650 @@ -79,6 +79,7 @@ found:
25651 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25652 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25653 {
25654 + pax_open_kernel();
25655 #ifdef CONFIG_X86_64
25656 *addr++ = 0x48;
25657 *addr++ = 0xbf;
25658 @@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25659 *addr++ = 0xb8;
25660 #endif
25661 *(unsigned long *)addr = val;
25662 + pax_close_kernel();
25663 }
25664
25665 asm (
25666 @@ -337,7 +339,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25667 * Verify if the address gap is in 2GB range, because this uses
25668 * a relative jump.
25669 */
25670 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25671 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25672 if (abs(rel) > 0x7fffffff) {
25673 __arch_remove_optimized_kprobe(op, 0);
25674 return -ERANGE;
25675 @@ -354,16 +356,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25676 op->optinsn.size = ret;
25677
25678 /* Copy arch-dep-instance from template */
25679 - memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25680 + pax_open_kernel();
25681 + memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25682 + pax_close_kernel();
25683
25684 /* Set probe information */
25685 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25686
25687 /* Set probe function call */
25688 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25689 + synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25690
25691 /* Set returning jmp instruction at the tail of out-of-line buffer */
25692 - synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25693 + synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25694 (u8 *)op->kp.addr + op->optinsn.size);
25695
25696 flush_icache_range((unsigned long) buf,
25697 @@ -388,7 +392,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25698 WARN_ON(kprobe_disabled(&op->kp));
25699
25700 /* Backup instructions which will be replaced by jump address */
25701 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25702 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25703 RELATIVE_ADDR_SIZE);
25704
25705 insn_buf[0] = RELATIVEJUMP_OPCODE;
25706 @@ -436,7 +440,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25707 /* This kprobe is really able to run optimized path. */
25708 op = container_of(p, struct optimized_kprobe, kp);
25709 /* Detour through copied instructions */
25710 - regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25711 + regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25712 if (!reenter)
25713 reset_current_kprobe();
25714 preempt_enable_no_resched();
25715 diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25716 index c2bedae..25e7ab60 100644
25717 --- a/arch/x86/kernel/ksysfs.c
25718 +++ b/arch/x86/kernel/ksysfs.c
25719 @@ -184,7 +184,7 @@ out:
25720
25721 static struct kobj_attribute type_attr = __ATTR_RO(type);
25722
25723 -static struct bin_attribute data_attr = {
25724 +static bin_attribute_no_const data_attr __read_only = {
25725 .attr = {
25726 .name = "data",
25727 .mode = S_IRUGO,
25728 diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
25729 index f6945bef..94f6434 100644
25730 --- a/arch/x86/kernel/kvm.c
25731 +++ b/arch/x86/kernel/kvm.c
25732 @@ -283,7 +283,14 @@ NOKPROBE_SYMBOL(do_async_page_fault);
25733 static void __init paravirt_ops_setup(void)
25734 {
25735 pv_info.name = "KVM";
25736 - pv_info.paravirt_enabled = 1;
25737 +
25738 + /*
25739 + * KVM isn't paravirt in the sense of paravirt_enabled. A KVM
25740 + * guest kernel works like a bare metal kernel with additional
25741 + * features, and paravirt_enabled is about features that are
25742 + * missing.
25743 + */
25744 + pv_info.paravirt_enabled = 0;
25745
25746 if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY))
25747 pv_cpu_ops.io_delay = kvm_io_delay;
25748 diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
25749 index d9156ce..a2de9bc 100644
25750 --- a/arch/x86/kernel/kvmclock.c
25751 +++ b/arch/x86/kernel/kvmclock.c
25752 @@ -263,7 +263,6 @@ void __init kvmclock_init(void)
25753 #endif
25754 kvm_get_preset_lpj();
25755 clocksource_register_hz(&kvm_clock, NSEC_PER_SEC);
25756 - pv_info.paravirt_enabled = 1;
25757 pv_info.name = "KVM";
25758
25759 if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT))
25760 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25761 index c37886d..d851d32 100644
25762 --- a/arch/x86/kernel/ldt.c
25763 +++ b/arch/x86/kernel/ldt.c
25764 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25765 if (reload) {
25766 #ifdef CONFIG_SMP
25767 preempt_disable();
25768 - load_LDT(pc);
25769 + load_LDT_nolock(pc);
25770 if (!cpumask_equal(mm_cpumask(current->mm),
25771 cpumask_of(smp_processor_id())))
25772 smp_call_function(flush_ldt, current->mm, 1);
25773 preempt_enable();
25774 #else
25775 - load_LDT(pc);
25776 + load_LDT_nolock(pc);
25777 #endif
25778 }
25779 if (oldsize) {
25780 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25781 return err;
25782
25783 for (i = 0; i < old->size; i++)
25784 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25785 + write_ldt_entry(new->ldt, i, old->ldt + i);
25786 return 0;
25787 }
25788
25789 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25790 retval = copy_ldt(&mm->context, &old_mm->context);
25791 mutex_unlock(&old_mm->context.lock);
25792 }
25793 +
25794 + if (tsk == current) {
25795 + mm->context.vdso = 0;
25796 +
25797 +#ifdef CONFIG_X86_32
25798 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25799 + mm->context.user_cs_base = 0UL;
25800 + mm->context.user_cs_limit = ~0UL;
25801 +
25802 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25803 + cpus_clear(mm->context.cpu_user_cs_mask);
25804 +#endif
25805 +
25806 +#endif
25807 +#endif
25808 +
25809 + }
25810 +
25811 return retval;
25812 }
25813
25814 @@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25815 }
25816 }
25817
25818 +#ifdef CONFIG_PAX_SEGMEXEC
25819 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25820 + error = -EINVAL;
25821 + goto out_unlock;
25822 + }
25823 +#endif
25824 +
25825 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25826 error = -EINVAL;
25827 goto out_unlock;
25828 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25829 index 72e8e31..f2f1605 100644
25830 --- a/arch/x86/kernel/machine_kexec_32.c
25831 +++ b/arch/x86/kernel/machine_kexec_32.c
25832 @@ -25,7 +25,7 @@
25833 #include <asm/cacheflush.h>
25834 #include <asm/debugreg.h>
25835
25836 -static void set_idt(void *newidt, __u16 limit)
25837 +static void set_idt(struct desc_struct *newidt, __u16 limit)
25838 {
25839 struct desc_ptr curidt;
25840
25841 @@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25842 }
25843
25844
25845 -static void set_gdt(void *newgdt, __u16 limit)
25846 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25847 {
25848 struct desc_ptr curgdt;
25849
25850 @@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25851 }
25852
25853 control_page = page_address(image->control_code_page);
25854 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25855 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25856
25857 relocate_kernel_ptr = control_page;
25858 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25859 diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25860 index c73aecf..4c63630 100644
25861 --- a/arch/x86/kernel/mcount_64.S
25862 +++ b/arch/x86/kernel/mcount_64.S
25863 @@ -7,7 +7,7 @@
25864 #include <linux/linkage.h>
25865 #include <asm/ptrace.h>
25866 #include <asm/ftrace.h>
25867 -
25868 +#include <asm/alternative-asm.h>
25869
25870 .code64
25871 .section .entry.text, "ax"
25872 @@ -24,8 +24,9 @@
25873 #ifdef CONFIG_DYNAMIC_FTRACE
25874
25875 ENTRY(function_hook)
25876 + pax_force_retaddr
25877 retq
25878 -END(function_hook)
25879 +ENDPROC(function_hook)
25880
25881 /* skip is set if stack has been adjusted */
25882 .macro ftrace_caller_setup skip=0
25883 @@ -62,8 +63,9 @@ GLOBAL(ftrace_graph_call)
25884 #endif
25885
25886 GLOBAL(ftrace_stub)
25887 + pax_force_retaddr
25888 retq
25889 -END(ftrace_caller)
25890 +ENDPROC(ftrace_caller)
25891
25892 ENTRY(ftrace_regs_caller)
25893 /* Save the current flags before compare (in SS location)*/
25894 @@ -127,7 +129,7 @@ GLOBAL(ftrace_regs_call)
25895 popfq
25896 jmp ftrace_stub
25897
25898 -END(ftrace_regs_caller)
25899 +ENDPROC(ftrace_regs_caller)
25900
25901
25902 #else /* ! CONFIG_DYNAMIC_FTRACE */
25903 @@ -145,6 +147,7 @@ ENTRY(function_hook)
25904 #endif
25905
25906 GLOBAL(ftrace_stub)
25907 + pax_force_retaddr
25908 retq
25909
25910 trace:
25911 @@ -158,12 +161,13 @@ trace:
25912 #endif
25913 subq $MCOUNT_INSN_SIZE, %rdi
25914
25915 + pax_force_fptr ftrace_trace_function
25916 call *ftrace_trace_function
25917
25918 MCOUNT_RESTORE_FRAME
25919
25920 jmp ftrace_stub
25921 -END(function_hook)
25922 +ENDPROC(function_hook)
25923 #endif /* CONFIG_DYNAMIC_FTRACE */
25924 #endif /* CONFIG_FUNCTION_TRACER */
25925
25926 @@ -185,8 +189,9 @@ ENTRY(ftrace_graph_caller)
25927
25928 MCOUNT_RESTORE_FRAME
25929
25930 + pax_force_retaddr
25931 retq
25932 -END(ftrace_graph_caller)
25933 +ENDPROC(ftrace_graph_caller)
25934
25935 GLOBAL(return_to_handler)
25936 subq $24, %rsp
25937 @@ -202,5 +207,7 @@ GLOBAL(return_to_handler)
25938 movq 8(%rsp), %rdx
25939 movq (%rsp), %rax
25940 addq $24, %rsp
25941 + pax_force_fptr %rdi
25942 jmp *%rdi
25943 +ENDPROC(return_to_handler)
25944 #endif
25945 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25946 index e69f988..da078ea 100644
25947 --- a/arch/x86/kernel/module.c
25948 +++ b/arch/x86/kernel/module.c
25949 @@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25950 }
25951 #endif
25952
25953 -void *module_alloc(unsigned long size)
25954 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25955 {
25956 - if (PAGE_ALIGN(size) > MODULES_LEN)
25957 + if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25958 return NULL;
25959 return __vmalloc_node_range(size, 1,
25960 MODULES_VADDR + get_module_load_offset(),
25961 - MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25962 - PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25963 + MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25964 + prot, NUMA_NO_NODE,
25965 __builtin_return_address(0));
25966 }
25967
25968 +void *module_alloc(unsigned long size)
25969 +{
25970 +
25971 +#ifdef CONFIG_PAX_KERNEXEC
25972 + return __module_alloc(size, PAGE_KERNEL);
25973 +#else
25974 + return __module_alloc(size, PAGE_KERNEL_EXEC);
25975 +#endif
25976 +
25977 +}
25978 +
25979 +#ifdef CONFIG_PAX_KERNEXEC
25980 +#ifdef CONFIG_X86_32
25981 +void *module_alloc_exec(unsigned long size)
25982 +{
25983 + struct vm_struct *area;
25984 +
25985 + if (size == 0)
25986 + return NULL;
25987 +
25988 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25989 +return area ? area->addr : NULL;
25990 +}
25991 +EXPORT_SYMBOL(module_alloc_exec);
25992 +
25993 +void module_free_exec(struct module *mod, void *module_region)
25994 +{
25995 + vunmap(module_region);
25996 +}
25997 +EXPORT_SYMBOL(module_free_exec);
25998 +#else
25999 +void module_free_exec(struct module *mod, void *module_region)
26000 +{
26001 + module_free(mod, module_region);
26002 +}
26003 +EXPORT_SYMBOL(module_free_exec);
26004 +
26005 +void *module_alloc_exec(unsigned long size)
26006 +{
26007 + return __module_alloc(size, PAGE_KERNEL_RX);
26008 +}
26009 +EXPORT_SYMBOL(module_alloc_exec);
26010 +#endif
26011 +#endif
26012 +
26013 #ifdef CONFIG_X86_32
26014 int apply_relocate(Elf32_Shdr *sechdrs,
26015 const char *strtab,
26016 @@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26017 unsigned int i;
26018 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26019 Elf32_Sym *sym;
26020 - uint32_t *location;
26021 + uint32_t *plocation, location;
26022
26023 DEBUGP("Applying relocate section %u to %u\n",
26024 relsec, sechdrs[relsec].sh_info);
26025 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26026 /* This is where to make the change */
26027 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26028 - + rel[i].r_offset;
26029 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26030 + location = (uint32_t)plocation;
26031 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26032 + plocation = ktla_ktva((void *)plocation);
26033 /* This is the symbol it is referring to. Note that all
26034 undefined symbols have been resolved. */
26035 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26036 @@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26037 switch (ELF32_R_TYPE(rel[i].r_info)) {
26038 case R_386_32:
26039 /* We add the value into the location given */
26040 - *location += sym->st_value;
26041 + pax_open_kernel();
26042 + *plocation += sym->st_value;
26043 + pax_close_kernel();
26044 break;
26045 case R_386_PC32:
26046 /* Add the value, subtract its position */
26047 - *location += sym->st_value - (uint32_t)location;
26048 + pax_open_kernel();
26049 + *plocation += sym->st_value - location;
26050 + pax_close_kernel();
26051 break;
26052 default:
26053 pr_err("%s: Unknown relocation: %u\n",
26054 @@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26055 case R_X86_64_NONE:
26056 break;
26057 case R_X86_64_64:
26058 + pax_open_kernel();
26059 *(u64 *)loc = val;
26060 + pax_close_kernel();
26061 break;
26062 case R_X86_64_32:
26063 + pax_open_kernel();
26064 *(u32 *)loc = val;
26065 + pax_close_kernel();
26066 if (val != *(u32 *)loc)
26067 goto overflow;
26068 break;
26069 case R_X86_64_32S:
26070 + pax_open_kernel();
26071 *(s32 *)loc = val;
26072 + pax_close_kernel();
26073 if ((s64)val != *(s32 *)loc)
26074 goto overflow;
26075 break;
26076 case R_X86_64_PC32:
26077 val -= (u64)loc;
26078 + pax_open_kernel();
26079 *(u32 *)loc = val;
26080 + pax_close_kernel();
26081 +
26082 #if 0
26083 if ((s64)val != *(s32 *)loc)
26084 goto overflow;
26085 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26086 index c9603ac..9f88728 100644
26087 --- a/arch/x86/kernel/msr.c
26088 +++ b/arch/x86/kernel/msr.c
26089 @@ -37,6 +37,7 @@
26090 #include <linux/notifier.h>
26091 #include <linux/uaccess.h>
26092 #include <linux/gfp.h>
26093 +#include <linux/grsecurity.h>
26094
26095 #include <asm/processor.h>
26096 #include <asm/msr.h>
26097 @@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26098 int err = 0;
26099 ssize_t bytes = 0;
26100
26101 +#ifdef CONFIG_GRKERNSEC_KMEM
26102 + gr_handle_msr_write();
26103 + return -EPERM;
26104 +#endif
26105 +
26106 if (count % 8)
26107 return -EINVAL; /* Invalid chunk size */
26108
26109 @@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26110 err = -EBADF;
26111 break;
26112 }
26113 +#ifdef CONFIG_GRKERNSEC_KMEM
26114 + gr_handle_msr_write();
26115 + return -EPERM;
26116 +#endif
26117 if (copy_from_user(&regs, uregs, sizeof regs)) {
26118 err = -EFAULT;
26119 break;
26120 @@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26121 return notifier_from_errno(err);
26122 }
26123
26124 -static struct notifier_block __refdata msr_class_cpu_notifier = {
26125 +static struct notifier_block msr_class_cpu_notifier = {
26126 .notifier_call = msr_class_cpu_callback,
26127 };
26128
26129 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26130 index c3e985d..110a36a 100644
26131 --- a/arch/x86/kernel/nmi.c
26132 +++ b/arch/x86/kernel/nmi.c
26133 @@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26134
26135 static void nmi_max_handler(struct irq_work *w)
26136 {
26137 - struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26138 + struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26139 int remainder_ns, decimal_msecs;
26140 - u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26141 + u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26142
26143 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26144 decimal_msecs = remainder_ns / 1000;
26145
26146 printk_ratelimited(KERN_INFO
26147 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26148 - a->handler, whole_msecs, decimal_msecs);
26149 + n->action->handler, whole_msecs, decimal_msecs);
26150 }
26151
26152 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26153 @@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26154 delta = sched_clock() - delta;
26155 trace_nmi_handler(a->handler, (int)delta, thishandled);
26156
26157 - if (delta < nmi_longest_ns || delta < a->max_duration)
26158 + if (delta < nmi_longest_ns || delta < a->work->max_duration)
26159 continue;
26160
26161 - a->max_duration = delta;
26162 - irq_work_queue(&a->irq_work);
26163 + a->work->max_duration = delta;
26164 + irq_work_queue(&a->work->irq_work);
26165 }
26166
26167 rcu_read_unlock();
26168 @@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26169 }
26170 NOKPROBE_SYMBOL(nmi_handle);
26171
26172 -int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26173 +int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26174 {
26175 struct nmi_desc *desc = nmi_to_desc(type);
26176 unsigned long flags;
26177 @@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26178 if (!action->handler)
26179 return -EINVAL;
26180
26181 - init_irq_work(&action->irq_work, nmi_max_handler);
26182 + action->work->action = action;
26183 + init_irq_work(&action->work->irq_work, nmi_max_handler);
26184
26185 spin_lock_irqsave(&desc->lock, flags);
26186
26187 @@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26188 * event confuses some handlers (kdump uses this flag)
26189 */
26190 if (action->flags & NMI_FLAG_FIRST)
26191 - list_add_rcu(&action->list, &desc->head);
26192 + pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26193 else
26194 - list_add_tail_rcu(&action->list, &desc->head);
26195 + pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26196
26197 spin_unlock_irqrestore(&desc->lock, flags);
26198 return 0;
26199 @@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26200 if (!strcmp(n->name, name)) {
26201 WARN(in_nmi(),
26202 "Trying to free NMI (%s) from NMI context!\n", n->name);
26203 - list_del_rcu(&n->list);
26204 + pax_list_del_rcu((struct list_head *)&n->list);
26205 break;
26206 }
26207 }
26208 @@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26209 dotraplinkage notrace void
26210 do_nmi(struct pt_regs *regs, long error_code)
26211 {
26212 +
26213 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26214 + if (!user_mode(regs)) {
26215 + unsigned long cs = regs->cs & 0xFFFF;
26216 + unsigned long ip = ktva_ktla(regs->ip);
26217 +
26218 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26219 + regs->ip = ip;
26220 + }
26221 +#endif
26222 +
26223 nmi_nesting_preprocess(regs);
26224
26225 nmi_enter();
26226 diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26227 index 6d9582e..f746287 100644
26228 --- a/arch/x86/kernel/nmi_selftest.c
26229 +++ b/arch/x86/kernel/nmi_selftest.c
26230 @@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26231 {
26232 /* trap all the unknown NMIs we may generate */
26233 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26234 - __initdata);
26235 + __initconst);
26236 }
26237
26238 static void __init cleanup_nmi_testsuite(void)
26239 @@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26240 unsigned long timeout;
26241
26242 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26243 - NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26244 + NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26245 nmi_fail = FAILURE;
26246 return;
26247 }
26248 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26249 index bbb6c73..24a58ef 100644
26250 --- a/arch/x86/kernel/paravirt-spinlocks.c
26251 +++ b/arch/x86/kernel/paravirt-spinlocks.c
26252 @@ -8,7 +8,7 @@
26253
26254 #include <asm/paravirt.h>
26255
26256 -struct pv_lock_ops pv_lock_ops = {
26257 +struct pv_lock_ops pv_lock_ops __read_only = {
26258 #ifdef CONFIG_SMP
26259 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26260 .unlock_kick = paravirt_nop,
26261 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26262 index 548d25f..f8fb99c 100644
26263 --- a/arch/x86/kernel/paravirt.c
26264 +++ b/arch/x86/kernel/paravirt.c
26265 @@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26266 {
26267 return x;
26268 }
26269 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26270 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26271 +#endif
26272
26273 void __init default_banner(void)
26274 {
26275 @@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26276
26277 if (opfunc == NULL)
26278 /* If there's no function, patch it with a ud2a (BUG) */
26279 - ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26280 - else if (opfunc == _paravirt_nop)
26281 + ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26282 + else if (opfunc == (void *)_paravirt_nop)
26283 /* If the operation is a nop, then nop the callsite */
26284 ret = paravirt_patch_nop();
26285
26286 /* identity functions just return their single argument */
26287 - else if (opfunc == _paravirt_ident_32)
26288 + else if (opfunc == (void *)_paravirt_ident_32)
26289 ret = paravirt_patch_ident_32(insnbuf, len);
26290 - else if (opfunc == _paravirt_ident_64)
26291 + else if (opfunc == (void *)_paravirt_ident_64)
26292 ret = paravirt_patch_ident_64(insnbuf, len);
26293 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26294 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26295 + ret = paravirt_patch_ident_64(insnbuf, len);
26296 +#endif
26297
26298 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26299 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26300 @@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26301 if (insn_len > len || start == NULL)
26302 insn_len = len;
26303 else
26304 - memcpy(insnbuf, start, insn_len);
26305 + memcpy(insnbuf, ktla_ktva(start), insn_len);
26306
26307 return insn_len;
26308 }
26309 @@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26310 return this_cpu_read(paravirt_lazy_mode);
26311 }
26312
26313 -struct pv_info pv_info = {
26314 +struct pv_info pv_info __read_only = {
26315 .name = "bare hardware",
26316 .paravirt_enabled = 0,
26317 .kernel_rpl = 0,
26318 @@ -311,16 +318,16 @@ struct pv_info pv_info = {
26319 #endif
26320 };
26321
26322 -struct pv_init_ops pv_init_ops = {
26323 +struct pv_init_ops pv_init_ops __read_only = {
26324 .patch = native_patch,
26325 };
26326
26327 -struct pv_time_ops pv_time_ops = {
26328 +struct pv_time_ops pv_time_ops __read_only = {
26329 .sched_clock = native_sched_clock,
26330 .steal_clock = native_steal_clock,
26331 };
26332
26333 -__visible struct pv_irq_ops pv_irq_ops = {
26334 +__visible struct pv_irq_ops pv_irq_ops __read_only = {
26335 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26336 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26337 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26338 @@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26339 #endif
26340 };
26341
26342 -__visible struct pv_cpu_ops pv_cpu_ops = {
26343 +__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26344 .cpuid = native_cpuid,
26345 .get_debugreg = native_get_debugreg,
26346 .set_debugreg = native_set_debugreg,
26347 @@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26348 NOKPROBE_SYMBOL(native_set_debugreg);
26349 NOKPROBE_SYMBOL(native_load_idt);
26350
26351 -struct pv_apic_ops pv_apic_ops = {
26352 +struct pv_apic_ops pv_apic_ops __read_only= {
26353 #ifdef CONFIG_X86_LOCAL_APIC
26354 .startup_ipi_hook = paravirt_nop,
26355 #endif
26356 };
26357
26358 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26359 +#ifdef CONFIG_X86_32
26360 +#ifdef CONFIG_X86_PAE
26361 +/* 64-bit pagetable entries */
26362 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26363 +#else
26364 /* 32-bit pagetable entries */
26365 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26366 +#endif
26367 #else
26368 /* 64-bit pagetable entries */
26369 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26370 #endif
26371
26372 -struct pv_mmu_ops pv_mmu_ops = {
26373 +struct pv_mmu_ops pv_mmu_ops __read_only = {
26374
26375 .read_cr2 = native_read_cr2,
26376 .write_cr2 = native_write_cr2,
26377 @@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26378 .make_pud = PTE_IDENT,
26379
26380 .set_pgd = native_set_pgd,
26381 + .set_pgd_batched = native_set_pgd_batched,
26382 #endif
26383 #endif /* PAGETABLE_LEVELS >= 3 */
26384
26385 @@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26386 },
26387
26388 .set_fixmap = native_set_fixmap,
26389 +
26390 +#ifdef CONFIG_PAX_KERNEXEC
26391 + .pax_open_kernel = native_pax_open_kernel,
26392 + .pax_close_kernel = native_pax_close_kernel,
26393 +#endif
26394 +
26395 };
26396
26397 EXPORT_SYMBOL_GPL(pv_time_ops);
26398 diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26399 index a1da673..b6f5831 100644
26400 --- a/arch/x86/kernel/paravirt_patch_64.c
26401 +++ b/arch/x86/kernel/paravirt_patch_64.c
26402 @@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26403 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26404 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26405 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26406 +
26407 +#ifndef CONFIG_PAX_MEMORY_UDEREF
26408 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26409 +#endif
26410 +
26411 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26412 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26413
26414 @@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26415 PATCH_SITE(pv_mmu_ops, read_cr3);
26416 PATCH_SITE(pv_mmu_ops, write_cr3);
26417 PATCH_SITE(pv_cpu_ops, clts);
26418 +
26419 +#ifndef CONFIG_PAX_MEMORY_UDEREF
26420 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26421 +#endif
26422 +
26423 PATCH_SITE(pv_cpu_ops, wbinvd);
26424
26425 patch_site:
26426 diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26427 index 0497f71..7186c0d 100644
26428 --- a/arch/x86/kernel/pci-calgary_64.c
26429 +++ b/arch/x86/kernel/pci-calgary_64.c
26430 @@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26431 tce_space = be64_to_cpu(readq(target));
26432 tce_space = tce_space & TAR_SW_BITS;
26433
26434 - tce_space = tce_space & (~specified_table_size);
26435 + tce_space = tce_space & (~(unsigned long)specified_table_size);
26436 info->tce_space = (u64 *)__va(tce_space);
26437 }
26438 }
26439 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26440 index 35ccf75..7a15747 100644
26441 --- a/arch/x86/kernel/pci-iommu_table.c
26442 +++ b/arch/x86/kernel/pci-iommu_table.c
26443 @@ -2,7 +2,7 @@
26444 #include <asm/iommu_table.h>
26445 #include <linux/string.h>
26446 #include <linux/kallsyms.h>
26447 -
26448 +#include <linux/sched.h>
26449
26450 #define DEBUG 1
26451
26452 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26453 index 77dd0ad..9ec4723 100644
26454 --- a/arch/x86/kernel/pci-swiotlb.c
26455 +++ b/arch/x86/kernel/pci-swiotlb.c
26456 @@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26457 struct dma_attrs *attrs)
26458 {
26459 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26460 - swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26461 + swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26462 else
26463 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26464 }
26465 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26466 index e127dda..94e384d 100644
26467 --- a/arch/x86/kernel/process.c
26468 +++ b/arch/x86/kernel/process.c
26469 @@ -36,7 +36,8 @@
26470 * section. Since TSS's are completely CPU-local, we want them
26471 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26472 */
26473 -__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26474 +struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26475 +EXPORT_SYMBOL(init_tss);
26476
26477 #ifdef CONFIG_X86_64
26478 static DEFINE_PER_CPU(unsigned char, is_idle);
26479 @@ -94,7 +95,7 @@ void arch_task_cache_init(void)
26480 task_xstate_cachep =
26481 kmem_cache_create("task_xstate", xstate_size,
26482 __alignof__(union thread_xstate),
26483 - SLAB_PANIC | SLAB_NOTRACK, NULL);
26484 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26485 setup_xstate_comp();
26486 }
26487
26488 @@ -108,7 +109,7 @@ void exit_thread(void)
26489 unsigned long *bp = t->io_bitmap_ptr;
26490
26491 if (bp) {
26492 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26493 + struct tss_struct *tss = init_tss + get_cpu();
26494
26495 t->io_bitmap_ptr = NULL;
26496 clear_thread_flag(TIF_IO_BITMAP);
26497 @@ -128,6 +129,9 @@ void flush_thread(void)
26498 {
26499 struct task_struct *tsk = current;
26500
26501 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26502 + loadsegment(gs, 0);
26503 +#endif
26504 flush_ptrace_hw_breakpoint(tsk);
26505 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26506 drop_init_fpu(tsk);
26507 @@ -274,7 +278,7 @@ static void __exit_idle(void)
26508 void exit_idle(void)
26509 {
26510 /* idle loop has pid 0 */
26511 - if (current->pid)
26512 + if (task_pid_nr(current))
26513 return;
26514 __exit_idle();
26515 }
26516 @@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
26517 return ret;
26518 }
26519 #endif
26520 -void stop_this_cpu(void *dummy)
26521 +__noreturn void stop_this_cpu(void *dummy)
26522 {
26523 local_irq_disable();
26524 /*
26525 @@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26526 }
26527 early_param("idle", idle_setup);
26528
26529 -unsigned long arch_align_stack(unsigned long sp)
26530 +#ifdef CONFIG_PAX_RANDKSTACK
26531 +void pax_randomize_kstack(struct pt_regs *regs)
26532 {
26533 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26534 - sp -= get_random_int() % 8192;
26535 - return sp & ~0xf;
26536 -}
26537 + struct thread_struct *thread = &current->thread;
26538 + unsigned long time;
26539
26540 -unsigned long arch_randomize_brk(struct mm_struct *mm)
26541 -{
26542 - unsigned long range_end = mm->brk + 0x02000000;
26543 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26544 -}
26545 + if (!randomize_va_space)
26546 + return;
26547 +
26548 + if (v8086_mode(regs))
26549 + return;
26550
26551 + rdtscl(time);
26552 +
26553 + /* P4 seems to return a 0 LSB, ignore it */
26554 +#ifdef CONFIG_MPENTIUM4
26555 + time &= 0x3EUL;
26556 + time <<= 2;
26557 +#elif defined(CONFIG_X86_64)
26558 + time &= 0xFUL;
26559 + time <<= 4;
26560 +#else
26561 + time &= 0x1FUL;
26562 + time <<= 3;
26563 +#endif
26564 +
26565 + thread->sp0 ^= time;
26566 + load_sp0(init_tss + smp_processor_id(), thread);
26567 +
26568 +#ifdef CONFIG_X86_64
26569 + this_cpu_write(kernel_stack, thread->sp0);
26570 +#endif
26571 +}
26572 +#endif
26573 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26574 index 8f3ebfe..e6ced5a 100644
26575 --- a/arch/x86/kernel/process_32.c
26576 +++ b/arch/x86/kernel/process_32.c
26577 @@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26578 unsigned long thread_saved_pc(struct task_struct *tsk)
26579 {
26580 return ((unsigned long *)tsk->thread.sp)[3];
26581 +//XXX return tsk->thread.eip;
26582 }
26583
26584 void __show_regs(struct pt_regs *regs, int all)
26585 @@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26586 unsigned long sp;
26587 unsigned short ss, gs;
26588
26589 - if (user_mode_vm(regs)) {
26590 + if (user_mode(regs)) {
26591 sp = regs->sp;
26592 ss = regs->ss & 0xffff;
26593 - gs = get_user_gs(regs);
26594 } else {
26595 sp = kernel_stack_pointer(regs);
26596 savesegment(ss, ss);
26597 - savesegment(gs, gs);
26598 }
26599 + gs = get_user_gs(regs);
26600
26601 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26602 (u16)regs->cs, regs->ip, regs->flags,
26603 - smp_processor_id());
26604 + raw_smp_processor_id());
26605 print_symbol("EIP is at %s\n", regs->ip);
26606
26607 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26608 @@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26609 int copy_thread(unsigned long clone_flags, unsigned long sp,
26610 unsigned long arg, struct task_struct *p)
26611 {
26612 - struct pt_regs *childregs = task_pt_regs(p);
26613 + struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26614 struct task_struct *tsk;
26615 int err;
26616
26617 p->thread.sp = (unsigned long) childregs;
26618 p->thread.sp0 = (unsigned long) (childregs+1);
26619 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26620 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26621
26622 if (unlikely(p->flags & PF_KTHREAD)) {
26623 /* kernel thread */
26624 memset(childregs, 0, sizeof(struct pt_regs));
26625 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26626 - task_user_gs(p) = __KERNEL_STACK_CANARY;
26627 - childregs->ds = __USER_DS;
26628 - childregs->es = __USER_DS;
26629 + savesegment(gs, childregs->gs);
26630 + childregs->ds = __KERNEL_DS;
26631 + childregs->es = __KERNEL_DS;
26632 childregs->fs = __KERNEL_PERCPU;
26633 childregs->bx = sp; /* function */
26634 childregs->bp = arg;
26635 @@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26636 struct thread_struct *prev = &prev_p->thread,
26637 *next = &next_p->thread;
26638 int cpu = smp_processor_id();
26639 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26640 + struct tss_struct *tss = init_tss + cpu;
26641 fpu_switch_t fpu;
26642
26643 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26644 @@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26645 */
26646 lazy_save_gs(prev->gs);
26647
26648 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26649 + __set_fs(task_thread_info(next_p)->addr_limit);
26650 +#endif
26651 +
26652 /*
26653 * Load the per-thread Thread-Local Storage descriptor.
26654 */
26655 @@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26656 */
26657 arch_end_context_switch(next_p);
26658
26659 - this_cpu_write(kernel_stack,
26660 - (unsigned long)task_stack_page(next_p) +
26661 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26662 + this_cpu_write(current_task, next_p);
26663 + this_cpu_write(current_tinfo, &next_p->tinfo);
26664 + this_cpu_write(kernel_stack, next->sp0);
26665
26666 /*
26667 * Restore %gs if needed (which is common)
26668 @@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26669
26670 switch_fpu_finish(next_p, fpu);
26671
26672 - this_cpu_write(current_task, next_p);
26673 -
26674 return prev_p;
26675 }
26676
26677 @@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26678 } while (count++ < 16);
26679 return 0;
26680 }
26681 -
26682 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26683 index 3ed4a68..ee8f337 100644
26684 --- a/arch/x86/kernel/process_64.c
26685 +++ b/arch/x86/kernel/process_64.c
26686 @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26687 struct pt_regs *childregs;
26688 struct task_struct *me = current;
26689
26690 - p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26691 + p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26692 childregs = task_pt_regs(p);
26693 p->thread.sp = (unsigned long) childregs;
26694 p->thread.usersp = me->thread.usersp;
26695 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26696 set_tsk_thread_flag(p, TIF_FORK);
26697 p->thread.io_bitmap_ptr = NULL;
26698
26699 @@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26700 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26701 savesegment(es, p->thread.es);
26702 savesegment(ds, p->thread.ds);
26703 + savesegment(ss, p->thread.ss);
26704 + BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26705 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26706
26707 if (unlikely(p->flags & PF_KTHREAD)) {
26708 @@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26709 struct thread_struct *prev = &prev_p->thread;
26710 struct thread_struct *next = &next_p->thread;
26711 int cpu = smp_processor_id();
26712 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26713 + struct tss_struct *tss = init_tss + cpu;
26714 unsigned fsindex, gsindex;
26715 fpu_switch_t fpu;
26716
26717 @@ -300,6 +303,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26718 if (unlikely(next->ds | prev->ds))
26719 loadsegment(ds, next->ds);
26720
26721 + savesegment(ss, prev->ss);
26722 + if (unlikely(next->ss != prev->ss))
26723 + loadsegment(ss, next->ss);
26724
26725 /* We must save %fs and %gs before load_TLS() because
26726 * %fs and %gs may be cleared by load_TLS().
26727 @@ -359,6 +365,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26728 prev->usersp = this_cpu_read(old_rsp);
26729 this_cpu_write(old_rsp, next->usersp);
26730 this_cpu_write(current_task, next_p);
26731 + this_cpu_write(current_tinfo, &next_p->tinfo);
26732
26733 /*
26734 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26735 @@ -368,9 +375,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26736 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26737 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26738
26739 - this_cpu_write(kernel_stack,
26740 - (unsigned long)task_stack_page(next_p) +
26741 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26742 + this_cpu_write(kernel_stack, next->sp0);
26743
26744 /*
26745 * Now maybe reload the debug registers and handle I/O bitmaps
26746 @@ -440,12 +445,11 @@ unsigned long get_wchan(struct task_struct *p)
26747 if (!p || p == current || p->state == TASK_RUNNING)
26748 return 0;
26749 stack = (unsigned long)task_stack_page(p);
26750 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26751 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26752 return 0;
26753 fp = *(u64 *)(p->thread.sp);
26754 do {
26755 - if (fp < (unsigned long)stack ||
26756 - fp >= (unsigned long)stack+THREAD_SIZE)
26757 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26758 return 0;
26759 ip = *(u64 *)(fp+8);
26760 if (!in_sched_functions(ip))
26761 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26762 index e510618..5165ac0 100644
26763 --- a/arch/x86/kernel/ptrace.c
26764 +++ b/arch/x86/kernel/ptrace.c
26765 @@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26766 unsigned long sp = (unsigned long)&regs->sp;
26767 u32 *prev_esp;
26768
26769 - if (context == (sp & ~(THREAD_SIZE - 1)))
26770 + if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26771 return sp;
26772
26773 - prev_esp = (u32 *)(context);
26774 + prev_esp = *(u32 **)(context);
26775 if (prev_esp)
26776 return (unsigned long)prev_esp;
26777
26778 @@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26779 if (child->thread.gs != value)
26780 return do_arch_prctl(child, ARCH_SET_GS, value);
26781 return 0;
26782 +
26783 + case offsetof(struct user_regs_struct,ip):
26784 + /*
26785 + * Protect against any attempt to set ip to an
26786 + * impossible address. There are dragons lurking if the
26787 + * address is noncanonical. (This explicitly allows
26788 + * setting ip to TASK_SIZE_MAX, because user code can do
26789 + * that all by itself by running off the end of its
26790 + * address space.
26791 + */
26792 + if (value > TASK_SIZE_MAX)
26793 + return -EIO;
26794 + break;
26795 +
26796 #endif
26797 }
26798
26799 @@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26800 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26801 {
26802 int i;
26803 - int dr7 = 0;
26804 + unsigned long dr7 = 0;
26805 struct arch_hw_breakpoint *info;
26806
26807 for (i = 0; i < HBP_NUM; i++) {
26808 @@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26809 unsigned long addr, unsigned long data)
26810 {
26811 int ret;
26812 - unsigned long __user *datap = (unsigned long __user *)data;
26813 + unsigned long __user *datap = (__force unsigned long __user *)data;
26814
26815 switch (request) {
26816 /* read the word at location addr in the USER area. */
26817 @@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26818 if ((int) addr < 0)
26819 return -EIO;
26820 ret = do_get_thread_area(child, addr,
26821 - (struct user_desc __user *)data);
26822 + (__force struct user_desc __user *) data);
26823 break;
26824
26825 case PTRACE_SET_THREAD_AREA:
26826 if ((int) addr < 0)
26827 return -EIO;
26828 ret = do_set_thread_area(child, addr,
26829 - (struct user_desc __user *)data, 0);
26830 + (__force struct user_desc __user *) data, 0);
26831 break;
26832 #endif
26833
26834 @@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26835
26836 #ifdef CONFIG_X86_64
26837
26838 -static struct user_regset x86_64_regsets[] __read_mostly = {
26839 +static user_regset_no_const x86_64_regsets[] __read_only = {
26840 [REGSET_GENERAL] = {
26841 .core_note_type = NT_PRSTATUS,
26842 .n = sizeof(struct user_regs_struct) / sizeof(long),
26843 @@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26844 #endif /* CONFIG_X86_64 */
26845
26846 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26847 -static struct user_regset x86_32_regsets[] __read_mostly = {
26848 +static user_regset_no_const x86_32_regsets[] __read_only = {
26849 [REGSET_GENERAL] = {
26850 .core_note_type = NT_PRSTATUS,
26851 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26852 @@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26853 */
26854 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26855
26856 -void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26857 +void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26858 {
26859 #ifdef CONFIG_X86_64
26860 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26861 @@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26862 memset(info, 0, sizeof(*info));
26863 info->si_signo = SIGTRAP;
26864 info->si_code = si_code;
26865 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26866 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26867 }
26868
26869 void user_single_step_siginfo(struct task_struct *tsk,
26870 @@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26871 }
26872 }
26873
26874 +#ifdef CONFIG_GRKERNSEC_SETXID
26875 +extern void gr_delayed_cred_worker(void);
26876 +#endif
26877 +
26878 /*
26879 * We can return 0 to resume the syscall or anything else to go to phase
26880 * 2. If we resume the syscall, we need to put something appropriate in
26881 @@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26882
26883 BUG_ON(regs != task_pt_regs(current));
26884
26885 +#ifdef CONFIG_GRKERNSEC_SETXID
26886 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26887 + gr_delayed_cred_worker();
26888 +#endif
26889 +
26890 /*
26891 * If we stepped into a sysenter/syscall insn, it trapped in
26892 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26893 @@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26894 */
26895 user_exit();
26896
26897 +#ifdef CONFIG_GRKERNSEC_SETXID
26898 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26899 + gr_delayed_cred_worker();
26900 +#endif
26901 +
26902 audit_syscall_exit(regs);
26903
26904 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26905 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26906 index 2f355d2..e75ed0a 100644
26907 --- a/arch/x86/kernel/pvclock.c
26908 +++ b/arch/x86/kernel/pvclock.c
26909 @@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26910 reset_hung_task_detector();
26911 }
26912
26913 -static atomic64_t last_value = ATOMIC64_INIT(0);
26914 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26915
26916 void pvclock_resume(void)
26917 {
26918 - atomic64_set(&last_value, 0);
26919 + atomic64_set_unchecked(&last_value, 0);
26920 }
26921
26922 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26923 @@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26924 * updating at the same time, and one of them could be slightly behind,
26925 * making the assumption that last_value always go forward fail to hold.
26926 */
26927 - last = atomic64_read(&last_value);
26928 + last = atomic64_read_unchecked(&last_value);
26929 do {
26930 if (ret < last)
26931 return last;
26932 - last = atomic64_cmpxchg(&last_value, last, ret);
26933 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26934 } while (unlikely(last != ret));
26935
26936 return ret;
26937 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26938 index 17962e6..47f55db 100644
26939 --- a/arch/x86/kernel/reboot.c
26940 +++ b/arch/x86/kernel/reboot.c
26941 @@ -69,6 +69,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26942
26943 void __noreturn machine_real_restart(unsigned int type)
26944 {
26945 +
26946 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26947 + struct desc_struct *gdt;
26948 +#endif
26949 +
26950 local_irq_disable();
26951
26952 /*
26953 @@ -96,7 +101,29 @@ void __noreturn machine_real_restart(unsigned int type)
26954
26955 /* Jump to the identity-mapped low memory code */
26956 #ifdef CONFIG_X86_32
26957 - asm volatile("jmpl *%0" : :
26958 +
26959 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26960 + gdt = get_cpu_gdt_table(smp_processor_id());
26961 + pax_open_kernel();
26962 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26963 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26964 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26965 + loadsegment(ds, __KERNEL_DS);
26966 + loadsegment(es, __KERNEL_DS);
26967 + loadsegment(ss, __KERNEL_DS);
26968 +#endif
26969 +#ifdef CONFIG_PAX_KERNEXEC
26970 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26971 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26972 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26973 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26974 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26975 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26976 +#endif
26977 + pax_close_kernel();
26978 +#endif
26979 +
26980 + asm volatile("ljmpl *%0" : :
26981 "rm" (real_mode_header->machine_real_restart_asm),
26982 "a" (type));
26983 #else
26984 @@ -500,7 +527,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26985 * This means that this function can never return, it can misbehave
26986 * by not rebooting properly and hanging.
26987 */
26988 -static void native_machine_emergency_restart(void)
26989 +static void __noreturn native_machine_emergency_restart(void)
26990 {
26991 int i;
26992 int attempt = 0;
26993 @@ -620,13 +647,13 @@ void native_machine_shutdown(void)
26994 #endif
26995 }
26996
26997 -static void __machine_emergency_restart(int emergency)
26998 +static void __noreturn __machine_emergency_restart(int emergency)
26999 {
27000 reboot_emergency = emergency;
27001 machine_ops.emergency_restart();
27002 }
27003
27004 -static void native_machine_restart(char *__unused)
27005 +static void __noreturn native_machine_restart(char *__unused)
27006 {
27007 pr_notice("machine restart\n");
27008
27009 @@ -635,7 +662,7 @@ static void native_machine_restart(char *__unused)
27010 __machine_emergency_restart(0);
27011 }
27012
27013 -static void native_machine_halt(void)
27014 +static void __noreturn native_machine_halt(void)
27015 {
27016 /* Stop other cpus and apics */
27017 machine_shutdown();
27018 @@ -645,7 +672,7 @@ static void native_machine_halt(void)
27019 stop_this_cpu(NULL);
27020 }
27021
27022 -static void native_machine_power_off(void)
27023 +static void __noreturn native_machine_power_off(void)
27024 {
27025 if (pm_power_off) {
27026 if (!reboot_force)
27027 @@ -654,9 +681,10 @@ static void native_machine_power_off(void)
27028 }
27029 /* A fallback in case there is no PM info available */
27030 tboot_shutdown(TB_SHUTDOWN_HALT);
27031 + unreachable();
27032 }
27033
27034 -struct machine_ops machine_ops = {
27035 +struct machine_ops machine_ops __read_only = {
27036 .power_off = native_machine_power_off,
27037 .shutdown = native_machine_shutdown,
27038 .emergency_restart = native_machine_emergency_restart,
27039 diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27040 index c8e41e9..64049ef 100644
27041 --- a/arch/x86/kernel/reboot_fixups_32.c
27042 +++ b/arch/x86/kernel/reboot_fixups_32.c
27043 @@ -57,7 +57,7 @@ struct device_fixup {
27044 unsigned int vendor;
27045 unsigned int device;
27046 void (*reboot_fixup)(struct pci_dev *);
27047 -};
27048 +} __do_const;
27049
27050 /*
27051 * PCI ids solely used for fixups_table go here
27052 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27053 index 3fd2c69..a444264 100644
27054 --- a/arch/x86/kernel/relocate_kernel_64.S
27055 +++ b/arch/x86/kernel/relocate_kernel_64.S
27056 @@ -96,8 +96,7 @@ relocate_kernel:
27057
27058 /* jump to identity mapped page */
27059 addq $(identity_mapped - relocate_kernel), %r8
27060 - pushq %r8
27061 - ret
27062 + jmp *%r8
27063
27064 identity_mapped:
27065 /* set return address to 0 if not preserving context */
27066 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27067 index ab08aa2..6d74a3a 100644
27068 --- a/arch/x86/kernel/setup.c
27069 +++ b/arch/x86/kernel/setup.c
27070 @@ -110,6 +110,7 @@
27071 #include <asm/mce.h>
27072 #include <asm/alternative.h>
27073 #include <asm/prom.h>
27074 +#include <asm/boot.h>
27075
27076 /*
27077 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27078 @@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
27079 #endif
27080
27081
27082 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27083 -__visible unsigned long mmu_cr4_features;
27084 +#ifdef CONFIG_X86_64
27085 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27086 +#elif defined(CONFIG_X86_PAE)
27087 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27088 #else
27089 -__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27090 +__visible unsigned long mmu_cr4_features __read_only;
27091 #endif
27092
27093 +void set_in_cr4(unsigned long mask)
27094 +{
27095 + unsigned long cr4 = read_cr4();
27096 +
27097 + if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
27098 + return;
27099 +
27100 + pax_open_kernel();
27101 + mmu_cr4_features |= mask;
27102 + pax_close_kernel();
27103 +
27104 + if (trampoline_cr4_features)
27105 + *trampoline_cr4_features = mmu_cr4_features;
27106 + cr4 |= mask;
27107 + write_cr4(cr4);
27108 +}
27109 +EXPORT_SYMBOL(set_in_cr4);
27110 +
27111 +void clear_in_cr4(unsigned long mask)
27112 +{
27113 + unsigned long cr4 = read_cr4();
27114 +
27115 + if (!(cr4 & mask) && cr4 == mmu_cr4_features)
27116 + return;
27117 +
27118 + pax_open_kernel();
27119 + mmu_cr4_features &= ~mask;
27120 + pax_close_kernel();
27121 +
27122 + if (trampoline_cr4_features)
27123 + *trampoline_cr4_features = mmu_cr4_features;
27124 + cr4 &= ~mask;
27125 + write_cr4(cr4);
27126 +}
27127 +EXPORT_SYMBOL(clear_in_cr4);
27128 +
27129 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27130 int bootloader_type, bootloader_version;
27131
27132 @@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
27133 * area (640->1Mb) as ram even though it is not.
27134 * take them out.
27135 */
27136 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27137 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27138
27139 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27140 }
27141 @@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
27142 /* called before trim_bios_range() to spare extra sanitize */
27143 static void __init e820_add_kernel_range(void)
27144 {
27145 - u64 start = __pa_symbol(_text);
27146 + u64 start = __pa_symbol(ktla_ktva(_text));
27147 u64 size = __pa_symbol(_end) - start;
27148
27149 /*
27150 @@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27151
27152 void __init setup_arch(char **cmdline_p)
27153 {
27154 +#ifdef CONFIG_X86_32
27155 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27156 +#else
27157 memblock_reserve(__pa_symbol(_text),
27158 (unsigned long)__bss_stop - (unsigned long)_text);
27159 +#endif
27160
27161 early_reserve_initrd();
27162
27163 @@ -955,14 +998,14 @@ void __init setup_arch(char **cmdline_p)
27164
27165 if (!boot_params.hdr.root_flags)
27166 root_mountflags &= ~MS_RDONLY;
27167 - init_mm.start_code = (unsigned long) _text;
27168 - init_mm.end_code = (unsigned long) _etext;
27169 + init_mm.start_code = ktla_ktva((unsigned long) _text);
27170 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
27171 init_mm.end_data = (unsigned long) _edata;
27172 init_mm.brk = _brk_end;
27173
27174 - code_resource.start = __pa_symbol(_text);
27175 - code_resource.end = __pa_symbol(_etext)-1;
27176 - data_resource.start = __pa_symbol(_etext);
27177 + code_resource.start = __pa_symbol(ktla_ktva(_text));
27178 + code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27179 + data_resource.start = __pa_symbol(_sdata);
27180 data_resource.end = __pa_symbol(_edata)-1;
27181 bss_resource.start = __pa_symbol(__bss_start);
27182 bss_resource.end = __pa_symbol(__bss_stop)-1;
27183 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27184 index 5cdff03..80fa283 100644
27185 --- a/arch/x86/kernel/setup_percpu.c
27186 +++ b/arch/x86/kernel/setup_percpu.c
27187 @@ -21,19 +21,17 @@
27188 #include <asm/cpu.h>
27189 #include <asm/stackprotector.h>
27190
27191 -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27192 +#ifdef CONFIG_SMP
27193 +DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27194 EXPORT_PER_CPU_SYMBOL(cpu_number);
27195 +#endif
27196
27197 -#ifdef CONFIG_X86_64
27198 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27199 -#else
27200 -#define BOOT_PERCPU_OFFSET 0
27201 -#endif
27202
27203 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27204 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27205
27206 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27207 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27208 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27209 };
27210 EXPORT_SYMBOL(__per_cpu_offset);
27211 @@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27212 {
27213 #ifdef CONFIG_NEED_MULTIPLE_NODES
27214 pg_data_t *last = NULL;
27215 - unsigned int cpu;
27216 + int cpu;
27217
27218 for_each_possible_cpu(cpu) {
27219 int node = early_cpu_to_node(cpu);
27220 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27221 {
27222 #ifdef CONFIG_X86_32
27223 struct desc_struct gdt;
27224 + unsigned long base = per_cpu_offset(cpu);
27225
27226 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27227 - 0x2 | DESCTYPE_S, 0x8);
27228 - gdt.s = 1;
27229 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27230 + 0x83 | DESCTYPE_S, 0xC);
27231 write_gdt_entry(get_cpu_gdt_table(cpu),
27232 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27233 #endif
27234 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27235 /* alrighty, percpu areas up and running */
27236 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27237 for_each_possible_cpu(cpu) {
27238 +#ifdef CONFIG_CC_STACKPROTECTOR
27239 +#ifdef CONFIG_X86_32
27240 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
27241 +#endif
27242 +#endif
27243 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27244 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27245 per_cpu(cpu_number, cpu) = cpu;
27246 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27247 */
27248 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27249 #endif
27250 +#ifdef CONFIG_CC_STACKPROTECTOR
27251 +#ifdef CONFIG_X86_32
27252 + if (!cpu)
27253 + per_cpu(stack_canary.canary, cpu) = canary;
27254 +#endif
27255 +#endif
27256 /*
27257 * Up to this point, the boot CPU has been using .init.data
27258 * area. Reload any changed state for the boot CPU.
27259 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27260 index ed37a76..39f936e 100644
27261 --- a/arch/x86/kernel/signal.c
27262 +++ b/arch/x86/kernel/signal.c
27263 @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27264 * Align the stack pointer according to the i386 ABI,
27265 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27266 */
27267 - sp = ((sp + 4) & -16ul) - 4;
27268 + sp = ((sp - 12) & -16ul) - 4;
27269 #else /* !CONFIG_X86_32 */
27270 sp = round_down(sp, 16) - 8;
27271 #endif
27272 @@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27273 }
27274
27275 if (current->mm->context.vdso)
27276 - restorer = current->mm->context.vdso +
27277 - selected_vdso32->sym___kernel_sigreturn;
27278 + restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27279 else
27280 - restorer = &frame->retcode;
27281 + restorer = (void __user *)&frame->retcode;
27282 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27283 restorer = ksig->ka.sa.sa_restorer;
27284
27285 @@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27286 * reasons and because gdb uses it as a signature to notice
27287 * signal handler stack frames.
27288 */
27289 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27290 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27291
27292 if (err)
27293 return -EFAULT;
27294 @@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27295 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27296
27297 /* Set up to return from userspace. */
27298 - restorer = current->mm->context.vdso +
27299 - selected_vdso32->sym___kernel_rt_sigreturn;
27300 + if (current->mm->context.vdso)
27301 + restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27302 + else
27303 + restorer = (void __user *)&frame->retcode;
27304 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27305 restorer = ksig->ka.sa.sa_restorer;
27306 put_user_ex(restorer, &frame->pretcode);
27307 @@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27308 * reasons and because gdb uses it as a signature to notice
27309 * signal handler stack frames.
27310 */
27311 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27312 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27313 } put_user_catch(err);
27314
27315 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27316 @@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27317 {
27318 int usig = signr_convert(ksig->sig);
27319 sigset_t *set = sigmask_to_save();
27320 - compat_sigset_t *cset = (compat_sigset_t *) set;
27321 + sigset_t sigcopy;
27322 + compat_sigset_t *cset;
27323 +
27324 + sigcopy = *set;
27325 +
27326 + cset = (compat_sigset_t *) &sigcopy;
27327
27328 /* Set up the stack frame */
27329 if (is_ia32_frame()) {
27330 @@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27331 } else if (is_x32_frame()) {
27332 return x32_setup_rt_frame(ksig, cset, regs);
27333 } else {
27334 - return __setup_rt_frame(ksig->sig, ksig, set, regs);
27335 + return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27336 }
27337 }
27338
27339 diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27340 index be8e1bd..a3d93fa 100644
27341 --- a/arch/x86/kernel/smp.c
27342 +++ b/arch/x86/kernel/smp.c
27343 @@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27344
27345 __setup("nonmi_ipi", nonmi_ipi_setup);
27346
27347 -struct smp_ops smp_ops = {
27348 +struct smp_ops smp_ops __read_only = {
27349 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27350 .smp_prepare_cpus = native_smp_prepare_cpus,
27351 .smp_cpus_done = native_smp_cpus_done,
27352 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27353 index 668d8f2..84a9d54 100644
27354 --- a/arch/x86/kernel/smpboot.c
27355 +++ b/arch/x86/kernel/smpboot.c
27356 @@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
27357
27358 enable_start_cpu0 = 0;
27359
27360 -#ifdef CONFIG_X86_32
27361 + /* otherwise gcc will move up smp_processor_id before the cpu_init */
27362 + barrier();
27363 +
27364 /* switch away from the initial page table */
27365 +#ifdef CONFIG_PAX_PER_CPU_PGD
27366 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27367 +#else
27368 load_cr3(swapper_pg_dir);
27369 +#endif
27370 __flush_tlb_all();
27371 -#endif
27372
27373 - /* otherwise gcc will move up smp_processor_id before the cpu_init */
27374 - barrier();
27375 /*
27376 * Check TSC synchronization with the BP:
27377 */
27378 @@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27379 alternatives_enable_smp();
27380
27381 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27382 - (THREAD_SIZE + task_stack_page(idle))) - 1);
27383 + (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27384 per_cpu(current_task, cpu) = idle;
27385 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
27386
27387 #ifdef CONFIG_X86_32
27388 /* Stack for startup_32 can be just as for start_secondary onwards */
27389 @@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27390 clear_tsk_thread_flag(idle, TIF_FORK);
27391 initial_gs = per_cpu_offset(cpu);
27392 #endif
27393 - per_cpu(kernel_stack, cpu) =
27394 - (unsigned long)task_stack_page(idle) -
27395 - KERNEL_STACK_OFFSET + THREAD_SIZE;
27396 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27397 + pax_open_kernel();
27398 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27399 + pax_close_kernel();
27400 initial_code = (unsigned long)start_secondary;
27401 stack_start = idle->thread.sp;
27402
27403 @@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27404 /* the FPU context is blank, nobody can own it */
27405 __cpu_disable_lazy_restore(cpu);
27406
27407 +#ifdef CONFIG_PAX_PER_CPU_PGD
27408 + clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27409 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27410 + KERNEL_PGD_PTRS);
27411 + clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27412 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27413 + KERNEL_PGD_PTRS);
27414 +#endif
27415 +
27416 err = do_boot_cpu(apicid, cpu, tidle);
27417 if (err) {
27418 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27419 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27420 index 9b4d51d..5d28b58 100644
27421 --- a/arch/x86/kernel/step.c
27422 +++ b/arch/x86/kernel/step.c
27423 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27424 struct desc_struct *desc;
27425 unsigned long base;
27426
27427 - seg &= ~7UL;
27428 + seg >>= 3;
27429
27430 mutex_lock(&child->mm->context.lock);
27431 - if (unlikely((seg >> 3) >= child->mm->context.size))
27432 + if (unlikely(seg >= child->mm->context.size))
27433 addr = -1L; /* bogus selector, access would fault */
27434 else {
27435 desc = child->mm->context.ldt + seg;
27436 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27437 addr += base;
27438 }
27439 mutex_unlock(&child->mm->context.lock);
27440 - }
27441 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27442 + addr = ktla_ktva(addr);
27443
27444 return addr;
27445 }
27446 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27447 unsigned char opcode[15];
27448 unsigned long addr = convert_ip_to_linear(child, regs);
27449
27450 + if (addr == -EINVAL)
27451 + return 0;
27452 +
27453 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27454 for (i = 0; i < copied; i++) {
27455 switch (opcode[i]) {
27456 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27457 new file mode 100644
27458 index 0000000..5877189
27459 --- /dev/null
27460 +++ b/arch/x86/kernel/sys_i386_32.c
27461 @@ -0,0 +1,189 @@
27462 +/*
27463 + * This file contains various random system calls that
27464 + * have a non-standard calling sequence on the Linux/i386
27465 + * platform.
27466 + */
27467 +
27468 +#include <linux/errno.h>
27469 +#include <linux/sched.h>
27470 +#include <linux/mm.h>
27471 +#include <linux/fs.h>
27472 +#include <linux/smp.h>
27473 +#include <linux/sem.h>
27474 +#include <linux/msg.h>
27475 +#include <linux/shm.h>
27476 +#include <linux/stat.h>
27477 +#include <linux/syscalls.h>
27478 +#include <linux/mman.h>
27479 +#include <linux/file.h>
27480 +#include <linux/utsname.h>
27481 +#include <linux/ipc.h>
27482 +#include <linux/elf.h>
27483 +
27484 +#include <linux/uaccess.h>
27485 +#include <linux/unistd.h>
27486 +
27487 +#include <asm/syscalls.h>
27488 +
27489 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27490 +{
27491 + unsigned long pax_task_size = TASK_SIZE;
27492 +
27493 +#ifdef CONFIG_PAX_SEGMEXEC
27494 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27495 + pax_task_size = SEGMEXEC_TASK_SIZE;
27496 +#endif
27497 +
27498 + if (flags & MAP_FIXED)
27499 + if (len > pax_task_size || addr > pax_task_size - len)
27500 + return -EINVAL;
27501 +
27502 + return 0;
27503 +}
27504 +
27505 +/*
27506 + * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27507 + */
27508 +static unsigned long get_align_mask(void)
27509 +{
27510 + if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27511 + return 0;
27512 +
27513 + if (!(current->flags & PF_RANDOMIZE))
27514 + return 0;
27515 +
27516 + return va_align.mask;
27517 +}
27518 +
27519 +unsigned long
27520 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
27521 + unsigned long len, unsigned long pgoff, unsigned long flags)
27522 +{
27523 + struct mm_struct *mm = current->mm;
27524 + struct vm_area_struct *vma;
27525 + unsigned long pax_task_size = TASK_SIZE;
27526 + struct vm_unmapped_area_info info;
27527 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27528 +
27529 +#ifdef CONFIG_PAX_SEGMEXEC
27530 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27531 + pax_task_size = SEGMEXEC_TASK_SIZE;
27532 +#endif
27533 +
27534 + pax_task_size -= PAGE_SIZE;
27535 +
27536 + if (len > pax_task_size)
27537 + return -ENOMEM;
27538 +
27539 + if (flags & MAP_FIXED)
27540 + return addr;
27541 +
27542 +#ifdef CONFIG_PAX_RANDMMAP
27543 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27544 +#endif
27545 +
27546 + if (addr) {
27547 + addr = PAGE_ALIGN(addr);
27548 + if (pax_task_size - len >= addr) {
27549 + vma = find_vma(mm, addr);
27550 + if (check_heap_stack_gap(vma, addr, len, offset))
27551 + return addr;
27552 + }
27553 + }
27554 +
27555 + info.flags = 0;
27556 + info.length = len;
27557 + info.align_mask = filp ? get_align_mask() : 0;
27558 + info.align_offset = pgoff << PAGE_SHIFT;
27559 + info.threadstack_offset = offset;
27560 +
27561 +#ifdef CONFIG_PAX_PAGEEXEC
27562 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27563 + info.low_limit = 0x00110000UL;
27564 + info.high_limit = mm->start_code;
27565 +
27566 +#ifdef CONFIG_PAX_RANDMMAP
27567 + if (mm->pax_flags & MF_PAX_RANDMMAP)
27568 + info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27569 +#endif
27570 +
27571 + if (info.low_limit < info.high_limit) {
27572 + addr = vm_unmapped_area(&info);
27573 + if (!IS_ERR_VALUE(addr))
27574 + return addr;
27575 + }
27576 + } else
27577 +#endif
27578 +
27579 + info.low_limit = mm->mmap_base;
27580 + info.high_limit = pax_task_size;
27581 +
27582 + return vm_unmapped_area(&info);
27583 +}
27584 +
27585 +unsigned long
27586 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27587 + const unsigned long len, const unsigned long pgoff,
27588 + const unsigned long flags)
27589 +{
27590 + struct vm_area_struct *vma;
27591 + struct mm_struct *mm = current->mm;
27592 + unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27593 + struct vm_unmapped_area_info info;
27594 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27595 +
27596 +#ifdef CONFIG_PAX_SEGMEXEC
27597 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27598 + pax_task_size = SEGMEXEC_TASK_SIZE;
27599 +#endif
27600 +
27601 + pax_task_size -= PAGE_SIZE;
27602 +
27603 + /* requested length too big for entire address space */
27604 + if (len > pax_task_size)
27605 + return -ENOMEM;
27606 +
27607 + if (flags & MAP_FIXED)
27608 + return addr;
27609 +
27610 +#ifdef CONFIG_PAX_PAGEEXEC
27611 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27612 + goto bottomup;
27613 +#endif
27614 +
27615 +#ifdef CONFIG_PAX_RANDMMAP
27616 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27617 +#endif
27618 +
27619 + /* requesting a specific address */
27620 + if (addr) {
27621 + addr = PAGE_ALIGN(addr);
27622 + if (pax_task_size - len >= addr) {
27623 + vma = find_vma(mm, addr);
27624 + if (check_heap_stack_gap(vma, addr, len, offset))
27625 + return addr;
27626 + }
27627 + }
27628 +
27629 + info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27630 + info.length = len;
27631 + info.low_limit = PAGE_SIZE;
27632 + info.high_limit = mm->mmap_base;
27633 + info.align_mask = filp ? get_align_mask() : 0;
27634 + info.align_offset = pgoff << PAGE_SHIFT;
27635 + info.threadstack_offset = offset;
27636 +
27637 + addr = vm_unmapped_area(&info);
27638 + if (!(addr & ~PAGE_MASK))
27639 + return addr;
27640 + VM_BUG_ON(addr != -ENOMEM);
27641 +
27642 +bottomup:
27643 + /*
27644 + * A failed mmap() very likely causes application failure,
27645 + * so fall back to the bottom-up function here. This scenario
27646 + * can happen with large stack limits and large mmap()
27647 + * allocations.
27648 + */
27649 + return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27650 +}
27651 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27652 index 30277e2..5664a29 100644
27653 --- a/arch/x86/kernel/sys_x86_64.c
27654 +++ b/arch/x86/kernel/sys_x86_64.c
27655 @@ -81,8 +81,8 @@ out:
27656 return error;
27657 }
27658
27659 -static void find_start_end(unsigned long flags, unsigned long *begin,
27660 - unsigned long *end)
27661 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
27662 + unsigned long *begin, unsigned long *end)
27663 {
27664 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27665 unsigned long new_begin;
27666 @@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27667 *begin = new_begin;
27668 }
27669 } else {
27670 - *begin = current->mm->mmap_legacy_base;
27671 + *begin = mm->mmap_legacy_base;
27672 *end = TASK_SIZE;
27673 }
27674 }
27675 @@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27676 struct vm_area_struct *vma;
27677 struct vm_unmapped_area_info info;
27678 unsigned long begin, end;
27679 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27680
27681 if (flags & MAP_FIXED)
27682 return addr;
27683
27684 - find_start_end(flags, &begin, &end);
27685 + find_start_end(mm, flags, &begin, &end);
27686
27687 if (len > end)
27688 return -ENOMEM;
27689
27690 +#ifdef CONFIG_PAX_RANDMMAP
27691 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27692 +#endif
27693 +
27694 if (addr) {
27695 addr = PAGE_ALIGN(addr);
27696 vma = find_vma(mm, addr);
27697 - if (end - len >= addr &&
27698 - (!vma || addr + len <= vma->vm_start))
27699 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27700 return addr;
27701 }
27702
27703 @@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27704 info.high_limit = end;
27705 info.align_mask = filp ? get_align_mask() : 0;
27706 info.align_offset = pgoff << PAGE_SHIFT;
27707 + info.threadstack_offset = offset;
27708 return vm_unmapped_area(&info);
27709 }
27710
27711 @@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27712 struct mm_struct *mm = current->mm;
27713 unsigned long addr = addr0;
27714 struct vm_unmapped_area_info info;
27715 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27716
27717 /* requested length too big for entire address space */
27718 if (len > TASK_SIZE)
27719 @@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27720 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27721 goto bottomup;
27722
27723 +#ifdef CONFIG_PAX_RANDMMAP
27724 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27725 +#endif
27726 +
27727 /* requesting a specific address */
27728 if (addr) {
27729 addr = PAGE_ALIGN(addr);
27730 vma = find_vma(mm, addr);
27731 - if (TASK_SIZE - len >= addr &&
27732 - (!vma || addr + len <= vma->vm_start))
27733 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27734 return addr;
27735 }
27736
27737 @@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27738 info.high_limit = mm->mmap_base;
27739 info.align_mask = filp ? get_align_mask() : 0;
27740 info.align_offset = pgoff << PAGE_SHIFT;
27741 + info.threadstack_offset = offset;
27742 addr = vm_unmapped_area(&info);
27743 if (!(addr & ~PAGE_MASK))
27744 return addr;
27745 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27746 index 91a4496..bb87552 100644
27747 --- a/arch/x86/kernel/tboot.c
27748 +++ b/arch/x86/kernel/tboot.c
27749 @@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27750
27751 void tboot_shutdown(u32 shutdown_type)
27752 {
27753 - void (*shutdown)(void);
27754 + void (* __noreturn shutdown)(void);
27755
27756 if (!tboot_enabled())
27757 return;
27758 @@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27759
27760 switch_to_tboot_pt();
27761
27762 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27763 + shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27764 shutdown();
27765
27766 /* should not reach here */
27767 @@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27768 return -ENODEV;
27769 }
27770
27771 -static atomic_t ap_wfs_count;
27772 +static atomic_unchecked_t ap_wfs_count;
27773
27774 static int tboot_wait_for_aps(int num_aps)
27775 {
27776 @@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27777 {
27778 switch (action) {
27779 case CPU_DYING:
27780 - atomic_inc(&ap_wfs_count);
27781 + atomic_inc_unchecked(&ap_wfs_count);
27782 if (num_online_cpus() == 1)
27783 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27784 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27785 return NOTIFY_BAD;
27786 break;
27787 }
27788 @@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27789
27790 tboot_create_trampoline();
27791
27792 - atomic_set(&ap_wfs_count, 0);
27793 + atomic_set_unchecked(&ap_wfs_count, 0);
27794 register_hotcpu_notifier(&tboot_cpu_notifier);
27795
27796 #ifdef CONFIG_DEBUG_FS
27797 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27798 index 0fa2960..91eabbe 100644
27799 --- a/arch/x86/kernel/time.c
27800 +++ b/arch/x86/kernel/time.c
27801 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27802 {
27803 unsigned long pc = instruction_pointer(regs);
27804
27805 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27806 + if (!user_mode(regs) && in_lock_functions(pc)) {
27807 #ifdef CONFIG_FRAME_POINTER
27808 - return *(unsigned long *)(regs->bp + sizeof(long));
27809 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27810 #else
27811 unsigned long *sp =
27812 (unsigned long *)kernel_stack_pointer(regs);
27813 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27814 * or above a saved flags. Eflags has bits 22-31 zero,
27815 * kernel addresses don't.
27816 */
27817 +
27818 +#ifdef CONFIG_PAX_KERNEXEC
27819 + return ktla_ktva(sp[0]);
27820 +#else
27821 if (sp[0] >> 22)
27822 return sp[0];
27823 if (sp[1] >> 22)
27824 return sp[1];
27825 #endif
27826 +
27827 +#endif
27828 }
27829 return pc;
27830 }
27831 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27832 index f7fec09..d0f623f 100644
27833 --- a/arch/x86/kernel/tls.c
27834 +++ b/arch/x86/kernel/tls.c
27835 @@ -27,6 +27,37 @@ static int get_free_idx(void)
27836 return -ESRCH;
27837 }
27838
27839 +static bool tls_desc_okay(const struct user_desc *info)
27840 +{
27841 + if (LDT_empty(info))
27842 + return true;
27843 +
27844 + /*
27845 + * espfix is required for 16-bit data segments, but espfix
27846 + * only works for LDT segments.
27847 + */
27848 + if (!info->seg_32bit)
27849 + return false;
27850 +
27851 + /* Only allow data segments in the TLS array. */
27852 + if (info->contents > 1)
27853 + return false;
27854 +
27855 + /*
27856 + * Non-present segments with DPL 3 present an interesting attack
27857 + * surface. The kernel should handle such segments correctly,
27858 + * but TLS is very difficult to protect in a sandbox, so prevent
27859 + * such segments from being created.
27860 + *
27861 + * If userspace needs to remove a TLS entry, it can still delete
27862 + * it outright.
27863 + */
27864 + if (info->seg_not_present)
27865 + return false;
27866 +
27867 + return true;
27868 +}
27869 +
27870 static void set_tls_desc(struct task_struct *p, int idx,
27871 const struct user_desc *info, int n)
27872 {
27873 @@ -66,6 +97,9 @@ int do_set_thread_area(struct task_struct *p, int idx,
27874 if (copy_from_user(&info, u_info, sizeof(info)))
27875 return -EFAULT;
27876
27877 + if (!tls_desc_okay(&info))
27878 + return -EINVAL;
27879 +
27880 if (idx == -1)
27881 idx = info.entry_number;
27882
27883 @@ -84,6 +118,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27884 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27885 return -EINVAL;
27886
27887 +#ifdef CONFIG_PAX_SEGMEXEC
27888 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27889 + return -EINVAL;
27890 +#endif
27891 +
27892 set_tls_desc(p, idx, &info, 1);
27893
27894 return 0;
27895 @@ -192,6 +231,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27896 {
27897 struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
27898 const struct user_desc *info;
27899 + int i;
27900
27901 if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
27902 (pos % sizeof(struct user_desc)) != 0 ||
27903 @@ -200,11 +240,15 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27904
27905 if (kbuf)
27906 info = kbuf;
27907 - else if (__copy_from_user(infobuf, ubuf, count))
27908 + else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27909 return -EFAULT;
27910 else
27911 info = infobuf;
27912
27913 + for (i = 0; i < count / sizeof(struct user_desc); i++)
27914 + if (!tls_desc_okay(info + i))
27915 + return -EINVAL;
27916 +
27917 set_tls_desc(target,
27918 GDT_ENTRY_TLS_MIN + (pos / sizeof(struct user_desc)),
27919 info, count / sizeof(struct user_desc));
27920 diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27921 index 1c113db..287b42e 100644
27922 --- a/arch/x86/kernel/tracepoint.c
27923 +++ b/arch/x86/kernel/tracepoint.c
27924 @@ -9,11 +9,11 @@
27925 #include <linux/atomic.h>
27926
27927 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27928 -struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27929 +const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27930 (unsigned long) trace_idt_table };
27931
27932 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27933 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27934 +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27935
27936 static int trace_irq_vector_refcount;
27937 static DEFINE_MUTEX(irq_vector_mutex);
27938 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27939 index de801f2..f189dcf 100644
27940 --- a/arch/x86/kernel/traps.c
27941 +++ b/arch/x86/kernel/traps.c
27942 @@ -67,7 +67,7 @@
27943 #include <asm/proto.h>
27944
27945 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27946 -gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27947 +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27948 #else
27949 #include <asm/processor-flags.h>
27950 #include <asm/setup.h>
27951 @@ -76,7 +76,7 @@ asmlinkage int system_call(void);
27952 #endif
27953
27954 /* Must be page-aligned because the real IDT is used in a fixmap. */
27955 -gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27956 +gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27957
27958 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27959 EXPORT_SYMBOL_GPL(used_vectors);
27960 @@ -108,11 +108,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27961 }
27962
27963 static nokprobe_inline int
27964 -do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27965 +do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27966 struct pt_regs *regs, long error_code)
27967 {
27968 #ifdef CONFIG_X86_32
27969 - if (regs->flags & X86_VM_MASK) {
27970 + if (v8086_mode(regs)) {
27971 /*
27972 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27973 * On nmi (interrupt 2), do_trap should not be called.
27974 @@ -125,12 +125,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27975 return -1;
27976 }
27977 #endif
27978 - if (!user_mode(regs)) {
27979 + if (!user_mode_novm(regs)) {
27980 if (!fixup_exception(regs)) {
27981 tsk->thread.error_code = error_code;
27982 tsk->thread.trap_nr = trapnr;
27983 +
27984 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27985 + if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27986 + str = "PAX: suspicious stack segment fault";
27987 +#endif
27988 +
27989 die(str, regs, error_code);
27990 }
27991 +
27992 +#ifdef CONFIG_PAX_REFCOUNT
27993 + if (trapnr == X86_TRAP_OF)
27994 + pax_report_refcount_overflow(regs);
27995 +#endif
27996 +
27997 return 0;
27998 }
27999
28000 @@ -169,7 +181,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28001 }
28002
28003 static void
28004 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28005 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28006 long error_code, siginfo_t *info)
28007 {
28008 struct task_struct *tsk = current;
28009 @@ -193,7 +205,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28010 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28011 printk_ratelimit()) {
28012 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28013 - tsk->comm, tsk->pid, str,
28014 + tsk->comm, task_pid_nr(tsk), str,
28015 regs->ip, regs->sp, error_code);
28016 print_vma_addr(" in ", regs->ip);
28017 pr_cont("\n");
28018 @@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28019 tsk->thread.error_code = error_code;
28020 tsk->thread.trap_nr = X86_TRAP_DF;
28021
28022 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28023 + if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28024 + die("grsec: kernel stack overflow detected", regs, error_code);
28025 +#endif
28026 +
28027 #ifdef CONFIG_DOUBLEFAULT
28028 df_debug(regs, error_code);
28029 #endif
28030 @@ -296,7 +313,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
28031 conditional_sti(regs);
28032
28033 #ifdef CONFIG_X86_32
28034 - if (regs->flags & X86_VM_MASK) {
28035 + if (v8086_mode(regs)) {
28036 local_irq_enable();
28037 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28038 goto exit;
28039 @@ -304,18 +321,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28040 #endif
28041
28042 tsk = current;
28043 - if (!user_mode(regs)) {
28044 + if (!user_mode_novm(regs)) {
28045 if (fixup_exception(regs))
28046 goto exit;
28047
28048 tsk->thread.error_code = error_code;
28049 tsk->thread.trap_nr = X86_TRAP_GP;
28050 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28051 - X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28052 + X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28053 +
28054 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28055 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28056 + die("PAX: suspicious general protection fault", regs, error_code);
28057 + else
28058 +#endif
28059 +
28060 die("general protection fault", regs, error_code);
28061 + }
28062 goto exit;
28063 }
28064
28065 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28066 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28067 + struct mm_struct *mm = tsk->mm;
28068 + unsigned long limit;
28069 +
28070 + down_write(&mm->mmap_sem);
28071 + limit = mm->context.user_cs_limit;
28072 + if (limit < TASK_SIZE) {
28073 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28074 + up_write(&mm->mmap_sem);
28075 + return;
28076 + }
28077 + up_write(&mm->mmap_sem);
28078 + }
28079 +#endif
28080 +
28081 tsk->thread.error_code = error_code;
28082 tsk->thread.trap_nr = X86_TRAP_GP;
28083
28084 @@ -433,7 +474,7 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28085 /* Copy the remainder of the stack from the current stack. */
28086 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28087
28088 - BUG_ON(!user_mode_vm(&new_stack->regs));
28089 + BUG_ON(!user_mode(&new_stack->regs));
28090 return new_stack;
28091 }
28092 #endif
28093 @@ -518,7 +559,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28094 /* It's safe to allow irq's after DR6 has been saved */
28095 preempt_conditional_sti(regs);
28096
28097 - if (regs->flags & X86_VM_MASK) {
28098 + if (v8086_mode(regs)) {
28099 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28100 X86_TRAP_DB);
28101 preempt_conditional_cli(regs);
28102 @@ -533,7 +574,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28103 * We already checked v86 mode above, so we can check for kernel mode
28104 * by just checking the CPL of CS.
28105 */
28106 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
28107 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28108 tsk->thread.debugreg6 &= ~DR_STEP;
28109 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28110 regs->flags &= ~X86_EFLAGS_TF;
28111 @@ -566,7 +607,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28112 return;
28113 conditional_sti(regs);
28114
28115 - if (!user_mode_vm(regs))
28116 + if (!user_mode(regs))
28117 {
28118 if (!fixup_exception(regs)) {
28119 task->thread.error_code = error_code;
28120 diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28121 index b7e50bb..f4a93ae 100644
28122 --- a/arch/x86/kernel/tsc.c
28123 +++ b/arch/x86/kernel/tsc.c
28124 @@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28125 */
28126 smp_wmb();
28127
28128 - ACCESS_ONCE(c2n->head) = data;
28129 + ACCESS_ONCE_RW(c2n->head) = data;
28130 }
28131
28132 /*
28133 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28134 index 5d1cbfe..2a21feb 100644
28135 --- a/arch/x86/kernel/uprobes.c
28136 +++ b/arch/x86/kernel/uprobes.c
28137 @@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28138 int ret = NOTIFY_DONE;
28139
28140 /* We are only interested in userspace traps */
28141 - if (regs && !user_mode_vm(regs))
28142 + if (regs && !user_mode(regs))
28143 return NOTIFY_DONE;
28144
28145 switch (val) {
28146 @@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28147
28148 if (nleft != rasize) {
28149 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28150 - "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28151 + "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28152
28153 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28154 }
28155 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28156 index b9242ba..50c5edd 100644
28157 --- a/arch/x86/kernel/verify_cpu.S
28158 +++ b/arch/x86/kernel/verify_cpu.S
28159 @@ -20,6 +20,7 @@
28160 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28161 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28162 * arch/x86/kernel/head_32.S: processor startup
28163 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28164 *
28165 * verify_cpu, returns the status of longmode and SSE in register %eax.
28166 * 0: Success 1: Failure
28167 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28168 index e8edcf5..27f9344 100644
28169 --- a/arch/x86/kernel/vm86_32.c
28170 +++ b/arch/x86/kernel/vm86_32.c
28171 @@ -44,6 +44,7 @@
28172 #include <linux/ptrace.h>
28173 #include <linux/audit.h>
28174 #include <linux/stddef.h>
28175 +#include <linux/grsecurity.h>
28176
28177 #include <asm/uaccess.h>
28178 #include <asm/io.h>
28179 @@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28180 do_exit(SIGSEGV);
28181 }
28182
28183 - tss = &per_cpu(init_tss, get_cpu());
28184 + tss = init_tss + get_cpu();
28185 current->thread.sp0 = current->thread.saved_sp0;
28186 current->thread.sysenter_cs = __KERNEL_CS;
28187 load_sp0(tss, &current->thread);
28188 @@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28189
28190 if (tsk->thread.saved_sp0)
28191 return -EPERM;
28192 +
28193 +#ifdef CONFIG_GRKERNSEC_VM86
28194 + if (!capable(CAP_SYS_RAWIO)) {
28195 + gr_handle_vm86();
28196 + return -EPERM;
28197 + }
28198 +#endif
28199 +
28200 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28201 offsetof(struct kernel_vm86_struct, vm86plus) -
28202 sizeof(info.regs));
28203 @@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28204 int tmp;
28205 struct vm86plus_struct __user *v86;
28206
28207 +#ifdef CONFIG_GRKERNSEC_VM86
28208 + if (!capable(CAP_SYS_RAWIO)) {
28209 + gr_handle_vm86();
28210 + return -EPERM;
28211 + }
28212 +#endif
28213 +
28214 tsk = current;
28215 switch (cmd) {
28216 case VM86_REQUEST_IRQ:
28217 @@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28218 tsk->thread.saved_fs = info->regs32->fs;
28219 tsk->thread.saved_gs = get_user_gs(info->regs32);
28220
28221 - tss = &per_cpu(init_tss, get_cpu());
28222 + tss = init_tss + get_cpu();
28223 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28224 if (cpu_has_sep)
28225 tsk->thread.sysenter_cs = 0;
28226 @@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28227 goto cannot_handle;
28228 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28229 goto cannot_handle;
28230 - intr_ptr = (unsigned long __user *) (i << 2);
28231 + intr_ptr = (__force unsigned long __user *) (i << 2);
28232 if (get_user(segoffs, intr_ptr))
28233 goto cannot_handle;
28234 if ((segoffs >> 16) == BIOSSEG)
28235 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28236 index 49edf2d..c0d1362 100644
28237 --- a/arch/x86/kernel/vmlinux.lds.S
28238 +++ b/arch/x86/kernel/vmlinux.lds.S
28239 @@ -26,6 +26,13 @@
28240 #include <asm/page_types.h>
28241 #include <asm/cache.h>
28242 #include <asm/boot.h>
28243 +#include <asm/segment.h>
28244 +
28245 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28246 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28247 +#else
28248 +#define __KERNEL_TEXT_OFFSET 0
28249 +#endif
28250
28251 #undef i386 /* in case the preprocessor is a 32bit one */
28252
28253 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28254
28255 PHDRS {
28256 text PT_LOAD FLAGS(5); /* R_E */
28257 +#ifdef CONFIG_X86_32
28258 + module PT_LOAD FLAGS(5); /* R_E */
28259 +#endif
28260 +#ifdef CONFIG_XEN
28261 + rodata PT_LOAD FLAGS(5); /* R_E */
28262 +#else
28263 + rodata PT_LOAD FLAGS(4); /* R__ */
28264 +#endif
28265 data PT_LOAD FLAGS(6); /* RW_ */
28266 -#ifdef CONFIG_X86_64
28267 + init.begin PT_LOAD FLAGS(6); /* RW_ */
28268 #ifdef CONFIG_SMP
28269 percpu PT_LOAD FLAGS(6); /* RW_ */
28270 #endif
28271 + text.init PT_LOAD FLAGS(5); /* R_E */
28272 + text.exit PT_LOAD FLAGS(5); /* R_E */
28273 init PT_LOAD FLAGS(7); /* RWE */
28274 -#endif
28275 note PT_NOTE FLAGS(0); /* ___ */
28276 }
28277
28278 SECTIONS
28279 {
28280 #ifdef CONFIG_X86_32
28281 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28282 - phys_startup_32 = startup_32 - LOAD_OFFSET;
28283 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28284 #else
28285 - . = __START_KERNEL;
28286 - phys_startup_64 = startup_64 - LOAD_OFFSET;
28287 + . = __START_KERNEL;
28288 #endif
28289
28290 /* Text and read-only data */
28291 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
28292 - _text = .;
28293 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28294 /* bootstrapping code */
28295 +#ifdef CONFIG_X86_32
28296 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28297 +#else
28298 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28299 +#endif
28300 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28301 + _text = .;
28302 HEAD_TEXT
28303 . = ALIGN(8);
28304 _stext = .;
28305 @@ -104,13 +124,47 @@ SECTIONS
28306 IRQENTRY_TEXT
28307 *(.fixup)
28308 *(.gnu.warning)
28309 - /* End of text section */
28310 - _etext = .;
28311 } :text = 0x9090
28312
28313 - NOTES :text :note
28314 + . += __KERNEL_TEXT_OFFSET;
28315
28316 - EXCEPTION_TABLE(16) :text = 0x9090
28317 +#ifdef CONFIG_X86_32
28318 + . = ALIGN(PAGE_SIZE);
28319 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28320 +
28321 +#ifdef CONFIG_PAX_KERNEXEC
28322 + MODULES_EXEC_VADDR = .;
28323 + BYTE(0)
28324 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28325 + . = ALIGN(HPAGE_SIZE) - 1;
28326 + MODULES_EXEC_END = .;
28327 +#endif
28328 +
28329 + } :module
28330 +#endif
28331 +
28332 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28333 + /* End of text section */
28334 + BYTE(0)
28335 + _etext = . - __KERNEL_TEXT_OFFSET;
28336 + }
28337 +
28338 +#ifdef CONFIG_X86_32
28339 + . = ALIGN(PAGE_SIZE);
28340 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28341 + . = ALIGN(PAGE_SIZE);
28342 + *(.empty_zero_page)
28343 + *(.initial_pg_fixmap)
28344 + *(.initial_pg_pmd)
28345 + *(.initial_page_table)
28346 + *(.swapper_pg_dir)
28347 + } :rodata
28348 +#endif
28349 +
28350 + . = ALIGN(PAGE_SIZE);
28351 + NOTES :rodata :note
28352 +
28353 + EXCEPTION_TABLE(16) :rodata
28354
28355 #if defined(CONFIG_DEBUG_RODATA)
28356 /* .text should occupy whole number of pages */
28357 @@ -122,16 +176,20 @@ SECTIONS
28358
28359 /* Data */
28360 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28361 +
28362 +#ifdef CONFIG_PAX_KERNEXEC
28363 + . = ALIGN(HPAGE_SIZE);
28364 +#else
28365 + . = ALIGN(PAGE_SIZE);
28366 +#endif
28367 +
28368 /* Start of data section */
28369 _sdata = .;
28370
28371 /* init_task */
28372 INIT_TASK_DATA(THREAD_SIZE)
28373
28374 -#ifdef CONFIG_X86_32
28375 - /* 32 bit has nosave before _edata */
28376 NOSAVE_DATA
28377 -#endif
28378
28379 PAGE_ALIGNED_DATA(PAGE_SIZE)
28380
28381 @@ -174,12 +232,19 @@ SECTIONS
28382 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28383
28384 /* Init code and data - will be freed after init */
28385 - . = ALIGN(PAGE_SIZE);
28386 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28387 + BYTE(0)
28388 +
28389 +#ifdef CONFIG_PAX_KERNEXEC
28390 + . = ALIGN(HPAGE_SIZE);
28391 +#else
28392 + . = ALIGN(PAGE_SIZE);
28393 +#endif
28394 +
28395 __init_begin = .; /* paired with __init_end */
28396 - }
28397 + } :init.begin
28398
28399 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28400 +#ifdef CONFIG_SMP
28401 /*
28402 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28403 * output PHDR, so the next output section - .init.text - should
28404 @@ -188,12 +253,27 @@ SECTIONS
28405 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
28406 #endif
28407
28408 - INIT_TEXT_SECTION(PAGE_SIZE)
28409 -#ifdef CONFIG_X86_64
28410 - :init
28411 -#endif
28412 + . = ALIGN(PAGE_SIZE);
28413 + init_begin = .;
28414 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28415 + VMLINUX_SYMBOL(_sinittext) = .;
28416 + INIT_TEXT
28417 + VMLINUX_SYMBOL(_einittext) = .;
28418 + . = ALIGN(PAGE_SIZE);
28419 + } :text.init
28420
28421 - INIT_DATA_SECTION(16)
28422 + /*
28423 + * .exit.text is discard at runtime, not link time, to deal with
28424 + * references from .altinstructions and .eh_frame
28425 + */
28426 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28427 + EXIT_TEXT
28428 + . = ALIGN(16);
28429 + } :text.exit
28430 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28431 +
28432 + . = ALIGN(PAGE_SIZE);
28433 + INIT_DATA_SECTION(16) :init
28434
28435 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28436 __x86_cpu_dev_start = .;
28437 @@ -264,19 +344,12 @@ SECTIONS
28438 }
28439
28440 . = ALIGN(8);
28441 - /*
28442 - * .exit.text is discard at runtime, not link time, to deal with
28443 - * references from .altinstructions and .eh_frame
28444 - */
28445 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28446 - EXIT_TEXT
28447 - }
28448
28449 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28450 EXIT_DATA
28451 }
28452
28453 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28454 +#ifndef CONFIG_SMP
28455 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28456 #endif
28457
28458 @@ -295,16 +368,10 @@ SECTIONS
28459 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28460 __smp_locks = .;
28461 *(.smp_locks)
28462 - . = ALIGN(PAGE_SIZE);
28463 __smp_locks_end = .;
28464 + . = ALIGN(PAGE_SIZE);
28465 }
28466
28467 -#ifdef CONFIG_X86_64
28468 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28469 - NOSAVE_DATA
28470 - }
28471 -#endif
28472 -
28473 /* BSS */
28474 . = ALIGN(PAGE_SIZE);
28475 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28476 @@ -320,6 +387,7 @@ SECTIONS
28477 __brk_base = .;
28478 . += 64 * 1024; /* 64k alignment slop space */
28479 *(.brk_reservation) /* areas brk users have reserved */
28480 + . = ALIGN(HPAGE_SIZE);
28481 __brk_limit = .;
28482 }
28483
28484 @@ -346,13 +414,12 @@ SECTIONS
28485 * for the boot processor.
28486 */
28487 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28488 -INIT_PER_CPU(gdt_page);
28489 INIT_PER_CPU(irq_stack_union);
28490
28491 /*
28492 * Build-time check on the image size:
28493 */
28494 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28495 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28496 "kernel image bigger than KERNEL_IMAGE_SIZE");
28497
28498 #ifdef CONFIG_SMP
28499 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28500 index 957779f..74e405c 100644
28501 --- a/arch/x86/kernel/vsyscall_64.c
28502 +++ b/arch/x86/kernel/vsyscall_64.c
28503 @@ -54,15 +54,13 @@
28504
28505 DEFINE_VVAR(int, vgetcpu_mode);
28506
28507 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28508 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28509
28510 static int __init vsyscall_setup(char *str)
28511 {
28512 if (str) {
28513 if (!strcmp("emulate", str))
28514 vsyscall_mode = EMULATE;
28515 - else if (!strcmp("native", str))
28516 - vsyscall_mode = NATIVE;
28517 else if (!strcmp("none", str))
28518 vsyscall_mode = NONE;
28519 else
28520 @@ -279,8 +277,7 @@ do_ret:
28521 return true;
28522
28523 sigsegv:
28524 - force_sig(SIGSEGV, current);
28525 - return true;
28526 + do_group_exit(SIGKILL);
28527 }
28528
28529 /*
28530 @@ -331,10 +328,7 @@ void __init map_vsyscall(void)
28531 extern char __vsyscall_page;
28532 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28533
28534 - __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28535 - vsyscall_mode == NATIVE
28536 - ? PAGE_KERNEL_VSYSCALL
28537 - : PAGE_KERNEL_VVAR);
28538 + __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28539 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28540 (unsigned long)VSYSCALL_ADDR);
28541 }
28542 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28543 index 04068192..4d75aa6 100644
28544 --- a/arch/x86/kernel/x8664_ksyms_64.c
28545 +++ b/arch/x86/kernel/x8664_ksyms_64.c
28546 @@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28547 EXPORT_SYMBOL(copy_user_generic_unrolled);
28548 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28549 EXPORT_SYMBOL(__copy_user_nocache);
28550 -EXPORT_SYMBOL(_copy_from_user);
28551 -EXPORT_SYMBOL(_copy_to_user);
28552
28553 EXPORT_SYMBOL(copy_page);
28554 EXPORT_SYMBOL(clear_page);
28555 @@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28556 EXPORT_SYMBOL(___preempt_schedule_context);
28557 #endif
28558 #endif
28559 +
28560 +#ifdef CONFIG_PAX_PER_CPU_PGD
28561 +EXPORT_SYMBOL(cpu_pgd);
28562 +#endif
28563 diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28564 index e48b674..a451dd9 100644
28565 --- a/arch/x86/kernel/x86_init.c
28566 +++ b/arch/x86/kernel/x86_init.c
28567 @@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28568 static void default_nmi_init(void) { };
28569 static int default_i8042_detect(void) { return 1; };
28570
28571 -struct x86_platform_ops x86_platform = {
28572 +struct x86_platform_ops x86_platform __read_only = {
28573 .calibrate_tsc = native_calibrate_tsc,
28574 .get_wallclock = mach_get_cmos_time,
28575 .set_wallclock = mach_set_rtc_mmss,
28576 @@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28577 EXPORT_SYMBOL_GPL(x86_platform);
28578
28579 #if defined(CONFIG_PCI_MSI)
28580 -struct x86_msi_ops x86_msi = {
28581 +struct x86_msi_ops x86_msi __read_only = {
28582 .setup_msi_irqs = native_setup_msi_irqs,
28583 .compose_msi_msg = native_compose_msi_msg,
28584 .teardown_msi_irq = native_teardown_msi_irq,
28585 @@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28586 }
28587 #endif
28588
28589 -struct x86_io_apic_ops x86_io_apic_ops = {
28590 +struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28591 .init = native_io_apic_init_mappings,
28592 .read = native_io_apic_read,
28593 .write = native_io_apic_write,
28594 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28595 index 4c540c4..0b985b0 100644
28596 --- a/arch/x86/kernel/xsave.c
28597 +++ b/arch/x86/kernel/xsave.c
28598 @@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28599
28600 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28601 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28602 - err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28603 + err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28604
28605 if (!use_xsave())
28606 return err;
28607
28608 - err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28609 + err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28610
28611 /*
28612 * Read the xstate_bv which we copied (directly from the cpu or
28613 * from the state in task struct) to the user buffers.
28614 */
28615 - err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28616 + err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28617
28618 /*
28619 * For legacy compatible, we always set FP/SSE bits in the bit
28620 @@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28621 */
28622 xstate_bv |= XSTATE_FPSSE;
28623
28624 - err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28625 + err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28626
28627 return err;
28628 }
28629 @@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28630 {
28631 int err;
28632
28633 + buf = (struct xsave_struct __user *)____m(buf);
28634 if (use_xsave())
28635 err = xsave_user(buf);
28636 else if (use_fxsr())
28637 @@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28638 */
28639 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28640 {
28641 + buf = (void __user *)____m(buf);
28642 if (use_xsave()) {
28643 if ((unsigned long)buf % 64 || fx_only) {
28644 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28645 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28646 index 976e3a5..8bb998c 100644
28647 --- a/arch/x86/kvm/cpuid.c
28648 +++ b/arch/x86/kvm/cpuid.c
28649 @@ -175,15 +175,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28650 struct kvm_cpuid2 *cpuid,
28651 struct kvm_cpuid_entry2 __user *entries)
28652 {
28653 - int r;
28654 + int r, i;
28655
28656 r = -E2BIG;
28657 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28658 goto out;
28659 r = -EFAULT;
28660 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28661 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28662 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28663 goto out;
28664 + for (i = 0; i < cpuid->nent; ++i) {
28665 + struct kvm_cpuid_entry2 cpuid_entry;
28666 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28667 + goto out;
28668 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
28669 + }
28670 vcpu->arch.cpuid_nent = cpuid->nent;
28671 kvm_apic_set_version(vcpu);
28672 kvm_x86_ops->cpuid_update(vcpu);
28673 @@ -196,15 +201,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28674 struct kvm_cpuid2 *cpuid,
28675 struct kvm_cpuid_entry2 __user *entries)
28676 {
28677 - int r;
28678 + int r, i;
28679
28680 r = -E2BIG;
28681 if (cpuid->nent < vcpu->arch.cpuid_nent)
28682 goto out;
28683 r = -EFAULT;
28684 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28685 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28686 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28687 goto out;
28688 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28689 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28690 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28691 + goto out;
28692 + }
28693 return 0;
28694
28695 out:
28696 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28697 index 9f8a2fa..2df3c3f 100644
28698 --- a/arch/x86/kvm/emulate.c
28699 +++ b/arch/x86/kvm/emulate.c
28700 @@ -3519,7 +3519,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28701 int cr = ctxt->modrm_reg;
28702 u64 efer = 0;
28703
28704 - static u64 cr_reserved_bits[] = {
28705 + static const u64 cr_reserved_bits[] = {
28706 0xffffffff00000000ULL,
28707 0, 0, 0, /* CR3 checked later */
28708 CR4_RESERVED_BITS,
28709 @@ -3554,7 +3554,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28710
28711 ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
28712 if (efer & EFER_LMA)
28713 - rsvd = CR3_L_MODE_RESERVED_BITS;
28714 + rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;
28715
28716 if (new_val & rsvd)
28717 return emulate_gp(ctxt, 0);
28718 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28719 index b8345dd..f225d71 100644
28720 --- a/arch/x86/kvm/lapic.c
28721 +++ b/arch/x86/kvm/lapic.c
28722 @@ -55,7 +55,7 @@
28723 #define APIC_BUS_CYCLE_NS 1
28724
28725 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28726 -#define apic_debug(fmt, arg...)
28727 +#define apic_debug(fmt, arg...) do {} while (0)
28728
28729 #define APIC_LVT_NUM 6
28730 /* 14 is the version for Xeon and Pentium 8.4.8*/
28731 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28732 index fd49c86..77e1aa0 100644
28733 --- a/arch/x86/kvm/paging_tmpl.h
28734 +++ b/arch/x86/kvm/paging_tmpl.h
28735 @@ -343,7 +343,7 @@ retry_walk:
28736 if (unlikely(kvm_is_error_hva(host_addr)))
28737 goto error;
28738
28739 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28740 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28741 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28742 goto error;
28743 walker->ptep_user[walker->level - 1] = ptep_user;
28744 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28745 index 7527cef..c63a838e 100644
28746 --- a/arch/x86/kvm/svm.c
28747 +++ b/arch/x86/kvm/svm.c
28748 @@ -3564,7 +3564,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28749 int cpu = raw_smp_processor_id();
28750
28751 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28752 +
28753 + pax_open_kernel();
28754 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28755 + pax_close_kernel();
28756 +
28757 load_TR_desc();
28758 }
28759
28760 @@ -3965,6 +3969,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28761 #endif
28762 #endif
28763
28764 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28765 + __set_fs(current_thread_info()->addr_limit);
28766 +#endif
28767 +
28768 reload_tss(vcpu);
28769
28770 local_irq_disable();
28771 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28772 index 3e556c6..08bbf7f 100644
28773 --- a/arch/x86/kvm/vmx.c
28774 +++ b/arch/x86/kvm/vmx.c
28775 @@ -1366,12 +1366,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28776 #endif
28777 }
28778
28779 -static void vmcs_clear_bits(unsigned long field, u32 mask)
28780 +static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28781 {
28782 vmcs_writel(field, vmcs_readl(field) & ~mask);
28783 }
28784
28785 -static void vmcs_set_bits(unsigned long field, u32 mask)
28786 +static void vmcs_set_bits(unsigned long field, unsigned long mask)
28787 {
28788 vmcs_writel(field, vmcs_readl(field) | mask);
28789 }
28790 @@ -1631,7 +1631,11 @@ static void reload_tss(void)
28791 struct desc_struct *descs;
28792
28793 descs = (void *)gdt->address;
28794 +
28795 + pax_open_kernel();
28796 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28797 + pax_close_kernel();
28798 +
28799 load_TR_desc();
28800 }
28801
28802 @@ -1859,6 +1863,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28803 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28804 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28805
28806 +#ifdef CONFIG_PAX_PER_CPU_PGD
28807 + vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28808 +#endif
28809 +
28810 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28811 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28812 vmx->loaded_vmcs->cpu = cpu;
28813 @@ -2148,7 +2156,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28814 * reads and returns guest's timestamp counter "register"
28815 * guest_tsc = host_tsc + tsc_offset -- 21.3
28816 */
28817 -static u64 guest_read_tsc(void)
28818 +static u64 __intentional_overflow(-1) guest_read_tsc(void)
28819 {
28820 u64 host_tsc, tsc_offset;
28821
28822 @@ -3146,11 +3154,16 @@ static __init int hardware_setup(void)
28823 * page upon invalidation. No need to do anything if the
28824 * processor does not have the APIC_ACCESS_ADDR VMCS field.
28825 */
28826 - kvm_x86_ops->set_apic_access_page_addr = NULL;
28827 + pax_open_kernel();
28828 + *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28829 + pax_close_kernel();
28830 }
28831
28832 - if (!cpu_has_vmx_tpr_shadow())
28833 - kvm_x86_ops->update_cr8_intercept = NULL;
28834 + if (!cpu_has_vmx_tpr_shadow()) {
28835 + pax_open_kernel();
28836 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28837 + pax_close_kernel();
28838 + }
28839
28840 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28841 kvm_disable_largepages();
28842 @@ -3161,13 +3174,15 @@ static __init int hardware_setup(void)
28843 if (!cpu_has_vmx_apicv())
28844 enable_apicv = 0;
28845
28846 + pax_open_kernel();
28847 if (enable_apicv)
28848 - kvm_x86_ops->update_cr8_intercept = NULL;
28849 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28850 else {
28851 - kvm_x86_ops->hwapic_irr_update = NULL;
28852 - kvm_x86_ops->deliver_posted_interrupt = NULL;
28853 - kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28854 + *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28855 + *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28856 + *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28857 }
28858 + pax_close_kernel();
28859
28860 if (nested)
28861 nested_vmx_setup_ctls_msrs();
28862 @@ -4274,7 +4289,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28863 unsigned long cr4;
28864
28865 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28866 +
28867 +#ifndef CONFIG_PAX_PER_CPU_PGD
28868 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28869 +#endif
28870
28871 /* Save the most likely value for this task's CR4 in the VMCS. */
28872 cr4 = read_cr4();
28873 @@ -4301,7 +4319,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28874 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28875 vmx->host_idt_base = dt.address;
28876
28877 - vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28878 + vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28879
28880 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28881 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28882 @@ -7622,6 +7640,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28883 "jmp 2f \n\t"
28884 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28885 "2: "
28886 +
28887 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28888 + "ljmp %[cs],$3f\n\t"
28889 + "3: "
28890 +#endif
28891 +
28892 /* Save guest registers, load host registers, keep flags */
28893 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28894 "pop %0 \n\t"
28895 @@ -7674,6 +7698,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28896 #endif
28897 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28898 [wordsize]"i"(sizeof(ulong))
28899 +
28900 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28901 + ,[cs]"i"(__KERNEL_CS)
28902 +#endif
28903 +
28904 : "cc", "memory"
28905 #ifdef CONFIG_X86_64
28906 , "rax", "rbx", "rdi", "rsi"
28907 @@ -7687,7 +7716,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28908 if (debugctlmsr)
28909 update_debugctlmsr(debugctlmsr);
28910
28911 -#ifndef CONFIG_X86_64
28912 +#ifdef CONFIG_X86_32
28913 /*
28914 * The sysexit path does not restore ds/es, so we must set them to
28915 * a reasonable value ourselves.
28916 @@ -7696,8 +7725,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28917 * may be executed in interrupt context, which saves and restore segments
28918 * around it, nullifying its effect.
28919 */
28920 - loadsegment(ds, __USER_DS);
28921 - loadsegment(es, __USER_DS);
28922 + loadsegment(ds, __KERNEL_DS);
28923 + loadsegment(es, __KERNEL_DS);
28924 + loadsegment(ss, __KERNEL_DS);
28925 +
28926 +#ifdef CONFIG_PAX_KERNEXEC
28927 + loadsegment(fs, __KERNEL_PERCPU);
28928 +#endif
28929 +
28930 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28931 + __set_fs(current_thread_info()->addr_limit);
28932 +#endif
28933 +
28934 #endif
28935
28936 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28937 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28938 index 0033df3..db6236d 100644
28939 --- a/arch/x86/kvm/x86.c
28940 +++ b/arch/x86/kvm/x86.c
28941 @@ -732,6 +732,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
28942
28943 int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
28944 {
28945 + cr3 &= ~CR3_PCID_INVD;
28946 +
28947 if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {
28948 kvm_mmu_sync_roots(vcpu);
28949 kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
28950 @@ -1878,8 +1880,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28951 {
28952 struct kvm *kvm = vcpu->kvm;
28953 int lm = is_long_mode(vcpu);
28954 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28955 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28956 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28957 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28958 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28959 : kvm->arch.xen_hvm_config.blob_size_32;
28960 u32 page_num = data & ~PAGE_MASK;
28961 @@ -2806,6 +2808,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28962 if (n < msr_list.nmsrs)
28963 goto out;
28964 r = -EFAULT;
28965 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28966 + goto out;
28967 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28968 num_msrs_to_save * sizeof(u32)))
28969 goto out;
28970 @@ -5670,7 +5674,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28971 };
28972 #endif
28973
28974 -int kvm_arch_init(void *opaque)
28975 +int kvm_arch_init(const void *opaque)
28976 {
28977 int r;
28978 struct kvm_x86_ops *ops = opaque;
28979 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28980 index aae9413..d11e829 100644
28981 --- a/arch/x86/lguest/boot.c
28982 +++ b/arch/x86/lguest/boot.c
28983 @@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28984 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28985 * Launcher to reboot us.
28986 */
28987 -static void lguest_restart(char *reason)
28988 +static __noreturn void lguest_restart(char *reason)
28989 {
28990 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28991 + BUG();
28992 }
28993
28994 /*G:050
28995 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28996 index 00933d5..3a64af9 100644
28997 --- a/arch/x86/lib/atomic64_386_32.S
28998 +++ b/arch/x86/lib/atomic64_386_32.S
28999 @@ -48,6 +48,10 @@ BEGIN(read)
29000 movl (v), %eax
29001 movl 4(v), %edx
29002 RET_ENDP
29003 +BEGIN(read_unchecked)
29004 + movl (v), %eax
29005 + movl 4(v), %edx
29006 +RET_ENDP
29007 #undef v
29008
29009 #define v %esi
29010 @@ -55,6 +59,10 @@ BEGIN(set)
29011 movl %ebx, (v)
29012 movl %ecx, 4(v)
29013 RET_ENDP
29014 +BEGIN(set_unchecked)
29015 + movl %ebx, (v)
29016 + movl %ecx, 4(v)
29017 +RET_ENDP
29018 #undef v
29019
29020 #define v %esi
29021 @@ -70,6 +78,20 @@ RET_ENDP
29022 BEGIN(add)
29023 addl %eax, (v)
29024 adcl %edx, 4(v)
29025 +
29026 +#ifdef CONFIG_PAX_REFCOUNT
29027 + jno 0f
29028 + subl %eax, (v)
29029 + sbbl %edx, 4(v)
29030 + int $4
29031 +0:
29032 + _ASM_EXTABLE(0b, 0b)
29033 +#endif
29034 +
29035 +RET_ENDP
29036 +BEGIN(add_unchecked)
29037 + addl %eax, (v)
29038 + adcl %edx, 4(v)
29039 RET_ENDP
29040 #undef v
29041
29042 @@ -77,6 +99,24 @@ RET_ENDP
29043 BEGIN(add_return)
29044 addl (v), %eax
29045 adcl 4(v), %edx
29046 +
29047 +#ifdef CONFIG_PAX_REFCOUNT
29048 + into
29049 +1234:
29050 + _ASM_EXTABLE(1234b, 2f)
29051 +#endif
29052 +
29053 + movl %eax, (v)
29054 + movl %edx, 4(v)
29055 +
29056 +#ifdef CONFIG_PAX_REFCOUNT
29057 +2:
29058 +#endif
29059 +
29060 +RET_ENDP
29061 +BEGIN(add_return_unchecked)
29062 + addl (v), %eax
29063 + adcl 4(v), %edx
29064 movl %eax, (v)
29065 movl %edx, 4(v)
29066 RET_ENDP
29067 @@ -86,6 +126,20 @@ RET_ENDP
29068 BEGIN(sub)
29069 subl %eax, (v)
29070 sbbl %edx, 4(v)
29071 +
29072 +#ifdef CONFIG_PAX_REFCOUNT
29073 + jno 0f
29074 + addl %eax, (v)
29075 + adcl %edx, 4(v)
29076 + int $4
29077 +0:
29078 + _ASM_EXTABLE(0b, 0b)
29079 +#endif
29080 +
29081 +RET_ENDP
29082 +BEGIN(sub_unchecked)
29083 + subl %eax, (v)
29084 + sbbl %edx, 4(v)
29085 RET_ENDP
29086 #undef v
29087
29088 @@ -96,6 +150,27 @@ BEGIN(sub_return)
29089 sbbl $0, %edx
29090 addl (v), %eax
29091 adcl 4(v), %edx
29092 +
29093 +#ifdef CONFIG_PAX_REFCOUNT
29094 + into
29095 +1234:
29096 + _ASM_EXTABLE(1234b, 2f)
29097 +#endif
29098 +
29099 + movl %eax, (v)
29100 + movl %edx, 4(v)
29101 +
29102 +#ifdef CONFIG_PAX_REFCOUNT
29103 +2:
29104 +#endif
29105 +
29106 +RET_ENDP
29107 +BEGIN(sub_return_unchecked)
29108 + negl %edx
29109 + negl %eax
29110 + sbbl $0, %edx
29111 + addl (v), %eax
29112 + adcl 4(v), %edx
29113 movl %eax, (v)
29114 movl %edx, 4(v)
29115 RET_ENDP
29116 @@ -105,6 +180,20 @@ RET_ENDP
29117 BEGIN(inc)
29118 addl $1, (v)
29119 adcl $0, 4(v)
29120 +
29121 +#ifdef CONFIG_PAX_REFCOUNT
29122 + jno 0f
29123 + subl $1, (v)
29124 + sbbl $0, 4(v)
29125 + int $4
29126 +0:
29127 + _ASM_EXTABLE(0b, 0b)
29128 +#endif
29129 +
29130 +RET_ENDP
29131 +BEGIN(inc_unchecked)
29132 + addl $1, (v)
29133 + adcl $0, 4(v)
29134 RET_ENDP
29135 #undef v
29136
29137 @@ -114,6 +203,26 @@ BEGIN(inc_return)
29138 movl 4(v), %edx
29139 addl $1, %eax
29140 adcl $0, %edx
29141 +
29142 +#ifdef CONFIG_PAX_REFCOUNT
29143 + into
29144 +1234:
29145 + _ASM_EXTABLE(1234b, 2f)
29146 +#endif
29147 +
29148 + movl %eax, (v)
29149 + movl %edx, 4(v)
29150 +
29151 +#ifdef CONFIG_PAX_REFCOUNT
29152 +2:
29153 +#endif
29154 +
29155 +RET_ENDP
29156 +BEGIN(inc_return_unchecked)
29157 + movl (v), %eax
29158 + movl 4(v), %edx
29159 + addl $1, %eax
29160 + adcl $0, %edx
29161 movl %eax, (v)
29162 movl %edx, 4(v)
29163 RET_ENDP
29164 @@ -123,6 +232,20 @@ RET_ENDP
29165 BEGIN(dec)
29166 subl $1, (v)
29167 sbbl $0, 4(v)
29168 +
29169 +#ifdef CONFIG_PAX_REFCOUNT
29170 + jno 0f
29171 + addl $1, (v)
29172 + adcl $0, 4(v)
29173 + int $4
29174 +0:
29175 + _ASM_EXTABLE(0b, 0b)
29176 +#endif
29177 +
29178 +RET_ENDP
29179 +BEGIN(dec_unchecked)
29180 + subl $1, (v)
29181 + sbbl $0, 4(v)
29182 RET_ENDP
29183 #undef v
29184
29185 @@ -132,6 +255,26 @@ BEGIN(dec_return)
29186 movl 4(v), %edx
29187 subl $1, %eax
29188 sbbl $0, %edx
29189 +
29190 +#ifdef CONFIG_PAX_REFCOUNT
29191 + into
29192 +1234:
29193 + _ASM_EXTABLE(1234b, 2f)
29194 +#endif
29195 +
29196 + movl %eax, (v)
29197 + movl %edx, 4(v)
29198 +
29199 +#ifdef CONFIG_PAX_REFCOUNT
29200 +2:
29201 +#endif
29202 +
29203 +RET_ENDP
29204 +BEGIN(dec_return_unchecked)
29205 + movl (v), %eax
29206 + movl 4(v), %edx
29207 + subl $1, %eax
29208 + sbbl $0, %edx
29209 movl %eax, (v)
29210 movl %edx, 4(v)
29211 RET_ENDP
29212 @@ -143,6 +286,13 @@ BEGIN(add_unless)
29213 adcl %edx, %edi
29214 addl (v), %eax
29215 adcl 4(v), %edx
29216 +
29217 +#ifdef CONFIG_PAX_REFCOUNT
29218 + into
29219 +1234:
29220 + _ASM_EXTABLE(1234b, 2f)
29221 +#endif
29222 +
29223 cmpl %eax, %ecx
29224 je 3f
29225 1:
29226 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29227 1:
29228 addl $1, %eax
29229 adcl $0, %edx
29230 +
29231 +#ifdef CONFIG_PAX_REFCOUNT
29232 + into
29233 +1234:
29234 + _ASM_EXTABLE(1234b, 2f)
29235 +#endif
29236 +
29237 movl %eax, (v)
29238 movl %edx, 4(v)
29239 movl $1, %eax
29240 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29241 movl 4(v), %edx
29242 subl $1, %eax
29243 sbbl $0, %edx
29244 +
29245 +#ifdef CONFIG_PAX_REFCOUNT
29246 + into
29247 +1234:
29248 + _ASM_EXTABLE(1234b, 1f)
29249 +#endif
29250 +
29251 js 1f
29252 movl %eax, (v)
29253 movl %edx, 4(v)
29254 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29255 index f5cc9eb..51fa319 100644
29256 --- a/arch/x86/lib/atomic64_cx8_32.S
29257 +++ b/arch/x86/lib/atomic64_cx8_32.S
29258 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29259 CFI_STARTPROC
29260
29261 read64 %ecx
29262 + pax_force_retaddr
29263 ret
29264 CFI_ENDPROC
29265 ENDPROC(atomic64_read_cx8)
29266
29267 +ENTRY(atomic64_read_unchecked_cx8)
29268 + CFI_STARTPROC
29269 +
29270 + read64 %ecx
29271 + pax_force_retaddr
29272 + ret
29273 + CFI_ENDPROC
29274 +ENDPROC(atomic64_read_unchecked_cx8)
29275 +
29276 ENTRY(atomic64_set_cx8)
29277 CFI_STARTPROC
29278
29279 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29280 cmpxchg8b (%esi)
29281 jne 1b
29282
29283 + pax_force_retaddr
29284 ret
29285 CFI_ENDPROC
29286 ENDPROC(atomic64_set_cx8)
29287
29288 +ENTRY(atomic64_set_unchecked_cx8)
29289 + CFI_STARTPROC
29290 +
29291 +1:
29292 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
29293 + * are atomic on 586 and newer */
29294 + cmpxchg8b (%esi)
29295 + jne 1b
29296 +
29297 + pax_force_retaddr
29298 + ret
29299 + CFI_ENDPROC
29300 +ENDPROC(atomic64_set_unchecked_cx8)
29301 +
29302 ENTRY(atomic64_xchg_cx8)
29303 CFI_STARTPROC
29304
29305 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29306 cmpxchg8b (%esi)
29307 jne 1b
29308
29309 + pax_force_retaddr
29310 ret
29311 CFI_ENDPROC
29312 ENDPROC(atomic64_xchg_cx8)
29313
29314 -.macro addsub_return func ins insc
29315 -ENTRY(atomic64_\func\()_return_cx8)
29316 +.macro addsub_return func ins insc unchecked=""
29317 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29318 CFI_STARTPROC
29319 SAVE ebp
29320 SAVE ebx
29321 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29322 movl %edx, %ecx
29323 \ins\()l %esi, %ebx
29324 \insc\()l %edi, %ecx
29325 +
29326 +.ifb \unchecked
29327 +#ifdef CONFIG_PAX_REFCOUNT
29328 + into
29329 +2:
29330 + _ASM_EXTABLE(2b, 3f)
29331 +#endif
29332 +.endif
29333 +
29334 LOCK_PREFIX
29335 cmpxchg8b (%ebp)
29336 jne 1b
29337 -
29338 -10:
29339 movl %ebx, %eax
29340 movl %ecx, %edx
29341 +
29342 +.ifb \unchecked
29343 +#ifdef CONFIG_PAX_REFCOUNT
29344 +3:
29345 +#endif
29346 +.endif
29347 +
29348 RESTORE edi
29349 RESTORE esi
29350 RESTORE ebx
29351 RESTORE ebp
29352 + pax_force_retaddr
29353 ret
29354 CFI_ENDPROC
29355 -ENDPROC(atomic64_\func\()_return_cx8)
29356 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29357 .endm
29358
29359 addsub_return add add adc
29360 addsub_return sub sub sbb
29361 +addsub_return add add adc _unchecked
29362 +addsub_return sub sub sbb _unchecked
29363
29364 -.macro incdec_return func ins insc
29365 -ENTRY(atomic64_\func\()_return_cx8)
29366 +.macro incdec_return func ins insc unchecked=""
29367 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29368 CFI_STARTPROC
29369 SAVE ebx
29370
29371 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29372 movl %edx, %ecx
29373 \ins\()l $1, %ebx
29374 \insc\()l $0, %ecx
29375 +
29376 +.ifb \unchecked
29377 +#ifdef CONFIG_PAX_REFCOUNT
29378 + into
29379 +2:
29380 + _ASM_EXTABLE(2b, 3f)
29381 +#endif
29382 +.endif
29383 +
29384 LOCK_PREFIX
29385 cmpxchg8b (%esi)
29386 jne 1b
29387
29388 -10:
29389 movl %ebx, %eax
29390 movl %ecx, %edx
29391 +
29392 +.ifb \unchecked
29393 +#ifdef CONFIG_PAX_REFCOUNT
29394 +3:
29395 +#endif
29396 +.endif
29397 +
29398 RESTORE ebx
29399 + pax_force_retaddr
29400 ret
29401 CFI_ENDPROC
29402 -ENDPROC(atomic64_\func\()_return_cx8)
29403 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29404 .endm
29405
29406 incdec_return inc add adc
29407 incdec_return dec sub sbb
29408 +incdec_return inc add adc _unchecked
29409 +incdec_return dec sub sbb _unchecked
29410
29411 ENTRY(atomic64_dec_if_positive_cx8)
29412 CFI_STARTPROC
29413 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29414 movl %edx, %ecx
29415 subl $1, %ebx
29416 sbb $0, %ecx
29417 +
29418 +#ifdef CONFIG_PAX_REFCOUNT
29419 + into
29420 +1234:
29421 + _ASM_EXTABLE(1234b, 2f)
29422 +#endif
29423 +
29424 js 2f
29425 LOCK_PREFIX
29426 cmpxchg8b (%esi)
29427 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29428 movl %ebx, %eax
29429 movl %ecx, %edx
29430 RESTORE ebx
29431 + pax_force_retaddr
29432 ret
29433 CFI_ENDPROC
29434 ENDPROC(atomic64_dec_if_positive_cx8)
29435 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29436 movl %edx, %ecx
29437 addl %ebp, %ebx
29438 adcl %edi, %ecx
29439 +
29440 +#ifdef CONFIG_PAX_REFCOUNT
29441 + into
29442 +1234:
29443 + _ASM_EXTABLE(1234b, 3f)
29444 +#endif
29445 +
29446 LOCK_PREFIX
29447 cmpxchg8b (%esi)
29448 jne 1b
29449 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29450 CFI_ADJUST_CFA_OFFSET -8
29451 RESTORE ebx
29452 RESTORE ebp
29453 + pax_force_retaddr
29454 ret
29455 4:
29456 cmpl %edx, 4(%esp)
29457 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29458 xorl %ecx, %ecx
29459 addl $1, %ebx
29460 adcl %edx, %ecx
29461 +
29462 +#ifdef CONFIG_PAX_REFCOUNT
29463 + into
29464 +1234:
29465 + _ASM_EXTABLE(1234b, 3f)
29466 +#endif
29467 +
29468 LOCK_PREFIX
29469 cmpxchg8b (%esi)
29470 jne 1b
29471 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29472 movl $1, %eax
29473 3:
29474 RESTORE ebx
29475 + pax_force_retaddr
29476 ret
29477 CFI_ENDPROC
29478 ENDPROC(atomic64_inc_not_zero_cx8)
29479 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29480 index e78b8eee..7e173a8 100644
29481 --- a/arch/x86/lib/checksum_32.S
29482 +++ b/arch/x86/lib/checksum_32.S
29483 @@ -29,7 +29,8 @@
29484 #include <asm/dwarf2.h>
29485 #include <asm/errno.h>
29486 #include <asm/asm.h>
29487 -
29488 +#include <asm/segment.h>
29489 +
29490 /*
29491 * computes a partial checksum, e.g. for TCP/UDP fragments
29492 */
29493 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29494
29495 #define ARGBASE 16
29496 #define FP 12
29497 -
29498 -ENTRY(csum_partial_copy_generic)
29499 +
29500 +ENTRY(csum_partial_copy_generic_to_user)
29501 CFI_STARTPROC
29502 +
29503 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29504 + pushl_cfi %gs
29505 + popl_cfi %es
29506 + jmp csum_partial_copy_generic
29507 +#endif
29508 +
29509 +ENTRY(csum_partial_copy_generic_from_user)
29510 +
29511 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29512 + pushl_cfi %gs
29513 + popl_cfi %ds
29514 +#endif
29515 +
29516 +ENTRY(csum_partial_copy_generic)
29517 subl $4,%esp
29518 CFI_ADJUST_CFA_OFFSET 4
29519 pushl_cfi %edi
29520 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29521 jmp 4f
29522 SRC(1: movw (%esi), %bx )
29523 addl $2, %esi
29524 -DST( movw %bx, (%edi) )
29525 +DST( movw %bx, %es:(%edi) )
29526 addl $2, %edi
29527 addw %bx, %ax
29528 adcl $0, %eax
29529 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29530 SRC(1: movl (%esi), %ebx )
29531 SRC( movl 4(%esi), %edx )
29532 adcl %ebx, %eax
29533 -DST( movl %ebx, (%edi) )
29534 +DST( movl %ebx, %es:(%edi) )
29535 adcl %edx, %eax
29536 -DST( movl %edx, 4(%edi) )
29537 +DST( movl %edx, %es:4(%edi) )
29538
29539 SRC( movl 8(%esi), %ebx )
29540 SRC( movl 12(%esi), %edx )
29541 adcl %ebx, %eax
29542 -DST( movl %ebx, 8(%edi) )
29543 +DST( movl %ebx, %es:8(%edi) )
29544 adcl %edx, %eax
29545 -DST( movl %edx, 12(%edi) )
29546 +DST( movl %edx, %es:12(%edi) )
29547
29548 SRC( movl 16(%esi), %ebx )
29549 SRC( movl 20(%esi), %edx )
29550 adcl %ebx, %eax
29551 -DST( movl %ebx, 16(%edi) )
29552 +DST( movl %ebx, %es:16(%edi) )
29553 adcl %edx, %eax
29554 -DST( movl %edx, 20(%edi) )
29555 +DST( movl %edx, %es:20(%edi) )
29556
29557 SRC( movl 24(%esi), %ebx )
29558 SRC( movl 28(%esi), %edx )
29559 adcl %ebx, %eax
29560 -DST( movl %ebx, 24(%edi) )
29561 +DST( movl %ebx, %es:24(%edi) )
29562 adcl %edx, %eax
29563 -DST( movl %edx, 28(%edi) )
29564 +DST( movl %edx, %es:28(%edi) )
29565
29566 lea 32(%esi), %esi
29567 lea 32(%edi), %edi
29568 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29569 shrl $2, %edx # This clears CF
29570 SRC(3: movl (%esi), %ebx )
29571 adcl %ebx, %eax
29572 -DST( movl %ebx, (%edi) )
29573 +DST( movl %ebx, %es:(%edi) )
29574 lea 4(%esi), %esi
29575 lea 4(%edi), %edi
29576 dec %edx
29577 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29578 jb 5f
29579 SRC( movw (%esi), %cx )
29580 leal 2(%esi), %esi
29581 -DST( movw %cx, (%edi) )
29582 +DST( movw %cx, %es:(%edi) )
29583 leal 2(%edi), %edi
29584 je 6f
29585 shll $16,%ecx
29586 SRC(5: movb (%esi), %cl )
29587 -DST( movb %cl, (%edi) )
29588 +DST( movb %cl, %es:(%edi) )
29589 6: addl %ecx, %eax
29590 adcl $0, %eax
29591 7:
29592 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29593
29594 6001:
29595 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29596 - movl $-EFAULT, (%ebx)
29597 + movl $-EFAULT, %ss:(%ebx)
29598
29599 # zero the complete destination - computing the rest
29600 # is too much work
29601 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29602
29603 6002:
29604 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29605 - movl $-EFAULT,(%ebx)
29606 + movl $-EFAULT,%ss:(%ebx)
29607 jmp 5000b
29608
29609 .previous
29610
29611 + pushl_cfi %ss
29612 + popl_cfi %ds
29613 + pushl_cfi %ss
29614 + popl_cfi %es
29615 popl_cfi %ebx
29616 CFI_RESTORE ebx
29617 popl_cfi %esi
29618 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29619 popl_cfi %ecx # equivalent to addl $4,%esp
29620 ret
29621 CFI_ENDPROC
29622 -ENDPROC(csum_partial_copy_generic)
29623 +ENDPROC(csum_partial_copy_generic_to_user)
29624
29625 #else
29626
29627 /* Version for PentiumII/PPro */
29628
29629 #define ROUND1(x) \
29630 + nop; nop; nop; \
29631 SRC(movl x(%esi), %ebx ) ; \
29632 addl %ebx, %eax ; \
29633 - DST(movl %ebx, x(%edi) ) ;
29634 + DST(movl %ebx, %es:x(%edi)) ;
29635
29636 #define ROUND(x) \
29637 + nop; nop; nop; \
29638 SRC(movl x(%esi), %ebx ) ; \
29639 adcl %ebx, %eax ; \
29640 - DST(movl %ebx, x(%edi) ) ;
29641 + DST(movl %ebx, %es:x(%edi)) ;
29642
29643 #define ARGBASE 12
29644 -
29645 -ENTRY(csum_partial_copy_generic)
29646 +
29647 +ENTRY(csum_partial_copy_generic_to_user)
29648 CFI_STARTPROC
29649 +
29650 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29651 + pushl_cfi %gs
29652 + popl_cfi %es
29653 + jmp csum_partial_copy_generic
29654 +#endif
29655 +
29656 +ENTRY(csum_partial_copy_generic_from_user)
29657 +
29658 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29659 + pushl_cfi %gs
29660 + popl_cfi %ds
29661 +#endif
29662 +
29663 +ENTRY(csum_partial_copy_generic)
29664 pushl_cfi %ebx
29665 CFI_REL_OFFSET ebx, 0
29666 pushl_cfi %edi
29667 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29668 subl %ebx, %edi
29669 lea -1(%esi),%edx
29670 andl $-32,%edx
29671 - lea 3f(%ebx,%ebx), %ebx
29672 + lea 3f(%ebx,%ebx,2), %ebx
29673 testl %esi, %esi
29674 jmp *%ebx
29675 1: addl $64,%esi
29676 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29677 jb 5f
29678 SRC( movw (%esi), %dx )
29679 leal 2(%esi), %esi
29680 -DST( movw %dx, (%edi) )
29681 +DST( movw %dx, %es:(%edi) )
29682 leal 2(%edi), %edi
29683 je 6f
29684 shll $16,%edx
29685 5:
29686 SRC( movb (%esi), %dl )
29687 -DST( movb %dl, (%edi) )
29688 +DST( movb %dl, %es:(%edi) )
29689 6: addl %edx, %eax
29690 adcl $0, %eax
29691 7:
29692 .section .fixup, "ax"
29693 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29694 - movl $-EFAULT, (%ebx)
29695 + movl $-EFAULT, %ss:(%ebx)
29696 # zero the complete destination (computing the rest is too much work)
29697 movl ARGBASE+8(%esp),%edi # dst
29698 movl ARGBASE+12(%esp),%ecx # len
29699 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29700 rep; stosb
29701 jmp 7b
29702 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29703 - movl $-EFAULT, (%ebx)
29704 + movl $-EFAULT, %ss:(%ebx)
29705 jmp 7b
29706 .previous
29707
29708 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29709 + pushl_cfi %ss
29710 + popl_cfi %ds
29711 + pushl_cfi %ss
29712 + popl_cfi %es
29713 +#endif
29714 +
29715 popl_cfi %esi
29716 CFI_RESTORE esi
29717 popl_cfi %edi
29718 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29719 CFI_RESTORE ebx
29720 ret
29721 CFI_ENDPROC
29722 -ENDPROC(csum_partial_copy_generic)
29723 +ENDPROC(csum_partial_copy_generic_to_user)
29724
29725 #undef ROUND
29726 #undef ROUND1
29727 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29728 index f2145cf..cea889d 100644
29729 --- a/arch/x86/lib/clear_page_64.S
29730 +++ b/arch/x86/lib/clear_page_64.S
29731 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29732 movl $4096/8,%ecx
29733 xorl %eax,%eax
29734 rep stosq
29735 + pax_force_retaddr
29736 ret
29737 CFI_ENDPROC
29738 ENDPROC(clear_page_c)
29739 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29740 movl $4096,%ecx
29741 xorl %eax,%eax
29742 rep stosb
29743 + pax_force_retaddr
29744 ret
29745 CFI_ENDPROC
29746 ENDPROC(clear_page_c_e)
29747 @@ -43,6 +45,7 @@ ENTRY(clear_page)
29748 leaq 64(%rdi),%rdi
29749 jnz .Lloop
29750 nop
29751 + pax_force_retaddr
29752 ret
29753 CFI_ENDPROC
29754 .Lclear_page_end:
29755 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
29756
29757 #include <asm/cpufeature.h>
29758
29759 - .section .altinstr_replacement,"ax"
29760 + .section .altinstr_replacement,"a"
29761 1: .byte 0xeb /* jmp <disp8> */
29762 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29763 2: .byte 0xeb /* jmp <disp8> */
29764 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29765 index 40a1725..5d12ac4 100644
29766 --- a/arch/x86/lib/cmpxchg16b_emu.S
29767 +++ b/arch/x86/lib/cmpxchg16b_emu.S
29768 @@ -8,6 +8,7 @@
29769 #include <linux/linkage.h>
29770 #include <asm/dwarf2.h>
29771 #include <asm/percpu.h>
29772 +#include <asm/alternative-asm.h>
29773
29774 .text
29775
29776 @@ -46,12 +47,14 @@ CFI_STARTPROC
29777 CFI_REMEMBER_STATE
29778 popfq_cfi
29779 mov $1, %al
29780 + pax_force_retaddr
29781 ret
29782
29783 CFI_RESTORE_STATE
29784 .Lnot_same:
29785 popfq_cfi
29786 xor %al,%al
29787 + pax_force_retaddr
29788 ret
29789
29790 CFI_ENDPROC
29791 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29792 index 176cca6..e0d658e 100644
29793 --- a/arch/x86/lib/copy_page_64.S
29794 +++ b/arch/x86/lib/copy_page_64.S
29795 @@ -9,6 +9,7 @@ copy_page_rep:
29796 CFI_STARTPROC
29797 movl $4096/8, %ecx
29798 rep movsq
29799 + pax_force_retaddr
29800 ret
29801 CFI_ENDPROC
29802 ENDPROC(copy_page_rep)
29803 @@ -24,8 +25,8 @@ ENTRY(copy_page)
29804 CFI_ADJUST_CFA_OFFSET 2*8
29805 movq %rbx, (%rsp)
29806 CFI_REL_OFFSET rbx, 0
29807 - movq %r12, 1*8(%rsp)
29808 - CFI_REL_OFFSET r12, 1*8
29809 + movq %r13, 1*8(%rsp)
29810 + CFI_REL_OFFSET r13, 1*8
29811
29812 movl $(4096/64)-5, %ecx
29813 .p2align 4
29814 @@ -38,7 +39,7 @@ ENTRY(copy_page)
29815 movq 0x8*4(%rsi), %r9
29816 movq 0x8*5(%rsi), %r10
29817 movq 0x8*6(%rsi), %r11
29818 - movq 0x8*7(%rsi), %r12
29819 + movq 0x8*7(%rsi), %r13
29820
29821 prefetcht0 5*64(%rsi)
29822
29823 @@ -49,7 +50,7 @@ ENTRY(copy_page)
29824 movq %r9, 0x8*4(%rdi)
29825 movq %r10, 0x8*5(%rdi)
29826 movq %r11, 0x8*6(%rdi)
29827 - movq %r12, 0x8*7(%rdi)
29828 + movq %r13, 0x8*7(%rdi)
29829
29830 leaq 64 (%rsi), %rsi
29831 leaq 64 (%rdi), %rdi
29832 @@ -68,7 +69,7 @@ ENTRY(copy_page)
29833 movq 0x8*4(%rsi), %r9
29834 movq 0x8*5(%rsi), %r10
29835 movq 0x8*6(%rsi), %r11
29836 - movq 0x8*7(%rsi), %r12
29837 + movq 0x8*7(%rsi), %r13
29838
29839 movq %rax, 0x8*0(%rdi)
29840 movq %rbx, 0x8*1(%rdi)
29841 @@ -77,7 +78,7 @@ ENTRY(copy_page)
29842 movq %r9, 0x8*4(%rdi)
29843 movq %r10, 0x8*5(%rdi)
29844 movq %r11, 0x8*6(%rdi)
29845 - movq %r12, 0x8*7(%rdi)
29846 + movq %r13, 0x8*7(%rdi)
29847
29848 leaq 64(%rdi), %rdi
29849 leaq 64(%rsi), %rsi
29850 @@ -85,10 +86,11 @@ ENTRY(copy_page)
29851
29852 movq (%rsp), %rbx
29853 CFI_RESTORE rbx
29854 - movq 1*8(%rsp), %r12
29855 - CFI_RESTORE r12
29856 + movq 1*8(%rsp), %r13
29857 + CFI_RESTORE r13
29858 addq $2*8, %rsp
29859 CFI_ADJUST_CFA_OFFSET -2*8
29860 + pax_force_retaddr
29861 ret
29862 .Lcopy_page_end:
29863 CFI_ENDPROC
29864 @@ -99,7 +101,7 @@ ENDPROC(copy_page)
29865
29866 #include <asm/cpufeature.h>
29867
29868 - .section .altinstr_replacement,"ax"
29869 + .section .altinstr_replacement,"a"
29870 1: .byte 0xeb /* jmp <disp8> */
29871 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29872 2:
29873 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29874 index dee945d..a84067b 100644
29875 --- a/arch/x86/lib/copy_user_64.S
29876 +++ b/arch/x86/lib/copy_user_64.S
29877 @@ -18,31 +18,7 @@
29878 #include <asm/alternative-asm.h>
29879 #include <asm/asm.h>
29880 #include <asm/smap.h>
29881 -
29882 -/*
29883 - * By placing feature2 after feature1 in altinstructions section, we logically
29884 - * implement:
29885 - * If CPU has feature2, jmp to alt2 is used
29886 - * else if CPU has feature1, jmp to alt1 is used
29887 - * else jmp to orig is used.
29888 - */
29889 - .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29890 -0:
29891 - .byte 0xe9 /* 32bit jump */
29892 - .long \orig-1f /* by default jump to orig */
29893 -1:
29894 - .section .altinstr_replacement,"ax"
29895 -2: .byte 0xe9 /* near jump with 32bit immediate */
29896 - .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29897 -3: .byte 0xe9 /* near jump with 32bit immediate */
29898 - .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29899 - .previous
29900 -
29901 - .section .altinstructions,"a"
29902 - altinstruction_entry 0b,2b,\feature1,5,5
29903 - altinstruction_entry 0b,3b,\feature2,5,5
29904 - .previous
29905 - .endm
29906 +#include <asm/pgtable.h>
29907
29908 .macro ALIGN_DESTINATION
29909 #ifdef FIX_ALIGNMENT
29910 @@ -70,52 +46,6 @@
29911 #endif
29912 .endm
29913
29914 -/* Standard copy_to_user with segment limit checking */
29915 -ENTRY(_copy_to_user)
29916 - CFI_STARTPROC
29917 - GET_THREAD_INFO(%rax)
29918 - movq %rdi,%rcx
29919 - addq %rdx,%rcx
29920 - jc bad_to_user
29921 - cmpq TI_addr_limit(%rax),%rcx
29922 - ja bad_to_user
29923 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29924 - copy_user_generic_unrolled,copy_user_generic_string, \
29925 - copy_user_enhanced_fast_string
29926 - CFI_ENDPROC
29927 -ENDPROC(_copy_to_user)
29928 -
29929 -/* Standard copy_from_user with segment limit checking */
29930 -ENTRY(_copy_from_user)
29931 - CFI_STARTPROC
29932 - GET_THREAD_INFO(%rax)
29933 - movq %rsi,%rcx
29934 - addq %rdx,%rcx
29935 - jc bad_from_user
29936 - cmpq TI_addr_limit(%rax),%rcx
29937 - ja bad_from_user
29938 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29939 - copy_user_generic_unrolled,copy_user_generic_string, \
29940 - copy_user_enhanced_fast_string
29941 - CFI_ENDPROC
29942 -ENDPROC(_copy_from_user)
29943 -
29944 - .section .fixup,"ax"
29945 - /* must zero dest */
29946 -ENTRY(bad_from_user)
29947 -bad_from_user:
29948 - CFI_STARTPROC
29949 - movl %edx,%ecx
29950 - xorl %eax,%eax
29951 - rep
29952 - stosb
29953 -bad_to_user:
29954 - movl %edx,%eax
29955 - ret
29956 - CFI_ENDPROC
29957 -ENDPROC(bad_from_user)
29958 - .previous
29959 -
29960 /*
29961 * copy_user_generic_unrolled - memory copy with exception handling.
29962 * This version is for CPUs like P4 that don't have efficient micro
29963 @@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29964 */
29965 ENTRY(copy_user_generic_unrolled)
29966 CFI_STARTPROC
29967 + ASM_PAX_OPEN_USERLAND
29968 ASM_STAC
29969 cmpl $8,%edx
29970 jb 20f /* less then 8 bytes, go to byte copy loop */
29971 @@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29972 jnz 21b
29973 23: xor %eax,%eax
29974 ASM_CLAC
29975 + ASM_PAX_CLOSE_USERLAND
29976 + pax_force_retaddr
29977 ret
29978
29979 .section .fixup,"ax"
29980 @@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29981 */
29982 ENTRY(copy_user_generic_string)
29983 CFI_STARTPROC
29984 + ASM_PAX_OPEN_USERLAND
29985 ASM_STAC
29986 cmpl $8,%edx
29987 jb 2f /* less than 8 bytes, go to byte copy loop */
29988 @@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29989 movsb
29990 xorl %eax,%eax
29991 ASM_CLAC
29992 + ASM_PAX_CLOSE_USERLAND
29993 + pax_force_retaddr
29994 ret
29995
29996 .section .fixup,"ax"
29997 @@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29998 */
29999 ENTRY(copy_user_enhanced_fast_string)
30000 CFI_STARTPROC
30001 + ASM_PAX_OPEN_USERLAND
30002 ASM_STAC
30003 movl %edx,%ecx
30004 1: rep
30005 movsb
30006 xorl %eax,%eax
30007 ASM_CLAC
30008 + ASM_PAX_CLOSE_USERLAND
30009 + pax_force_retaddr
30010 ret
30011
30012 .section .fixup,"ax"
30013 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30014 index 6a4f43c..c70fb52 100644
30015 --- a/arch/x86/lib/copy_user_nocache_64.S
30016 +++ b/arch/x86/lib/copy_user_nocache_64.S
30017 @@ -8,6 +8,7 @@
30018
30019 #include <linux/linkage.h>
30020 #include <asm/dwarf2.h>
30021 +#include <asm/alternative-asm.h>
30022
30023 #define FIX_ALIGNMENT 1
30024
30025 @@ -16,6 +17,7 @@
30026 #include <asm/thread_info.h>
30027 #include <asm/asm.h>
30028 #include <asm/smap.h>
30029 +#include <asm/pgtable.h>
30030
30031 .macro ALIGN_DESTINATION
30032 #ifdef FIX_ALIGNMENT
30033 @@ -49,6 +51,16 @@
30034 */
30035 ENTRY(__copy_user_nocache)
30036 CFI_STARTPROC
30037 +
30038 +#ifdef CONFIG_PAX_MEMORY_UDEREF
30039 + mov pax_user_shadow_base,%rcx
30040 + cmp %rcx,%rsi
30041 + jae 1f
30042 + add %rcx,%rsi
30043 +1:
30044 +#endif
30045 +
30046 + ASM_PAX_OPEN_USERLAND
30047 ASM_STAC
30048 cmpl $8,%edx
30049 jb 20f /* less then 8 bytes, go to byte copy loop */
30050 @@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30051 jnz 21b
30052 23: xorl %eax,%eax
30053 ASM_CLAC
30054 + ASM_PAX_CLOSE_USERLAND
30055 sfence
30056 + pax_force_retaddr
30057 ret
30058
30059 .section .fixup,"ax"
30060 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30061 index 2419d5f..fe52d0e 100644
30062 --- a/arch/x86/lib/csum-copy_64.S
30063 +++ b/arch/x86/lib/csum-copy_64.S
30064 @@ -9,6 +9,7 @@
30065 #include <asm/dwarf2.h>
30066 #include <asm/errno.h>
30067 #include <asm/asm.h>
30068 +#include <asm/alternative-asm.h>
30069
30070 /*
30071 * Checksum copy with exception handling.
30072 @@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30073 CFI_ADJUST_CFA_OFFSET 7*8
30074 movq %rbx, 2*8(%rsp)
30075 CFI_REL_OFFSET rbx, 2*8
30076 - movq %r12, 3*8(%rsp)
30077 - CFI_REL_OFFSET r12, 3*8
30078 + movq %r15, 3*8(%rsp)
30079 + CFI_REL_OFFSET r15, 3*8
30080 movq %r14, 4*8(%rsp)
30081 CFI_REL_OFFSET r14, 4*8
30082 movq %r13, 5*8(%rsp)
30083 @@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30084 movl %edx, %ecx
30085
30086 xorl %r9d, %r9d
30087 - movq %rcx, %r12
30088 + movq %rcx, %r15
30089
30090 - shrq $6, %r12
30091 + shrq $6, %r15
30092 jz .Lhandle_tail /* < 64 */
30093
30094 clc
30095
30096 /* main loop. clear in 64 byte blocks */
30097 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30098 - /* r11: temp3, rdx: temp4, r12 loopcnt */
30099 + /* r11: temp3, rdx: temp4, r15 loopcnt */
30100 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30101 .p2align 4
30102 .Lloop:
30103 @@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30104 adcq %r14, %rax
30105 adcq %r13, %rax
30106
30107 - decl %r12d
30108 + decl %r15d
30109
30110 dest
30111 movq %rbx, (%rsi)
30112 @@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30113 .Lende:
30114 movq 2*8(%rsp), %rbx
30115 CFI_RESTORE rbx
30116 - movq 3*8(%rsp), %r12
30117 - CFI_RESTORE r12
30118 + movq 3*8(%rsp), %r15
30119 + CFI_RESTORE r15
30120 movq 4*8(%rsp), %r14
30121 CFI_RESTORE r14
30122 movq 5*8(%rsp), %r13
30123 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30124 CFI_RESTORE rbp
30125 addq $7*8, %rsp
30126 CFI_ADJUST_CFA_OFFSET -7*8
30127 + pax_force_retaddr
30128 ret
30129 CFI_RESTORE_STATE
30130
30131 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30132 index 1318f75..44c30fd 100644
30133 --- a/arch/x86/lib/csum-wrappers_64.c
30134 +++ b/arch/x86/lib/csum-wrappers_64.c
30135 @@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30136 len -= 2;
30137 }
30138 }
30139 + pax_open_userland();
30140 stac();
30141 - isum = csum_partial_copy_generic((__force const void *)src,
30142 + isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30143 dst, len, isum, errp, NULL);
30144 clac();
30145 + pax_close_userland();
30146 if (unlikely(*errp))
30147 goto out_err;
30148
30149 @@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30150 }
30151
30152 *errp = 0;
30153 + pax_open_userland();
30154 stac();
30155 - ret = csum_partial_copy_generic(src, (void __force *)dst,
30156 + ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30157 len, isum, NULL, errp);
30158 clac();
30159 + pax_close_userland();
30160 return ret;
30161 }
30162 EXPORT_SYMBOL(csum_partial_copy_to_user);
30163 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30164 index a451235..1daa956 100644
30165 --- a/arch/x86/lib/getuser.S
30166 +++ b/arch/x86/lib/getuser.S
30167 @@ -33,17 +33,40 @@
30168 #include <asm/thread_info.h>
30169 #include <asm/asm.h>
30170 #include <asm/smap.h>
30171 +#include <asm/segment.h>
30172 +#include <asm/pgtable.h>
30173 +#include <asm/alternative-asm.h>
30174 +
30175 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30176 +#define __copyuser_seg gs;
30177 +#else
30178 +#define __copyuser_seg
30179 +#endif
30180
30181 .text
30182 ENTRY(__get_user_1)
30183 CFI_STARTPROC
30184 +
30185 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30186 GET_THREAD_INFO(%_ASM_DX)
30187 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30188 jae bad_get_user
30189 ASM_STAC
30190 -1: movzbl (%_ASM_AX),%edx
30191 +
30192 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30193 + mov pax_user_shadow_base,%_ASM_DX
30194 + cmp %_ASM_DX,%_ASM_AX
30195 + jae 1234f
30196 + add %_ASM_DX,%_ASM_AX
30197 +1234:
30198 +#endif
30199 +
30200 +#endif
30201 +
30202 +1: __copyuser_seg movzbl (%_ASM_AX),%edx
30203 xor %eax,%eax
30204 ASM_CLAC
30205 + pax_force_retaddr
30206 ret
30207 CFI_ENDPROC
30208 ENDPROC(__get_user_1)
30209 @@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30210 ENTRY(__get_user_2)
30211 CFI_STARTPROC
30212 add $1,%_ASM_AX
30213 +
30214 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30215 jc bad_get_user
30216 GET_THREAD_INFO(%_ASM_DX)
30217 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30218 jae bad_get_user
30219 ASM_STAC
30220 -2: movzwl -1(%_ASM_AX),%edx
30221 +
30222 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30223 + mov pax_user_shadow_base,%_ASM_DX
30224 + cmp %_ASM_DX,%_ASM_AX
30225 + jae 1234f
30226 + add %_ASM_DX,%_ASM_AX
30227 +1234:
30228 +#endif
30229 +
30230 +#endif
30231 +
30232 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30233 xor %eax,%eax
30234 ASM_CLAC
30235 + pax_force_retaddr
30236 ret
30237 CFI_ENDPROC
30238 ENDPROC(__get_user_2)
30239 @@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30240 ENTRY(__get_user_4)
30241 CFI_STARTPROC
30242 add $3,%_ASM_AX
30243 +
30244 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30245 jc bad_get_user
30246 GET_THREAD_INFO(%_ASM_DX)
30247 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30248 jae bad_get_user
30249 ASM_STAC
30250 -3: movl -3(%_ASM_AX),%edx
30251 +
30252 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30253 + mov pax_user_shadow_base,%_ASM_DX
30254 + cmp %_ASM_DX,%_ASM_AX
30255 + jae 1234f
30256 + add %_ASM_DX,%_ASM_AX
30257 +1234:
30258 +#endif
30259 +
30260 +#endif
30261 +
30262 +3: __copyuser_seg movl -3(%_ASM_AX),%edx
30263 xor %eax,%eax
30264 ASM_CLAC
30265 + pax_force_retaddr
30266 ret
30267 CFI_ENDPROC
30268 ENDPROC(__get_user_4)
30269 @@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30270 GET_THREAD_INFO(%_ASM_DX)
30271 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30272 jae bad_get_user
30273 +
30274 +#ifdef CONFIG_PAX_MEMORY_UDEREF
30275 + mov pax_user_shadow_base,%_ASM_DX
30276 + cmp %_ASM_DX,%_ASM_AX
30277 + jae 1234f
30278 + add %_ASM_DX,%_ASM_AX
30279 +1234:
30280 +#endif
30281 +
30282 ASM_STAC
30283 4: movq -7(%_ASM_AX),%rdx
30284 xor %eax,%eax
30285 ASM_CLAC
30286 + pax_force_retaddr
30287 ret
30288 #else
30289 add $7,%_ASM_AX
30290 @@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30291 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30292 jae bad_get_user_8
30293 ASM_STAC
30294 -4: movl -7(%_ASM_AX),%edx
30295 -5: movl -3(%_ASM_AX),%ecx
30296 +4: __copyuser_seg movl -7(%_ASM_AX),%edx
30297 +5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30298 xor %eax,%eax
30299 ASM_CLAC
30300 + pax_force_retaddr
30301 ret
30302 #endif
30303 CFI_ENDPROC
30304 @@ -113,6 +175,7 @@ bad_get_user:
30305 xor %edx,%edx
30306 mov $(-EFAULT),%_ASM_AX
30307 ASM_CLAC
30308 + pax_force_retaddr
30309 ret
30310 CFI_ENDPROC
30311 END(bad_get_user)
30312 @@ -124,6 +187,7 @@ bad_get_user_8:
30313 xor %ecx,%ecx
30314 mov $(-EFAULT),%_ASM_AX
30315 ASM_CLAC
30316 + pax_force_retaddr
30317 ret
30318 CFI_ENDPROC
30319 END(bad_get_user_8)
30320 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30321 index 54fcffe..7be149e 100644
30322 --- a/arch/x86/lib/insn.c
30323 +++ b/arch/x86/lib/insn.c
30324 @@ -20,8 +20,10 @@
30325
30326 #ifdef __KERNEL__
30327 #include <linux/string.h>
30328 +#include <asm/pgtable_types.h>
30329 #else
30330 #include <string.h>
30331 +#define ktla_ktva(addr) addr
30332 #endif
30333 #include <asm/inat.h>
30334 #include <asm/insn.h>
30335 @@ -53,8 +55,8 @@
30336 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
30337 {
30338 memset(insn, 0, sizeof(*insn));
30339 - insn->kaddr = kaddr;
30340 - insn->next_byte = kaddr;
30341 + insn->kaddr = ktla_ktva(kaddr);
30342 + insn->next_byte = ktla_ktva(kaddr);
30343 insn->x86_64 = x86_64 ? 1 : 0;
30344 insn->opnd_bytes = 4;
30345 if (x86_64)
30346 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30347 index 05a95e7..326f2fa 100644
30348 --- a/arch/x86/lib/iomap_copy_64.S
30349 +++ b/arch/x86/lib/iomap_copy_64.S
30350 @@ -17,6 +17,7 @@
30351
30352 #include <linux/linkage.h>
30353 #include <asm/dwarf2.h>
30354 +#include <asm/alternative-asm.h>
30355
30356 /*
30357 * override generic version in lib/iomap_copy.c
30358 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30359 CFI_STARTPROC
30360 movl %edx,%ecx
30361 rep movsd
30362 + pax_force_retaddr
30363 ret
30364 CFI_ENDPROC
30365 ENDPROC(__iowrite32_copy)
30366 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30367 index 56313a3..0db417e 100644
30368 --- a/arch/x86/lib/memcpy_64.S
30369 +++ b/arch/x86/lib/memcpy_64.S
30370 @@ -24,7 +24,7 @@
30371 * This gets patched over the unrolled variant (below) via the
30372 * alternative instructions framework:
30373 */
30374 - .section .altinstr_replacement, "ax", @progbits
30375 + .section .altinstr_replacement, "a", @progbits
30376 .Lmemcpy_c:
30377 movq %rdi, %rax
30378 movq %rdx, %rcx
30379 @@ -33,6 +33,7 @@
30380 rep movsq
30381 movl %edx, %ecx
30382 rep movsb
30383 + pax_force_retaddr
30384 ret
30385 .Lmemcpy_e:
30386 .previous
30387 @@ -44,11 +45,12 @@
30388 * This gets patched over the unrolled variant (below) via the
30389 * alternative instructions framework:
30390 */
30391 - .section .altinstr_replacement, "ax", @progbits
30392 + .section .altinstr_replacement, "a", @progbits
30393 .Lmemcpy_c_e:
30394 movq %rdi, %rax
30395 movq %rdx, %rcx
30396 rep movsb
30397 + pax_force_retaddr
30398 ret
30399 .Lmemcpy_e_e:
30400 .previous
30401 @@ -136,6 +138,7 @@ ENTRY(memcpy)
30402 movq %r9, 1*8(%rdi)
30403 movq %r10, -2*8(%rdi, %rdx)
30404 movq %r11, -1*8(%rdi, %rdx)
30405 + pax_force_retaddr
30406 retq
30407 .p2align 4
30408 .Lless_16bytes:
30409 @@ -148,6 +151,7 @@ ENTRY(memcpy)
30410 movq -1*8(%rsi, %rdx), %r9
30411 movq %r8, 0*8(%rdi)
30412 movq %r9, -1*8(%rdi, %rdx)
30413 + pax_force_retaddr
30414 retq
30415 .p2align 4
30416 .Lless_8bytes:
30417 @@ -161,6 +165,7 @@ ENTRY(memcpy)
30418 movl -4(%rsi, %rdx), %r8d
30419 movl %ecx, (%rdi)
30420 movl %r8d, -4(%rdi, %rdx)
30421 + pax_force_retaddr
30422 retq
30423 .p2align 4
30424 .Lless_3bytes:
30425 @@ -179,6 +184,7 @@ ENTRY(memcpy)
30426 movb %cl, (%rdi)
30427
30428 .Lend:
30429 + pax_force_retaddr
30430 retq
30431 CFI_ENDPROC
30432 ENDPROC(memcpy)
30433 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30434 index 65268a6..dd1de11 100644
30435 --- a/arch/x86/lib/memmove_64.S
30436 +++ b/arch/x86/lib/memmove_64.S
30437 @@ -202,14 +202,16 @@ ENTRY(memmove)
30438 movb (%rsi), %r11b
30439 movb %r11b, (%rdi)
30440 13:
30441 + pax_force_retaddr
30442 retq
30443 CFI_ENDPROC
30444
30445 - .section .altinstr_replacement,"ax"
30446 + .section .altinstr_replacement,"a"
30447 .Lmemmove_begin_forward_efs:
30448 /* Forward moving data. */
30449 movq %rdx, %rcx
30450 rep movsb
30451 + pax_force_retaddr
30452 retq
30453 .Lmemmove_end_forward_efs:
30454 .previous
30455 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30456 index 2dcb380..2eb79fe 100644
30457 --- a/arch/x86/lib/memset_64.S
30458 +++ b/arch/x86/lib/memset_64.S
30459 @@ -16,7 +16,7 @@
30460 *
30461 * rax original destination
30462 */
30463 - .section .altinstr_replacement, "ax", @progbits
30464 + .section .altinstr_replacement, "a", @progbits
30465 .Lmemset_c:
30466 movq %rdi,%r9
30467 movq %rdx,%rcx
30468 @@ -30,6 +30,7 @@
30469 movl %edx,%ecx
30470 rep stosb
30471 movq %r9,%rax
30472 + pax_force_retaddr
30473 ret
30474 .Lmemset_e:
30475 .previous
30476 @@ -45,13 +46,14 @@
30477 *
30478 * rax original destination
30479 */
30480 - .section .altinstr_replacement, "ax", @progbits
30481 + .section .altinstr_replacement, "a", @progbits
30482 .Lmemset_c_e:
30483 movq %rdi,%r9
30484 movb %sil,%al
30485 movq %rdx,%rcx
30486 rep stosb
30487 movq %r9,%rax
30488 + pax_force_retaddr
30489 ret
30490 .Lmemset_e_e:
30491 .previous
30492 @@ -118,6 +120,7 @@ ENTRY(__memset)
30493
30494 .Lende:
30495 movq %r10,%rax
30496 + pax_force_retaddr
30497 ret
30498
30499 CFI_RESTORE_STATE
30500 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30501 index c9f2d9b..e7fd2c0 100644
30502 --- a/arch/x86/lib/mmx_32.c
30503 +++ b/arch/x86/lib/mmx_32.c
30504 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30505 {
30506 void *p;
30507 int i;
30508 + unsigned long cr0;
30509
30510 if (unlikely(in_interrupt()))
30511 return __memcpy(to, from, len);
30512 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30513 kernel_fpu_begin();
30514
30515 __asm__ __volatile__ (
30516 - "1: prefetch (%0)\n" /* This set is 28 bytes */
30517 - " prefetch 64(%0)\n"
30518 - " prefetch 128(%0)\n"
30519 - " prefetch 192(%0)\n"
30520 - " prefetch 256(%0)\n"
30521 + "1: prefetch (%1)\n" /* This set is 28 bytes */
30522 + " prefetch 64(%1)\n"
30523 + " prefetch 128(%1)\n"
30524 + " prefetch 192(%1)\n"
30525 + " prefetch 256(%1)\n"
30526 "2: \n"
30527 ".section .fixup, \"ax\"\n"
30528 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30529 + "3: \n"
30530 +
30531 +#ifdef CONFIG_PAX_KERNEXEC
30532 + " movl %%cr0, %0\n"
30533 + " movl %0, %%eax\n"
30534 + " andl $0xFFFEFFFF, %%eax\n"
30535 + " movl %%eax, %%cr0\n"
30536 +#endif
30537 +
30538 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30539 +
30540 +#ifdef CONFIG_PAX_KERNEXEC
30541 + " movl %0, %%cr0\n"
30542 +#endif
30543 +
30544 " jmp 2b\n"
30545 ".previous\n"
30546 _ASM_EXTABLE(1b, 3b)
30547 - : : "r" (from));
30548 + : "=&r" (cr0) : "r" (from) : "ax");
30549
30550 for ( ; i > 5; i--) {
30551 __asm__ __volatile__ (
30552 - "1: prefetch 320(%0)\n"
30553 - "2: movq (%0), %%mm0\n"
30554 - " movq 8(%0), %%mm1\n"
30555 - " movq 16(%0), %%mm2\n"
30556 - " movq 24(%0), %%mm3\n"
30557 - " movq %%mm0, (%1)\n"
30558 - " movq %%mm1, 8(%1)\n"
30559 - " movq %%mm2, 16(%1)\n"
30560 - " movq %%mm3, 24(%1)\n"
30561 - " movq 32(%0), %%mm0\n"
30562 - " movq 40(%0), %%mm1\n"
30563 - " movq 48(%0), %%mm2\n"
30564 - " movq 56(%0), %%mm3\n"
30565 - " movq %%mm0, 32(%1)\n"
30566 - " movq %%mm1, 40(%1)\n"
30567 - " movq %%mm2, 48(%1)\n"
30568 - " movq %%mm3, 56(%1)\n"
30569 + "1: prefetch 320(%1)\n"
30570 + "2: movq (%1), %%mm0\n"
30571 + " movq 8(%1), %%mm1\n"
30572 + " movq 16(%1), %%mm2\n"
30573 + " movq 24(%1), %%mm3\n"
30574 + " movq %%mm0, (%2)\n"
30575 + " movq %%mm1, 8(%2)\n"
30576 + " movq %%mm2, 16(%2)\n"
30577 + " movq %%mm3, 24(%2)\n"
30578 + " movq 32(%1), %%mm0\n"
30579 + " movq 40(%1), %%mm1\n"
30580 + " movq 48(%1), %%mm2\n"
30581 + " movq 56(%1), %%mm3\n"
30582 + " movq %%mm0, 32(%2)\n"
30583 + " movq %%mm1, 40(%2)\n"
30584 + " movq %%mm2, 48(%2)\n"
30585 + " movq %%mm3, 56(%2)\n"
30586 ".section .fixup, \"ax\"\n"
30587 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30588 + "3:\n"
30589 +
30590 +#ifdef CONFIG_PAX_KERNEXEC
30591 + " movl %%cr0, %0\n"
30592 + " movl %0, %%eax\n"
30593 + " andl $0xFFFEFFFF, %%eax\n"
30594 + " movl %%eax, %%cr0\n"
30595 +#endif
30596 +
30597 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30598 +
30599 +#ifdef CONFIG_PAX_KERNEXEC
30600 + " movl %0, %%cr0\n"
30601 +#endif
30602 +
30603 " jmp 2b\n"
30604 ".previous\n"
30605 _ASM_EXTABLE(1b, 3b)
30606 - : : "r" (from), "r" (to) : "memory");
30607 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30608
30609 from += 64;
30610 to += 64;
30611 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30612 static void fast_copy_page(void *to, void *from)
30613 {
30614 int i;
30615 + unsigned long cr0;
30616
30617 kernel_fpu_begin();
30618
30619 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30620 * but that is for later. -AV
30621 */
30622 __asm__ __volatile__(
30623 - "1: prefetch (%0)\n"
30624 - " prefetch 64(%0)\n"
30625 - " prefetch 128(%0)\n"
30626 - " prefetch 192(%0)\n"
30627 - " prefetch 256(%0)\n"
30628 + "1: prefetch (%1)\n"
30629 + " prefetch 64(%1)\n"
30630 + " prefetch 128(%1)\n"
30631 + " prefetch 192(%1)\n"
30632 + " prefetch 256(%1)\n"
30633 "2: \n"
30634 ".section .fixup, \"ax\"\n"
30635 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30636 + "3: \n"
30637 +
30638 +#ifdef CONFIG_PAX_KERNEXEC
30639 + " movl %%cr0, %0\n"
30640 + " movl %0, %%eax\n"
30641 + " andl $0xFFFEFFFF, %%eax\n"
30642 + " movl %%eax, %%cr0\n"
30643 +#endif
30644 +
30645 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30646 +
30647 +#ifdef CONFIG_PAX_KERNEXEC
30648 + " movl %0, %%cr0\n"
30649 +#endif
30650 +
30651 " jmp 2b\n"
30652 ".previous\n"
30653 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30654 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30655
30656 for (i = 0; i < (4096-320)/64; i++) {
30657 __asm__ __volatile__ (
30658 - "1: prefetch 320(%0)\n"
30659 - "2: movq (%0), %%mm0\n"
30660 - " movntq %%mm0, (%1)\n"
30661 - " movq 8(%0), %%mm1\n"
30662 - " movntq %%mm1, 8(%1)\n"
30663 - " movq 16(%0), %%mm2\n"
30664 - " movntq %%mm2, 16(%1)\n"
30665 - " movq 24(%0), %%mm3\n"
30666 - " movntq %%mm3, 24(%1)\n"
30667 - " movq 32(%0), %%mm4\n"
30668 - " movntq %%mm4, 32(%1)\n"
30669 - " movq 40(%0), %%mm5\n"
30670 - " movntq %%mm5, 40(%1)\n"
30671 - " movq 48(%0), %%mm6\n"
30672 - " movntq %%mm6, 48(%1)\n"
30673 - " movq 56(%0), %%mm7\n"
30674 - " movntq %%mm7, 56(%1)\n"
30675 + "1: prefetch 320(%1)\n"
30676 + "2: movq (%1), %%mm0\n"
30677 + " movntq %%mm0, (%2)\n"
30678 + " movq 8(%1), %%mm1\n"
30679 + " movntq %%mm1, 8(%2)\n"
30680 + " movq 16(%1), %%mm2\n"
30681 + " movntq %%mm2, 16(%2)\n"
30682 + " movq 24(%1), %%mm3\n"
30683 + " movntq %%mm3, 24(%2)\n"
30684 + " movq 32(%1), %%mm4\n"
30685 + " movntq %%mm4, 32(%2)\n"
30686 + " movq 40(%1), %%mm5\n"
30687 + " movntq %%mm5, 40(%2)\n"
30688 + " movq 48(%1), %%mm6\n"
30689 + " movntq %%mm6, 48(%2)\n"
30690 + " movq 56(%1), %%mm7\n"
30691 + " movntq %%mm7, 56(%2)\n"
30692 ".section .fixup, \"ax\"\n"
30693 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30694 + "3:\n"
30695 +
30696 +#ifdef CONFIG_PAX_KERNEXEC
30697 + " movl %%cr0, %0\n"
30698 + " movl %0, %%eax\n"
30699 + " andl $0xFFFEFFFF, %%eax\n"
30700 + " movl %%eax, %%cr0\n"
30701 +#endif
30702 +
30703 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30704 +
30705 +#ifdef CONFIG_PAX_KERNEXEC
30706 + " movl %0, %%cr0\n"
30707 +#endif
30708 +
30709 " jmp 2b\n"
30710 ".previous\n"
30711 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30712 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30713
30714 from += 64;
30715 to += 64;
30716 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30717 static void fast_copy_page(void *to, void *from)
30718 {
30719 int i;
30720 + unsigned long cr0;
30721
30722 kernel_fpu_begin();
30723
30724 __asm__ __volatile__ (
30725 - "1: prefetch (%0)\n"
30726 - " prefetch 64(%0)\n"
30727 - " prefetch 128(%0)\n"
30728 - " prefetch 192(%0)\n"
30729 - " prefetch 256(%0)\n"
30730 + "1: prefetch (%1)\n"
30731 + " prefetch 64(%1)\n"
30732 + " prefetch 128(%1)\n"
30733 + " prefetch 192(%1)\n"
30734 + " prefetch 256(%1)\n"
30735 "2: \n"
30736 ".section .fixup, \"ax\"\n"
30737 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30738 + "3: \n"
30739 +
30740 +#ifdef CONFIG_PAX_KERNEXEC
30741 + " movl %%cr0, %0\n"
30742 + " movl %0, %%eax\n"
30743 + " andl $0xFFFEFFFF, %%eax\n"
30744 + " movl %%eax, %%cr0\n"
30745 +#endif
30746 +
30747 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30748 +
30749 +#ifdef CONFIG_PAX_KERNEXEC
30750 + " movl %0, %%cr0\n"
30751 +#endif
30752 +
30753 " jmp 2b\n"
30754 ".previous\n"
30755 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30756 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30757
30758 for (i = 0; i < 4096/64; i++) {
30759 __asm__ __volatile__ (
30760 - "1: prefetch 320(%0)\n"
30761 - "2: movq (%0), %%mm0\n"
30762 - " movq 8(%0), %%mm1\n"
30763 - " movq 16(%0), %%mm2\n"
30764 - " movq 24(%0), %%mm3\n"
30765 - " movq %%mm0, (%1)\n"
30766 - " movq %%mm1, 8(%1)\n"
30767 - " movq %%mm2, 16(%1)\n"
30768 - " movq %%mm3, 24(%1)\n"
30769 - " movq 32(%0), %%mm0\n"
30770 - " movq 40(%0), %%mm1\n"
30771 - " movq 48(%0), %%mm2\n"
30772 - " movq 56(%0), %%mm3\n"
30773 - " movq %%mm0, 32(%1)\n"
30774 - " movq %%mm1, 40(%1)\n"
30775 - " movq %%mm2, 48(%1)\n"
30776 - " movq %%mm3, 56(%1)\n"
30777 + "1: prefetch 320(%1)\n"
30778 + "2: movq (%1), %%mm0\n"
30779 + " movq 8(%1), %%mm1\n"
30780 + " movq 16(%1), %%mm2\n"
30781 + " movq 24(%1), %%mm3\n"
30782 + " movq %%mm0, (%2)\n"
30783 + " movq %%mm1, 8(%2)\n"
30784 + " movq %%mm2, 16(%2)\n"
30785 + " movq %%mm3, 24(%2)\n"
30786 + " movq 32(%1), %%mm0\n"
30787 + " movq 40(%1), %%mm1\n"
30788 + " movq 48(%1), %%mm2\n"
30789 + " movq 56(%1), %%mm3\n"
30790 + " movq %%mm0, 32(%2)\n"
30791 + " movq %%mm1, 40(%2)\n"
30792 + " movq %%mm2, 48(%2)\n"
30793 + " movq %%mm3, 56(%2)\n"
30794 ".section .fixup, \"ax\"\n"
30795 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30796 + "3:\n"
30797 +
30798 +#ifdef CONFIG_PAX_KERNEXEC
30799 + " movl %%cr0, %0\n"
30800 + " movl %0, %%eax\n"
30801 + " andl $0xFFFEFFFF, %%eax\n"
30802 + " movl %%eax, %%cr0\n"
30803 +#endif
30804 +
30805 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30806 +
30807 +#ifdef CONFIG_PAX_KERNEXEC
30808 + " movl %0, %%cr0\n"
30809 +#endif
30810 +
30811 " jmp 2b\n"
30812 ".previous\n"
30813 _ASM_EXTABLE(1b, 3b)
30814 - : : "r" (from), "r" (to) : "memory");
30815 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30816
30817 from += 64;
30818 to += 64;
30819 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30820 index f6d13ee..d789440 100644
30821 --- a/arch/x86/lib/msr-reg.S
30822 +++ b/arch/x86/lib/msr-reg.S
30823 @@ -3,6 +3,7 @@
30824 #include <asm/dwarf2.h>
30825 #include <asm/asm.h>
30826 #include <asm/msr.h>
30827 +#include <asm/alternative-asm.h>
30828
30829 #ifdef CONFIG_X86_64
30830 /*
30831 @@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30832 movl %edi, 28(%r10)
30833 popq_cfi %rbp
30834 popq_cfi %rbx
30835 + pax_force_retaddr
30836 ret
30837 3:
30838 CFI_RESTORE_STATE
30839 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30840 index fc6ba17..d4d989d 100644
30841 --- a/arch/x86/lib/putuser.S
30842 +++ b/arch/x86/lib/putuser.S
30843 @@ -16,7 +16,9 @@
30844 #include <asm/errno.h>
30845 #include <asm/asm.h>
30846 #include <asm/smap.h>
30847 -
30848 +#include <asm/segment.h>
30849 +#include <asm/pgtable.h>
30850 +#include <asm/alternative-asm.h>
30851
30852 /*
30853 * __put_user_X
30854 @@ -30,57 +32,125 @@
30855 * as they get called from within inline assembly.
30856 */
30857
30858 -#define ENTER CFI_STARTPROC ; \
30859 - GET_THREAD_INFO(%_ASM_BX)
30860 -#define EXIT ASM_CLAC ; \
30861 - ret ; \
30862 +#define ENTER CFI_STARTPROC
30863 +#define EXIT ASM_CLAC ; \
30864 + pax_force_retaddr ; \
30865 + ret ; \
30866 CFI_ENDPROC
30867
30868 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30869 +#define _DEST %_ASM_CX,%_ASM_BX
30870 +#else
30871 +#define _DEST %_ASM_CX
30872 +#endif
30873 +
30874 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30875 +#define __copyuser_seg gs;
30876 +#else
30877 +#define __copyuser_seg
30878 +#endif
30879 +
30880 .text
30881 ENTRY(__put_user_1)
30882 ENTER
30883 +
30884 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30885 + GET_THREAD_INFO(%_ASM_BX)
30886 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30887 jae bad_put_user
30888 ASM_STAC
30889 -1: movb %al,(%_ASM_CX)
30890 +
30891 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30892 + mov pax_user_shadow_base,%_ASM_BX
30893 + cmp %_ASM_BX,%_ASM_CX
30894 + jb 1234f
30895 + xor %ebx,%ebx
30896 +1234:
30897 +#endif
30898 +
30899 +#endif
30900 +
30901 +1: __copyuser_seg movb %al,(_DEST)
30902 xor %eax,%eax
30903 EXIT
30904 ENDPROC(__put_user_1)
30905
30906 ENTRY(__put_user_2)
30907 ENTER
30908 +
30909 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30910 + GET_THREAD_INFO(%_ASM_BX)
30911 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30912 sub $1,%_ASM_BX
30913 cmp %_ASM_BX,%_ASM_CX
30914 jae bad_put_user
30915 ASM_STAC
30916 -2: movw %ax,(%_ASM_CX)
30917 +
30918 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30919 + mov pax_user_shadow_base,%_ASM_BX
30920 + cmp %_ASM_BX,%_ASM_CX
30921 + jb 1234f
30922 + xor %ebx,%ebx
30923 +1234:
30924 +#endif
30925 +
30926 +#endif
30927 +
30928 +2: __copyuser_seg movw %ax,(_DEST)
30929 xor %eax,%eax
30930 EXIT
30931 ENDPROC(__put_user_2)
30932
30933 ENTRY(__put_user_4)
30934 ENTER
30935 +
30936 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30937 + GET_THREAD_INFO(%_ASM_BX)
30938 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30939 sub $3,%_ASM_BX
30940 cmp %_ASM_BX,%_ASM_CX
30941 jae bad_put_user
30942 ASM_STAC
30943 -3: movl %eax,(%_ASM_CX)
30944 +
30945 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30946 + mov pax_user_shadow_base,%_ASM_BX
30947 + cmp %_ASM_BX,%_ASM_CX
30948 + jb 1234f
30949 + xor %ebx,%ebx
30950 +1234:
30951 +#endif
30952 +
30953 +#endif
30954 +
30955 +3: __copyuser_seg movl %eax,(_DEST)
30956 xor %eax,%eax
30957 EXIT
30958 ENDPROC(__put_user_4)
30959
30960 ENTRY(__put_user_8)
30961 ENTER
30962 +
30963 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30964 + GET_THREAD_INFO(%_ASM_BX)
30965 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30966 sub $7,%_ASM_BX
30967 cmp %_ASM_BX,%_ASM_CX
30968 jae bad_put_user
30969 ASM_STAC
30970 -4: mov %_ASM_AX,(%_ASM_CX)
30971 +
30972 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30973 + mov pax_user_shadow_base,%_ASM_BX
30974 + cmp %_ASM_BX,%_ASM_CX
30975 + jb 1234f
30976 + xor %ebx,%ebx
30977 +1234:
30978 +#endif
30979 +
30980 +#endif
30981 +
30982 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
30983 #ifdef CONFIG_X86_32
30984 -5: movl %edx,4(%_ASM_CX)
30985 +5: __copyuser_seg movl %edx,4(_DEST)
30986 #endif
30987 xor %eax,%eax
30988 EXIT
30989 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30990 index 5dff5f0..cadebf4 100644
30991 --- a/arch/x86/lib/rwsem.S
30992 +++ b/arch/x86/lib/rwsem.S
30993 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30994 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30995 CFI_RESTORE __ASM_REG(dx)
30996 restore_common_regs
30997 + pax_force_retaddr
30998 ret
30999 CFI_ENDPROC
31000 ENDPROC(call_rwsem_down_read_failed)
31001 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
31002 movq %rax,%rdi
31003 call rwsem_down_write_failed
31004 restore_common_regs
31005 + pax_force_retaddr
31006 ret
31007 CFI_ENDPROC
31008 ENDPROC(call_rwsem_down_write_failed)
31009 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31010 movq %rax,%rdi
31011 call rwsem_wake
31012 restore_common_regs
31013 -1: ret
31014 +1: pax_force_retaddr
31015 + ret
31016 CFI_ENDPROC
31017 ENDPROC(call_rwsem_wake)
31018
31019 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31020 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31021 CFI_RESTORE __ASM_REG(dx)
31022 restore_common_regs
31023 + pax_force_retaddr
31024 ret
31025 CFI_ENDPROC
31026 ENDPROC(call_rwsem_downgrade_wake)
31027 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31028 index b30b5eb..2b57052 100644
31029 --- a/arch/x86/lib/thunk_64.S
31030 +++ b/arch/x86/lib/thunk_64.S
31031 @@ -9,6 +9,7 @@
31032 #include <asm/dwarf2.h>
31033 #include <asm/calling.h>
31034 #include <asm/asm.h>
31035 +#include <asm/alternative-asm.h>
31036
31037 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31038 .macro THUNK name, func, put_ret_addr_in_rdi=0
31039 @@ -16,11 +17,11 @@
31040 \name:
31041 CFI_STARTPROC
31042
31043 - /* this one pushes 9 elems, the next one would be %rIP */
31044 - SAVE_ARGS
31045 + /* this one pushes 15+1 elems, the next one would be %rIP */
31046 + SAVE_ARGS 8
31047
31048 .if \put_ret_addr_in_rdi
31049 - movq_cfi_restore 9*8, rdi
31050 + movq_cfi_restore RIP, rdi
31051 .endif
31052
31053 call \func
31054 @@ -47,9 +48,10 @@
31055
31056 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31057 CFI_STARTPROC
31058 - SAVE_ARGS
31059 + SAVE_ARGS 8
31060 restore:
31061 - RESTORE_ARGS
31062 + RESTORE_ARGS 1,8
31063 + pax_force_retaddr
31064 ret
31065 CFI_ENDPROC
31066 _ASM_NOKPROBE(restore)
31067 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31068 index e2f5e21..4b22130 100644
31069 --- a/arch/x86/lib/usercopy_32.c
31070 +++ b/arch/x86/lib/usercopy_32.c
31071 @@ -42,11 +42,13 @@ do { \
31072 int __d0; \
31073 might_fault(); \
31074 __asm__ __volatile__( \
31075 + __COPYUSER_SET_ES \
31076 ASM_STAC "\n" \
31077 "0: rep; stosl\n" \
31078 " movl %2,%0\n" \
31079 "1: rep; stosb\n" \
31080 "2: " ASM_CLAC "\n" \
31081 + __COPYUSER_RESTORE_ES \
31082 ".section .fixup,\"ax\"\n" \
31083 "3: lea 0(%2,%0,4),%0\n" \
31084 " jmp 2b\n" \
31085 @@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31086
31087 #ifdef CONFIG_X86_INTEL_USERCOPY
31088 static unsigned long
31089 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
31090 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31091 {
31092 int d0, d1;
31093 __asm__ __volatile__(
31094 @@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31095 " .align 2,0x90\n"
31096 "3: movl 0(%4), %%eax\n"
31097 "4: movl 4(%4), %%edx\n"
31098 - "5: movl %%eax, 0(%3)\n"
31099 - "6: movl %%edx, 4(%3)\n"
31100 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31101 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31102 "7: movl 8(%4), %%eax\n"
31103 "8: movl 12(%4),%%edx\n"
31104 - "9: movl %%eax, 8(%3)\n"
31105 - "10: movl %%edx, 12(%3)\n"
31106 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31107 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31108 "11: movl 16(%4), %%eax\n"
31109 "12: movl 20(%4), %%edx\n"
31110 - "13: movl %%eax, 16(%3)\n"
31111 - "14: movl %%edx, 20(%3)\n"
31112 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31113 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31114 "15: movl 24(%4), %%eax\n"
31115 "16: movl 28(%4), %%edx\n"
31116 - "17: movl %%eax, 24(%3)\n"
31117 - "18: movl %%edx, 28(%3)\n"
31118 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31119 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31120 "19: movl 32(%4), %%eax\n"
31121 "20: movl 36(%4), %%edx\n"
31122 - "21: movl %%eax, 32(%3)\n"
31123 - "22: movl %%edx, 36(%3)\n"
31124 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31125 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31126 "23: movl 40(%4), %%eax\n"
31127 "24: movl 44(%4), %%edx\n"
31128 - "25: movl %%eax, 40(%3)\n"
31129 - "26: movl %%edx, 44(%3)\n"
31130 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31131 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31132 "27: movl 48(%4), %%eax\n"
31133 "28: movl 52(%4), %%edx\n"
31134 - "29: movl %%eax, 48(%3)\n"
31135 - "30: movl %%edx, 52(%3)\n"
31136 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31137 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31138 "31: movl 56(%4), %%eax\n"
31139 "32: movl 60(%4), %%edx\n"
31140 - "33: movl %%eax, 56(%3)\n"
31141 - "34: movl %%edx, 60(%3)\n"
31142 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31143 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31144 " addl $-64, %0\n"
31145 " addl $64, %4\n"
31146 " addl $64, %3\n"
31147 @@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31148 " shrl $2, %0\n"
31149 " andl $3, %%eax\n"
31150 " cld\n"
31151 + __COPYUSER_SET_ES
31152 "99: rep; movsl\n"
31153 "36: movl %%eax, %0\n"
31154 "37: rep; movsb\n"
31155 "100:\n"
31156 + __COPYUSER_RESTORE_ES
31157 + ".section .fixup,\"ax\"\n"
31158 + "101: lea 0(%%eax,%0,4),%0\n"
31159 + " jmp 100b\n"
31160 + ".previous\n"
31161 + _ASM_EXTABLE(1b,100b)
31162 + _ASM_EXTABLE(2b,100b)
31163 + _ASM_EXTABLE(3b,100b)
31164 + _ASM_EXTABLE(4b,100b)
31165 + _ASM_EXTABLE(5b,100b)
31166 + _ASM_EXTABLE(6b,100b)
31167 + _ASM_EXTABLE(7b,100b)
31168 + _ASM_EXTABLE(8b,100b)
31169 + _ASM_EXTABLE(9b,100b)
31170 + _ASM_EXTABLE(10b,100b)
31171 + _ASM_EXTABLE(11b,100b)
31172 + _ASM_EXTABLE(12b,100b)
31173 + _ASM_EXTABLE(13b,100b)
31174 + _ASM_EXTABLE(14b,100b)
31175 + _ASM_EXTABLE(15b,100b)
31176 + _ASM_EXTABLE(16b,100b)
31177 + _ASM_EXTABLE(17b,100b)
31178 + _ASM_EXTABLE(18b,100b)
31179 + _ASM_EXTABLE(19b,100b)
31180 + _ASM_EXTABLE(20b,100b)
31181 + _ASM_EXTABLE(21b,100b)
31182 + _ASM_EXTABLE(22b,100b)
31183 + _ASM_EXTABLE(23b,100b)
31184 + _ASM_EXTABLE(24b,100b)
31185 + _ASM_EXTABLE(25b,100b)
31186 + _ASM_EXTABLE(26b,100b)
31187 + _ASM_EXTABLE(27b,100b)
31188 + _ASM_EXTABLE(28b,100b)
31189 + _ASM_EXTABLE(29b,100b)
31190 + _ASM_EXTABLE(30b,100b)
31191 + _ASM_EXTABLE(31b,100b)
31192 + _ASM_EXTABLE(32b,100b)
31193 + _ASM_EXTABLE(33b,100b)
31194 + _ASM_EXTABLE(34b,100b)
31195 + _ASM_EXTABLE(35b,100b)
31196 + _ASM_EXTABLE(36b,100b)
31197 + _ASM_EXTABLE(37b,100b)
31198 + _ASM_EXTABLE(99b,101b)
31199 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
31200 + : "1"(to), "2"(from), "0"(size)
31201 + : "eax", "edx", "memory");
31202 + return size;
31203 +}
31204 +
31205 +static unsigned long
31206 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31207 +{
31208 + int d0, d1;
31209 + __asm__ __volatile__(
31210 + " .align 2,0x90\n"
31211 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31212 + " cmpl $67, %0\n"
31213 + " jbe 3f\n"
31214 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31215 + " .align 2,0x90\n"
31216 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31217 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31218 + "5: movl %%eax, 0(%3)\n"
31219 + "6: movl %%edx, 4(%3)\n"
31220 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31221 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31222 + "9: movl %%eax, 8(%3)\n"
31223 + "10: movl %%edx, 12(%3)\n"
31224 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31225 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31226 + "13: movl %%eax, 16(%3)\n"
31227 + "14: movl %%edx, 20(%3)\n"
31228 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31229 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31230 + "17: movl %%eax, 24(%3)\n"
31231 + "18: movl %%edx, 28(%3)\n"
31232 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31233 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31234 + "21: movl %%eax, 32(%3)\n"
31235 + "22: movl %%edx, 36(%3)\n"
31236 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31237 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31238 + "25: movl %%eax, 40(%3)\n"
31239 + "26: movl %%edx, 44(%3)\n"
31240 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31241 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31242 + "29: movl %%eax, 48(%3)\n"
31243 + "30: movl %%edx, 52(%3)\n"
31244 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31245 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31246 + "33: movl %%eax, 56(%3)\n"
31247 + "34: movl %%edx, 60(%3)\n"
31248 + " addl $-64, %0\n"
31249 + " addl $64, %4\n"
31250 + " addl $64, %3\n"
31251 + " cmpl $63, %0\n"
31252 + " ja 1b\n"
31253 + "35: movl %0, %%eax\n"
31254 + " shrl $2, %0\n"
31255 + " andl $3, %%eax\n"
31256 + " cld\n"
31257 + "99: rep; "__copyuser_seg" movsl\n"
31258 + "36: movl %%eax, %0\n"
31259 + "37: rep; "__copyuser_seg" movsb\n"
31260 + "100:\n"
31261 ".section .fixup,\"ax\"\n"
31262 "101: lea 0(%%eax,%0,4),%0\n"
31263 " jmp 100b\n"
31264 @@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31265 int d0, d1;
31266 __asm__ __volatile__(
31267 " .align 2,0x90\n"
31268 - "0: movl 32(%4), %%eax\n"
31269 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31270 " cmpl $67, %0\n"
31271 " jbe 2f\n"
31272 - "1: movl 64(%4), %%eax\n"
31273 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31274 " .align 2,0x90\n"
31275 - "2: movl 0(%4), %%eax\n"
31276 - "21: movl 4(%4), %%edx\n"
31277 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31278 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31279 " movl %%eax, 0(%3)\n"
31280 " movl %%edx, 4(%3)\n"
31281 - "3: movl 8(%4), %%eax\n"
31282 - "31: movl 12(%4),%%edx\n"
31283 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31284 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31285 " movl %%eax, 8(%3)\n"
31286 " movl %%edx, 12(%3)\n"
31287 - "4: movl 16(%4), %%eax\n"
31288 - "41: movl 20(%4), %%edx\n"
31289 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31290 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31291 " movl %%eax, 16(%3)\n"
31292 " movl %%edx, 20(%3)\n"
31293 - "10: movl 24(%4), %%eax\n"
31294 - "51: movl 28(%4), %%edx\n"
31295 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31296 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31297 " movl %%eax, 24(%3)\n"
31298 " movl %%edx, 28(%3)\n"
31299 - "11: movl 32(%4), %%eax\n"
31300 - "61: movl 36(%4), %%edx\n"
31301 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31302 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31303 " movl %%eax, 32(%3)\n"
31304 " movl %%edx, 36(%3)\n"
31305 - "12: movl 40(%4), %%eax\n"
31306 - "71: movl 44(%4), %%edx\n"
31307 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31308 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31309 " movl %%eax, 40(%3)\n"
31310 " movl %%edx, 44(%3)\n"
31311 - "13: movl 48(%4), %%eax\n"
31312 - "81: movl 52(%4), %%edx\n"
31313 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31314 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31315 " movl %%eax, 48(%3)\n"
31316 " movl %%edx, 52(%3)\n"
31317 - "14: movl 56(%4), %%eax\n"
31318 - "91: movl 60(%4), %%edx\n"
31319 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31320 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31321 " movl %%eax, 56(%3)\n"
31322 " movl %%edx, 60(%3)\n"
31323 " addl $-64, %0\n"
31324 @@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31325 " shrl $2, %0\n"
31326 " andl $3, %%eax\n"
31327 " cld\n"
31328 - "6: rep; movsl\n"
31329 + "6: rep; "__copyuser_seg" movsl\n"
31330 " movl %%eax,%0\n"
31331 - "7: rep; movsb\n"
31332 + "7: rep; "__copyuser_seg" movsb\n"
31333 "8:\n"
31334 ".section .fixup,\"ax\"\n"
31335 "9: lea 0(%%eax,%0,4),%0\n"
31336 @@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31337
31338 __asm__ __volatile__(
31339 " .align 2,0x90\n"
31340 - "0: movl 32(%4), %%eax\n"
31341 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31342 " cmpl $67, %0\n"
31343 " jbe 2f\n"
31344 - "1: movl 64(%4), %%eax\n"
31345 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31346 " .align 2,0x90\n"
31347 - "2: movl 0(%4), %%eax\n"
31348 - "21: movl 4(%4), %%edx\n"
31349 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31350 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31351 " movnti %%eax, 0(%3)\n"
31352 " movnti %%edx, 4(%3)\n"
31353 - "3: movl 8(%4), %%eax\n"
31354 - "31: movl 12(%4),%%edx\n"
31355 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31356 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31357 " movnti %%eax, 8(%3)\n"
31358 " movnti %%edx, 12(%3)\n"
31359 - "4: movl 16(%4), %%eax\n"
31360 - "41: movl 20(%4), %%edx\n"
31361 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31362 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31363 " movnti %%eax, 16(%3)\n"
31364 " movnti %%edx, 20(%3)\n"
31365 - "10: movl 24(%4), %%eax\n"
31366 - "51: movl 28(%4), %%edx\n"
31367 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31368 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31369 " movnti %%eax, 24(%3)\n"
31370 " movnti %%edx, 28(%3)\n"
31371 - "11: movl 32(%4), %%eax\n"
31372 - "61: movl 36(%4), %%edx\n"
31373 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31374 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31375 " movnti %%eax, 32(%3)\n"
31376 " movnti %%edx, 36(%3)\n"
31377 - "12: movl 40(%4), %%eax\n"
31378 - "71: movl 44(%4), %%edx\n"
31379 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31380 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31381 " movnti %%eax, 40(%3)\n"
31382 " movnti %%edx, 44(%3)\n"
31383 - "13: movl 48(%4), %%eax\n"
31384 - "81: movl 52(%4), %%edx\n"
31385 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31386 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31387 " movnti %%eax, 48(%3)\n"
31388 " movnti %%edx, 52(%3)\n"
31389 - "14: movl 56(%4), %%eax\n"
31390 - "91: movl 60(%4), %%edx\n"
31391 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31392 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31393 " movnti %%eax, 56(%3)\n"
31394 " movnti %%edx, 60(%3)\n"
31395 " addl $-64, %0\n"
31396 @@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31397 " shrl $2, %0\n"
31398 " andl $3, %%eax\n"
31399 " cld\n"
31400 - "6: rep; movsl\n"
31401 + "6: rep; "__copyuser_seg" movsl\n"
31402 " movl %%eax,%0\n"
31403 - "7: rep; movsb\n"
31404 + "7: rep; "__copyuser_seg" movsb\n"
31405 "8:\n"
31406 ".section .fixup,\"ax\"\n"
31407 "9: lea 0(%%eax,%0,4),%0\n"
31408 @@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31409
31410 __asm__ __volatile__(
31411 " .align 2,0x90\n"
31412 - "0: movl 32(%4), %%eax\n"
31413 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31414 " cmpl $67, %0\n"
31415 " jbe 2f\n"
31416 - "1: movl 64(%4), %%eax\n"
31417 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31418 " .align 2,0x90\n"
31419 - "2: movl 0(%4), %%eax\n"
31420 - "21: movl 4(%4), %%edx\n"
31421 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31422 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31423 " movnti %%eax, 0(%3)\n"
31424 " movnti %%edx, 4(%3)\n"
31425 - "3: movl 8(%4), %%eax\n"
31426 - "31: movl 12(%4),%%edx\n"
31427 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31428 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31429 " movnti %%eax, 8(%3)\n"
31430 " movnti %%edx, 12(%3)\n"
31431 - "4: movl 16(%4), %%eax\n"
31432 - "41: movl 20(%4), %%edx\n"
31433 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31434 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31435 " movnti %%eax, 16(%3)\n"
31436 " movnti %%edx, 20(%3)\n"
31437 - "10: movl 24(%4), %%eax\n"
31438 - "51: movl 28(%4), %%edx\n"
31439 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31440 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31441 " movnti %%eax, 24(%3)\n"
31442 " movnti %%edx, 28(%3)\n"
31443 - "11: movl 32(%4), %%eax\n"
31444 - "61: movl 36(%4), %%edx\n"
31445 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31446 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31447 " movnti %%eax, 32(%3)\n"
31448 " movnti %%edx, 36(%3)\n"
31449 - "12: movl 40(%4), %%eax\n"
31450 - "71: movl 44(%4), %%edx\n"
31451 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31452 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31453 " movnti %%eax, 40(%3)\n"
31454 " movnti %%edx, 44(%3)\n"
31455 - "13: movl 48(%4), %%eax\n"
31456 - "81: movl 52(%4), %%edx\n"
31457 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31458 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31459 " movnti %%eax, 48(%3)\n"
31460 " movnti %%edx, 52(%3)\n"
31461 - "14: movl 56(%4), %%eax\n"
31462 - "91: movl 60(%4), %%edx\n"
31463 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31464 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31465 " movnti %%eax, 56(%3)\n"
31466 " movnti %%edx, 60(%3)\n"
31467 " addl $-64, %0\n"
31468 @@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31469 " shrl $2, %0\n"
31470 " andl $3, %%eax\n"
31471 " cld\n"
31472 - "6: rep; movsl\n"
31473 + "6: rep; "__copyuser_seg" movsl\n"
31474 " movl %%eax,%0\n"
31475 - "7: rep; movsb\n"
31476 + "7: rep; "__copyuser_seg" movsb\n"
31477 "8:\n"
31478 ".section .fixup,\"ax\"\n"
31479 "9: lea 0(%%eax,%0,4),%0\n"
31480 @@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31481 */
31482 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31483 unsigned long size);
31484 -unsigned long __copy_user_intel(void __user *to, const void *from,
31485 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31486 + unsigned long size);
31487 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31488 unsigned long size);
31489 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31490 const void __user *from, unsigned long size);
31491 #endif /* CONFIG_X86_INTEL_USERCOPY */
31492
31493 /* Generic arbitrary sized copy. */
31494 -#define __copy_user(to, from, size) \
31495 +#define __copy_user(to, from, size, prefix, set, restore) \
31496 do { \
31497 int __d0, __d1, __d2; \
31498 __asm__ __volatile__( \
31499 + set \
31500 " cmp $7,%0\n" \
31501 " jbe 1f\n" \
31502 " movl %1,%0\n" \
31503 " negl %0\n" \
31504 " andl $7,%0\n" \
31505 " subl %0,%3\n" \
31506 - "4: rep; movsb\n" \
31507 + "4: rep; "prefix"movsb\n" \
31508 " movl %3,%0\n" \
31509 " shrl $2,%0\n" \
31510 " andl $3,%3\n" \
31511 " .align 2,0x90\n" \
31512 - "0: rep; movsl\n" \
31513 + "0: rep; "prefix"movsl\n" \
31514 " movl %3,%0\n" \
31515 - "1: rep; movsb\n" \
31516 + "1: rep; "prefix"movsb\n" \
31517 "2:\n" \
31518 + restore \
31519 ".section .fixup,\"ax\"\n" \
31520 "5: addl %3,%0\n" \
31521 " jmp 2b\n" \
31522 @@ -538,14 +650,14 @@ do { \
31523 " negl %0\n" \
31524 " andl $7,%0\n" \
31525 " subl %0,%3\n" \
31526 - "4: rep; movsb\n" \
31527 + "4: rep; "__copyuser_seg"movsb\n" \
31528 " movl %3,%0\n" \
31529 " shrl $2,%0\n" \
31530 " andl $3,%3\n" \
31531 " .align 2,0x90\n" \
31532 - "0: rep; movsl\n" \
31533 + "0: rep; "__copyuser_seg"movsl\n" \
31534 " movl %3,%0\n" \
31535 - "1: rep; movsb\n" \
31536 + "1: rep; "__copyuser_seg"movsb\n" \
31537 "2:\n" \
31538 ".section .fixup,\"ax\"\n" \
31539 "5: addl %3,%0\n" \
31540 @@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31541 {
31542 stac();
31543 if (movsl_is_ok(to, from, n))
31544 - __copy_user(to, from, n);
31545 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31546 else
31547 - n = __copy_user_intel(to, from, n);
31548 + n = __generic_copy_to_user_intel(to, from, n);
31549 clac();
31550 return n;
31551 }
31552 @@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31553 {
31554 stac();
31555 if (movsl_is_ok(to, from, n))
31556 - __copy_user(to, from, n);
31557 + __copy_user(to, from, n, __copyuser_seg, "", "");
31558 else
31559 - n = __copy_user_intel((void __user *)to,
31560 - (const void *)from, n);
31561 + n = __generic_copy_from_user_intel(to, from, n);
31562 clac();
31563 return n;
31564 }
31565 @@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31566 if (n > 64 && cpu_has_xmm2)
31567 n = __copy_user_intel_nocache(to, from, n);
31568 else
31569 - __copy_user(to, from, n);
31570 + __copy_user(to, from, n, __copyuser_seg, "", "");
31571 #else
31572 - __copy_user(to, from, n);
31573 + __copy_user(to, from, n, __copyuser_seg, "", "");
31574 #endif
31575 clac();
31576 return n;
31577 }
31578 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31579
31580 -/**
31581 - * copy_to_user: - Copy a block of data into user space.
31582 - * @to: Destination address, in user space.
31583 - * @from: Source address, in kernel space.
31584 - * @n: Number of bytes to copy.
31585 - *
31586 - * Context: User context only. This function may sleep.
31587 - *
31588 - * Copy data from kernel space to user space.
31589 - *
31590 - * Returns number of bytes that could not be copied.
31591 - * On success, this will be zero.
31592 - */
31593 -unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31594 +#ifdef CONFIG_PAX_MEMORY_UDEREF
31595 +void __set_fs(mm_segment_t x)
31596 {
31597 - if (access_ok(VERIFY_WRITE, to, n))
31598 - n = __copy_to_user(to, from, n);
31599 - return n;
31600 + switch (x.seg) {
31601 + case 0:
31602 + loadsegment(gs, 0);
31603 + break;
31604 + case TASK_SIZE_MAX:
31605 + loadsegment(gs, __USER_DS);
31606 + break;
31607 + case -1UL:
31608 + loadsegment(gs, __KERNEL_DS);
31609 + break;
31610 + default:
31611 + BUG();
31612 + }
31613 }
31614 -EXPORT_SYMBOL(_copy_to_user);
31615 +EXPORT_SYMBOL(__set_fs);
31616
31617 -/**
31618 - * copy_from_user: - Copy a block of data from user space.
31619 - * @to: Destination address, in kernel space.
31620 - * @from: Source address, in user space.
31621 - * @n: Number of bytes to copy.
31622 - *
31623 - * Context: User context only. This function may sleep.
31624 - *
31625 - * Copy data from user space to kernel space.
31626 - *
31627 - * Returns number of bytes that could not be copied.
31628 - * On success, this will be zero.
31629 - *
31630 - * If some data could not be copied, this function will pad the copied
31631 - * data to the requested size using zero bytes.
31632 - */
31633 -unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31634 +void set_fs(mm_segment_t x)
31635 {
31636 - if (access_ok(VERIFY_READ, from, n))
31637 - n = __copy_from_user(to, from, n);
31638 - else
31639 - memset(to, 0, n);
31640 - return n;
31641 + current_thread_info()->addr_limit = x;
31642 + __set_fs(x);
31643 }
31644 -EXPORT_SYMBOL(_copy_from_user);
31645 +EXPORT_SYMBOL(set_fs);
31646 +#endif
31647 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31648 index c905e89..01ab928 100644
31649 --- a/arch/x86/lib/usercopy_64.c
31650 +++ b/arch/x86/lib/usercopy_64.c
31651 @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31652 might_fault();
31653 /* no memory constraint because it doesn't change any memory gcc knows
31654 about */
31655 + pax_open_userland();
31656 stac();
31657 asm volatile(
31658 " testq %[size8],%[size8]\n"
31659 @@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31660 _ASM_EXTABLE(0b,3b)
31661 _ASM_EXTABLE(1b,2b)
31662 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31663 - : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31664 + : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31665 [zero] "r" (0UL), [eight] "r" (8UL));
31666 clac();
31667 + pax_close_userland();
31668 return size;
31669 }
31670 EXPORT_SYMBOL(__clear_user);
31671 @@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31672 }
31673 EXPORT_SYMBOL(clear_user);
31674
31675 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31676 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31677 {
31678 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31679 - return copy_user_generic((__force void *)to, (__force void *)from, len);
31680 - }
31681 - return len;
31682 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31683 + return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31684 + return len;
31685 }
31686 EXPORT_SYMBOL(copy_in_user);
31687
31688 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31689 * it is not necessary to optimize tail handling.
31690 */
31691 __visible unsigned long
31692 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31693 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31694 {
31695 char c;
31696 unsigned zero_len;
31697
31698 + clac();
31699 + pax_close_userland();
31700 for (; len; --len, to++) {
31701 if (__get_user_nocheck(c, from++, sizeof(char)))
31702 break;
31703 @@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31704 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31705 if (__put_user_nocheck(c, to++, sizeof(char)))
31706 break;
31707 - clac();
31708 return len;
31709 }
31710 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31711 index 6a19ad9..1c48f9a 100644
31712 --- a/arch/x86/mm/Makefile
31713 +++ b/arch/x86/mm/Makefile
31714 @@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31715 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31716
31717 obj-$(CONFIG_MEMTEST) += memtest.o
31718 +
31719 +quote:="
31720 +obj-$(CONFIG_X86_64) += uderef_64.o
31721 +CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31722 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31723 index 903ec1e..c4166b2 100644
31724 --- a/arch/x86/mm/extable.c
31725 +++ b/arch/x86/mm/extable.c
31726 @@ -6,12 +6,24 @@
31727 static inline unsigned long
31728 ex_insn_addr(const struct exception_table_entry *x)
31729 {
31730 - return (unsigned long)&x->insn + x->insn;
31731 + unsigned long reloc = 0;
31732 +
31733 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31734 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31735 +#endif
31736 +
31737 + return (unsigned long)&x->insn + x->insn + reloc;
31738 }
31739 static inline unsigned long
31740 ex_fixup_addr(const struct exception_table_entry *x)
31741 {
31742 - return (unsigned long)&x->fixup + x->fixup;
31743 + unsigned long reloc = 0;
31744 +
31745 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31746 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31747 +#endif
31748 +
31749 + return (unsigned long)&x->fixup + x->fixup + reloc;
31750 }
31751
31752 int fixup_exception(struct pt_regs *regs)
31753 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31754 unsigned long new_ip;
31755
31756 #ifdef CONFIG_PNPBIOS
31757 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31758 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31759 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31760 extern u32 pnp_bios_is_utter_crap;
31761 pnp_bios_is_utter_crap = 1;
31762 @@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31763 i += 4;
31764 p->fixup -= i;
31765 i += 4;
31766 +
31767 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31768 + BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31769 + p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31770 + p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31771 +#endif
31772 +
31773 }
31774 }
31775
31776 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31777 index d973e61..fb868e9 100644
31778 --- a/arch/x86/mm/fault.c
31779 +++ b/arch/x86/mm/fault.c
31780 @@ -13,12 +13,19 @@
31781 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31782 #include <linux/prefetch.h> /* prefetchw */
31783 #include <linux/context_tracking.h> /* exception_enter(), ... */
31784 +#include <linux/unistd.h>
31785 +#include <linux/compiler.h>
31786
31787 #include <asm/traps.h> /* dotraplinkage, ... */
31788 #include <asm/pgalloc.h> /* pgd_*(), ... */
31789 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31790 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31791 #include <asm/vsyscall.h> /* emulate_vsyscall */
31792 +#include <asm/tlbflush.h>
31793 +
31794 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31795 +#include <asm/stacktrace.h>
31796 +#endif
31797
31798 #define CREATE_TRACE_POINTS
31799 #include <asm/trace/exceptions.h>
31800 @@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31801 int ret = 0;
31802
31803 /* kprobe_running() needs smp_processor_id() */
31804 - if (kprobes_built_in() && !user_mode_vm(regs)) {
31805 + if (kprobes_built_in() && !user_mode(regs)) {
31806 preempt_disable();
31807 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31808 ret = 1;
31809 @@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31810 return !instr_lo || (instr_lo>>1) == 1;
31811 case 0x00:
31812 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31813 - if (probe_kernel_address(instr, opcode))
31814 + if (user_mode(regs)) {
31815 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31816 + return 0;
31817 + } else if (probe_kernel_address(instr, opcode))
31818 return 0;
31819
31820 *prefetch = (instr_lo == 0xF) &&
31821 @@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31822 while (instr < max_instr) {
31823 unsigned char opcode;
31824
31825 - if (probe_kernel_address(instr, opcode))
31826 + if (user_mode(regs)) {
31827 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31828 + break;
31829 + } else if (probe_kernel_address(instr, opcode))
31830 break;
31831
31832 instr++;
31833 @@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31834 force_sig_info(si_signo, &info, tsk);
31835 }
31836
31837 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31838 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31839 +#endif
31840 +
31841 +#ifdef CONFIG_PAX_EMUTRAMP
31842 +static int pax_handle_fetch_fault(struct pt_regs *regs);
31843 +#endif
31844 +
31845 +#ifdef CONFIG_PAX_PAGEEXEC
31846 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31847 +{
31848 + pgd_t *pgd;
31849 + pud_t *pud;
31850 + pmd_t *pmd;
31851 +
31852 + pgd = pgd_offset(mm, address);
31853 + if (!pgd_present(*pgd))
31854 + return NULL;
31855 + pud = pud_offset(pgd, address);
31856 + if (!pud_present(*pud))
31857 + return NULL;
31858 + pmd = pmd_offset(pud, address);
31859 + if (!pmd_present(*pmd))
31860 + return NULL;
31861 + return pmd;
31862 +}
31863 +#endif
31864 +
31865 DEFINE_SPINLOCK(pgd_lock);
31866 LIST_HEAD(pgd_list);
31867
31868 @@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31869 for (address = VMALLOC_START & PMD_MASK;
31870 address >= TASK_SIZE && address < FIXADDR_TOP;
31871 address += PMD_SIZE) {
31872 +
31873 +#ifdef CONFIG_PAX_PER_CPU_PGD
31874 + unsigned long cpu;
31875 +#else
31876 struct page *page;
31877 +#endif
31878
31879 spin_lock(&pgd_lock);
31880 +
31881 +#ifdef CONFIG_PAX_PER_CPU_PGD
31882 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31883 + pgd_t *pgd = get_cpu_pgd(cpu, user);
31884 + pmd_t *ret;
31885 +
31886 + ret = vmalloc_sync_one(pgd, address);
31887 + if (!ret)
31888 + break;
31889 + pgd = get_cpu_pgd(cpu, kernel);
31890 +#else
31891 list_for_each_entry(page, &pgd_list, lru) {
31892 + pgd_t *pgd;
31893 spinlock_t *pgt_lock;
31894 pmd_t *ret;
31895
31896 @@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31897 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31898
31899 spin_lock(pgt_lock);
31900 - ret = vmalloc_sync_one(page_address(page), address);
31901 + pgd = page_address(page);
31902 +#endif
31903 +
31904 + ret = vmalloc_sync_one(pgd, address);
31905 +
31906 +#ifndef CONFIG_PAX_PER_CPU_PGD
31907 spin_unlock(pgt_lock);
31908 +#endif
31909
31910 if (!ret)
31911 break;
31912 @@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31913 * an interrupt in the middle of a task switch..
31914 */
31915 pgd_paddr = read_cr3();
31916 +
31917 +#ifdef CONFIG_PAX_PER_CPU_PGD
31918 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31919 + vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31920 +#endif
31921 +
31922 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31923 if (!pmd_k)
31924 return -1;
31925 @@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31926 * happen within a race in page table update. In the later
31927 * case just flush:
31928 */
31929 - pgd = pgd_offset(current->active_mm, address);
31930 +
31931 pgd_ref = pgd_offset_k(address);
31932 if (pgd_none(*pgd_ref))
31933 return -1;
31934
31935 +#ifdef CONFIG_PAX_PER_CPU_PGD
31936 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31937 + pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31938 + if (pgd_none(*pgd)) {
31939 + set_pgd(pgd, *pgd_ref);
31940 + arch_flush_lazy_mmu_mode();
31941 + } else {
31942 + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31943 + }
31944 + pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31945 +#else
31946 + pgd = pgd_offset(current->active_mm, address);
31947 +#endif
31948 +
31949 if (pgd_none(*pgd)) {
31950 set_pgd(pgd, *pgd_ref);
31951 arch_flush_lazy_mmu_mode();
31952 @@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31953 static int is_errata100(struct pt_regs *regs, unsigned long address)
31954 {
31955 #ifdef CONFIG_X86_64
31956 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31957 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31958 return 1;
31959 #endif
31960 return 0;
31961 @@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31962 }
31963
31964 static const char nx_warning[] = KERN_CRIT
31965 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31966 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31967 static const char smep_warning[] = KERN_CRIT
31968 -"unable to execute userspace code (SMEP?) (uid: %d)\n";
31969 +"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31970
31971 static void
31972 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31973 @@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31974 if (!oops_may_print())
31975 return;
31976
31977 - if (error_code & PF_INSTR) {
31978 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31979 unsigned int level;
31980 pgd_t *pgd;
31981 pte_t *pte;
31982 @@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31983 pte = lookup_address_in_pgd(pgd, address, &level);
31984
31985 if (pte && pte_present(*pte) && !pte_exec(*pte))
31986 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31987 + printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31988 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31989 (pgd_flags(*pgd) & _PAGE_USER) &&
31990 (read_cr4() & X86_CR4_SMEP))
31991 - printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31992 + printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31993 }
31994
31995 +#ifdef CONFIG_PAX_KERNEXEC
31996 + if (init_mm.start_code <= address && address < init_mm.end_code) {
31997 + if (current->signal->curr_ip)
31998 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31999 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
32000 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32001 + else
32002 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32003 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32004 + }
32005 +#endif
32006 +
32007 printk(KERN_ALERT "BUG: unable to handle kernel ");
32008 if (address < PAGE_SIZE)
32009 printk(KERN_CONT "NULL pointer dereference");
32010 @@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32011 return;
32012 }
32013 #endif
32014 +
32015 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32016 + if (pax_is_fetch_fault(regs, error_code, address)) {
32017 +
32018 +#ifdef CONFIG_PAX_EMUTRAMP
32019 + switch (pax_handle_fetch_fault(regs)) {
32020 + case 2:
32021 + return;
32022 + }
32023 +#endif
32024 +
32025 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32026 + do_group_exit(SIGKILL);
32027 + }
32028 +#endif
32029 +
32030 /* Kernel addresses are always protection faults: */
32031 if (address >= TASK_SIZE)
32032 error_code |= PF_PROT;
32033 @@ -867,7 +979,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32034 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32035 printk(KERN_ERR
32036 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32037 - tsk->comm, tsk->pid, address);
32038 + tsk->comm, task_pid_nr(tsk), address);
32039 code = BUS_MCEERR_AR;
32040 }
32041 #endif
32042 @@ -921,6 +1033,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32043 return 1;
32044 }
32045
32046 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32047 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32048 +{
32049 + pte_t *pte;
32050 + pmd_t *pmd;
32051 + spinlock_t *ptl;
32052 + unsigned char pte_mask;
32053 +
32054 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32055 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
32056 + return 0;
32057 +
32058 + /* PaX: it's our fault, let's handle it if we can */
32059 +
32060 + /* PaX: take a look at read faults before acquiring any locks */
32061 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32062 + /* instruction fetch attempt from a protected page in user mode */
32063 + up_read(&mm->mmap_sem);
32064 +
32065 +#ifdef CONFIG_PAX_EMUTRAMP
32066 + switch (pax_handle_fetch_fault(regs)) {
32067 + case 2:
32068 + return 1;
32069 + }
32070 +#endif
32071 +
32072 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32073 + do_group_exit(SIGKILL);
32074 + }
32075 +
32076 + pmd = pax_get_pmd(mm, address);
32077 + if (unlikely(!pmd))
32078 + return 0;
32079 +
32080 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32081 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32082 + pte_unmap_unlock(pte, ptl);
32083 + return 0;
32084 + }
32085 +
32086 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32087 + /* write attempt to a protected page in user mode */
32088 + pte_unmap_unlock(pte, ptl);
32089 + return 0;
32090 + }
32091 +
32092 +#ifdef CONFIG_SMP
32093 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32094 +#else
32095 + if (likely(address > get_limit(regs->cs)))
32096 +#endif
32097 + {
32098 + set_pte(pte, pte_mkread(*pte));
32099 + __flush_tlb_one(address);
32100 + pte_unmap_unlock(pte, ptl);
32101 + up_read(&mm->mmap_sem);
32102 + return 1;
32103 + }
32104 +
32105 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32106 +
32107 + /*
32108 + * PaX: fill DTLB with user rights and retry
32109 + */
32110 + __asm__ __volatile__ (
32111 + "orb %2,(%1)\n"
32112 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32113 +/*
32114 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32115 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32116 + * page fault when examined during a TLB load attempt. this is true not only
32117 + * for PTEs holding a non-present entry but also present entries that will
32118 + * raise a page fault (such as those set up by PaX, or the copy-on-write
32119 + * mechanism). in effect it means that we do *not* need to flush the TLBs
32120 + * for our target pages since their PTEs are simply not in the TLBs at all.
32121 +
32122 + * the best thing in omitting it is that we gain around 15-20% speed in the
32123 + * fast path of the page fault handler and can get rid of tracing since we
32124 + * can no longer flush unintended entries.
32125 + */
32126 + "invlpg (%0)\n"
32127 +#endif
32128 + __copyuser_seg"testb $0,(%0)\n"
32129 + "xorb %3,(%1)\n"
32130 + :
32131 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32132 + : "memory", "cc");
32133 + pte_unmap_unlock(pte, ptl);
32134 + up_read(&mm->mmap_sem);
32135 + return 1;
32136 +}
32137 +#endif
32138 +
32139 /*
32140 * Handle a spurious fault caused by a stale TLB entry.
32141 *
32142 @@ -1006,6 +1211,9 @@ int show_unhandled_signals = 1;
32143 static inline int
32144 access_error(unsigned long error_code, struct vm_area_struct *vma)
32145 {
32146 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32147 + return 1;
32148 +
32149 if (error_code & PF_WRITE) {
32150 /* write, present and write, not present: */
32151 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32152 @@ -1040,7 +1248,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32153 if (error_code & PF_USER)
32154 return false;
32155
32156 - if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32157 + if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32158 return false;
32159
32160 return true;
32161 @@ -1068,6 +1276,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32162 tsk = current;
32163 mm = tsk->mm;
32164
32165 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32166 + if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32167 + if (!search_exception_tables(regs->ip)) {
32168 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32169 + bad_area_nosemaphore(regs, error_code, address);
32170 + return;
32171 + }
32172 + if (address < pax_user_shadow_base) {
32173 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32174 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32175 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32176 + } else
32177 + address -= pax_user_shadow_base;
32178 + }
32179 +#endif
32180 +
32181 /*
32182 * Detect and handle instructions that would cause a page fault for
32183 * both a tracked kernel page and a userspace page.
32184 @@ -1145,7 +1369,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32185 * User-mode registers count as a user access even for any
32186 * potential system fault or CPU buglet:
32187 */
32188 - if (user_mode_vm(regs)) {
32189 + if (user_mode(regs)) {
32190 local_irq_enable();
32191 error_code |= PF_USER;
32192 flags |= FAULT_FLAG_USER;
32193 @@ -1192,6 +1416,11 @@ retry:
32194 might_sleep();
32195 }
32196
32197 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32198 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32199 + return;
32200 +#endif
32201 +
32202 vma = find_vma(mm, address);
32203 if (unlikely(!vma)) {
32204 bad_area(regs, error_code, address);
32205 @@ -1203,18 +1432,24 @@ retry:
32206 bad_area(regs, error_code, address);
32207 return;
32208 }
32209 - if (error_code & PF_USER) {
32210 - /*
32211 - * Accessing the stack below %sp is always a bug.
32212 - * The large cushion allows instructions like enter
32213 - * and pusha to work. ("enter $65535, $31" pushes
32214 - * 32 pointers and then decrements %sp by 65535.)
32215 - */
32216 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32217 - bad_area(regs, error_code, address);
32218 - return;
32219 - }
32220 + /*
32221 + * Accessing the stack below %sp is always a bug.
32222 + * The large cushion allows instructions like enter
32223 + * and pusha to work. ("enter $65535, $31" pushes
32224 + * 32 pointers and then decrements %sp by 65535.)
32225 + */
32226 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32227 + bad_area(regs, error_code, address);
32228 + return;
32229 }
32230 +
32231 +#ifdef CONFIG_PAX_SEGMEXEC
32232 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32233 + bad_area(regs, error_code, address);
32234 + return;
32235 + }
32236 +#endif
32237 +
32238 if (unlikely(expand_stack(vma, address))) {
32239 bad_area(regs, error_code, address);
32240 return;
32241 @@ -1331,3 +1566,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32242 }
32243 NOKPROBE_SYMBOL(trace_do_page_fault);
32244 #endif /* CONFIG_TRACING */
32245 +
32246 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32247 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32248 +{
32249 + struct mm_struct *mm = current->mm;
32250 + unsigned long ip = regs->ip;
32251 +
32252 + if (v8086_mode(regs))
32253 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32254 +
32255 +#ifdef CONFIG_PAX_PAGEEXEC
32256 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32257 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32258 + return true;
32259 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32260 + return true;
32261 + return false;
32262 + }
32263 +#endif
32264 +
32265 +#ifdef CONFIG_PAX_SEGMEXEC
32266 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32267 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32268 + return true;
32269 + return false;
32270 + }
32271 +#endif
32272 +
32273 + return false;
32274 +}
32275 +#endif
32276 +
32277 +#ifdef CONFIG_PAX_EMUTRAMP
32278 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32279 +{
32280 + int err;
32281 +
32282 + do { /* PaX: libffi trampoline emulation */
32283 + unsigned char mov, jmp;
32284 + unsigned int addr1, addr2;
32285 +
32286 +#ifdef CONFIG_X86_64
32287 + if ((regs->ip + 9) >> 32)
32288 + break;
32289 +#endif
32290 +
32291 + err = get_user(mov, (unsigned char __user *)regs->ip);
32292 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32293 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32294 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32295 +
32296 + if (err)
32297 + break;
32298 +
32299 + if (mov == 0xB8 && jmp == 0xE9) {
32300 + regs->ax = addr1;
32301 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32302 + return 2;
32303 + }
32304 + } while (0);
32305 +
32306 + do { /* PaX: gcc trampoline emulation #1 */
32307 + unsigned char mov1, mov2;
32308 + unsigned short jmp;
32309 + unsigned int addr1, addr2;
32310 +
32311 +#ifdef CONFIG_X86_64
32312 + if ((regs->ip + 11) >> 32)
32313 + break;
32314 +#endif
32315 +
32316 + err = get_user(mov1, (unsigned char __user *)regs->ip);
32317 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32318 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32319 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32320 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32321 +
32322 + if (err)
32323 + break;
32324 +
32325 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32326 + regs->cx = addr1;
32327 + regs->ax = addr2;
32328 + regs->ip = addr2;
32329 + return 2;
32330 + }
32331 + } while (0);
32332 +
32333 + do { /* PaX: gcc trampoline emulation #2 */
32334 + unsigned char mov, jmp;
32335 + unsigned int addr1, addr2;
32336 +
32337 +#ifdef CONFIG_X86_64
32338 + if ((regs->ip + 9) >> 32)
32339 + break;
32340 +#endif
32341 +
32342 + err = get_user(mov, (unsigned char __user *)regs->ip);
32343 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32344 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32345 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32346 +
32347 + if (err)
32348 + break;
32349 +
32350 + if (mov == 0xB9 && jmp == 0xE9) {
32351 + regs->cx = addr1;
32352 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32353 + return 2;
32354 + }
32355 + } while (0);
32356 +
32357 + return 1; /* PaX in action */
32358 +}
32359 +
32360 +#ifdef CONFIG_X86_64
32361 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32362 +{
32363 + int err;
32364 +
32365 + do { /* PaX: libffi trampoline emulation */
32366 + unsigned short mov1, mov2, jmp1;
32367 + unsigned char stcclc, jmp2;
32368 + unsigned long addr1, addr2;
32369 +
32370 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32371 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32372 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32373 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32374 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32375 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32376 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32377 +
32378 + if (err)
32379 + break;
32380 +
32381 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32382 + regs->r11 = addr1;
32383 + regs->r10 = addr2;
32384 + if (stcclc == 0xF8)
32385 + regs->flags &= ~X86_EFLAGS_CF;
32386 + else
32387 + regs->flags |= X86_EFLAGS_CF;
32388 + regs->ip = addr1;
32389 + return 2;
32390 + }
32391 + } while (0);
32392 +
32393 + do { /* PaX: gcc trampoline emulation #1 */
32394 + unsigned short mov1, mov2, jmp1;
32395 + unsigned char jmp2;
32396 + unsigned int addr1;
32397 + unsigned long addr2;
32398 +
32399 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32400 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32401 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32402 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32403 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32404 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32405 +
32406 + if (err)
32407 + break;
32408 +
32409 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32410 + regs->r11 = addr1;
32411 + regs->r10 = addr2;
32412 + regs->ip = addr1;
32413 + return 2;
32414 + }
32415 + } while (0);
32416 +
32417 + do { /* PaX: gcc trampoline emulation #2 */
32418 + unsigned short mov1, mov2, jmp1;
32419 + unsigned char jmp2;
32420 + unsigned long addr1, addr2;
32421 +
32422 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32423 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32424 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32425 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32426 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32427 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32428 +
32429 + if (err)
32430 + break;
32431 +
32432 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32433 + regs->r11 = addr1;
32434 + regs->r10 = addr2;
32435 + regs->ip = addr1;
32436 + return 2;
32437 + }
32438 + } while (0);
32439 +
32440 + return 1; /* PaX in action */
32441 +}
32442 +#endif
32443 +
32444 +/*
32445 + * PaX: decide what to do with offenders (regs->ip = fault address)
32446 + *
32447 + * returns 1 when task should be killed
32448 + * 2 when gcc trampoline was detected
32449 + */
32450 +static int pax_handle_fetch_fault(struct pt_regs *regs)
32451 +{
32452 + if (v8086_mode(regs))
32453 + return 1;
32454 +
32455 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32456 + return 1;
32457 +
32458 +#ifdef CONFIG_X86_32
32459 + return pax_handle_fetch_fault_32(regs);
32460 +#else
32461 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32462 + return pax_handle_fetch_fault_32(regs);
32463 + else
32464 + return pax_handle_fetch_fault_64(regs);
32465 +#endif
32466 +}
32467 +#endif
32468 +
32469 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32470 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32471 +{
32472 + long i;
32473 +
32474 + printk(KERN_ERR "PAX: bytes at PC: ");
32475 + for (i = 0; i < 20; i++) {
32476 + unsigned char c;
32477 + if (get_user(c, (unsigned char __force_user *)pc+i))
32478 + printk(KERN_CONT "?? ");
32479 + else
32480 + printk(KERN_CONT "%02x ", c);
32481 + }
32482 + printk("\n");
32483 +
32484 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32485 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
32486 + unsigned long c;
32487 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
32488 +#ifdef CONFIG_X86_32
32489 + printk(KERN_CONT "???????? ");
32490 +#else
32491 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32492 + printk(KERN_CONT "???????? ???????? ");
32493 + else
32494 + printk(KERN_CONT "???????????????? ");
32495 +#endif
32496 + } else {
32497 +#ifdef CONFIG_X86_64
32498 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32499 + printk(KERN_CONT "%08x ", (unsigned int)c);
32500 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32501 + } else
32502 +#endif
32503 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32504 + }
32505 + }
32506 + printk("\n");
32507 +}
32508 +#endif
32509 +
32510 +/**
32511 + * probe_kernel_write(): safely attempt to write to a location
32512 + * @dst: address to write to
32513 + * @src: pointer to the data that shall be written
32514 + * @size: size of the data chunk
32515 + *
32516 + * Safely write to address @dst from the buffer at @src. If a kernel fault
32517 + * happens, handle that and return -EFAULT.
32518 + */
32519 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32520 +{
32521 + long ret;
32522 + mm_segment_t old_fs = get_fs();
32523 +
32524 + set_fs(KERNEL_DS);
32525 + pagefault_disable();
32526 + pax_open_kernel();
32527 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32528 + pax_close_kernel();
32529 + pagefault_enable();
32530 + set_fs(old_fs);
32531 +
32532 + return ret ? -EFAULT : 0;
32533 +}
32534 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32535 index 207d9aef..69030980 100644
32536 --- a/arch/x86/mm/gup.c
32537 +++ b/arch/x86/mm/gup.c
32538 @@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32539 addr = start;
32540 len = (unsigned long) nr_pages << PAGE_SHIFT;
32541 end = start + len;
32542 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32543 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32544 (void __user *)start, len)))
32545 return 0;
32546
32547 @@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32548 goto slow_irqon;
32549 #endif
32550
32551 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32552 + (void __user *)start, len)))
32553 + return 0;
32554 +
32555 /*
32556 * XXX: batch / limit 'nr', to avoid large irq off latency
32557 * needs some instrumenting to determine the common sizes used by
32558 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32559 index 4500142..53a363c 100644
32560 --- a/arch/x86/mm/highmem_32.c
32561 +++ b/arch/x86/mm/highmem_32.c
32562 @@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32563 idx = type + KM_TYPE_NR*smp_processor_id();
32564 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32565 BUG_ON(!pte_none(*(kmap_pte-idx)));
32566 +
32567 + pax_open_kernel();
32568 set_pte(kmap_pte-idx, mk_pte(page, prot));
32569 + pax_close_kernel();
32570 +
32571 arch_flush_lazy_mmu_mode();
32572
32573 return (void *)vaddr;
32574 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32575 index 8b977eb..4732c33 100644
32576 --- a/arch/x86/mm/hugetlbpage.c
32577 +++ b/arch/x86/mm/hugetlbpage.c
32578 @@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32579 #ifdef CONFIG_HUGETLB_PAGE
32580 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32581 unsigned long addr, unsigned long len,
32582 - unsigned long pgoff, unsigned long flags)
32583 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32584 {
32585 struct hstate *h = hstate_file(file);
32586 struct vm_unmapped_area_info info;
32587 -
32588 +
32589 info.flags = 0;
32590 info.length = len;
32591 info.low_limit = current->mm->mmap_legacy_base;
32592 info.high_limit = TASK_SIZE;
32593 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32594 info.align_offset = 0;
32595 + info.threadstack_offset = offset;
32596 return vm_unmapped_area(&info);
32597 }
32598
32599 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32600 unsigned long addr0, unsigned long len,
32601 - unsigned long pgoff, unsigned long flags)
32602 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32603 {
32604 struct hstate *h = hstate_file(file);
32605 struct vm_unmapped_area_info info;
32606 @@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32607 info.high_limit = current->mm->mmap_base;
32608 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32609 info.align_offset = 0;
32610 + info.threadstack_offset = offset;
32611 addr = vm_unmapped_area(&info);
32612
32613 /*
32614 @@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32615 VM_BUG_ON(addr != -ENOMEM);
32616 info.flags = 0;
32617 info.low_limit = TASK_UNMAPPED_BASE;
32618 +
32619 +#ifdef CONFIG_PAX_RANDMMAP
32620 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32621 + info.low_limit += current->mm->delta_mmap;
32622 +#endif
32623 +
32624 info.high_limit = TASK_SIZE;
32625 addr = vm_unmapped_area(&info);
32626 }
32627 @@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32628 struct hstate *h = hstate_file(file);
32629 struct mm_struct *mm = current->mm;
32630 struct vm_area_struct *vma;
32631 + unsigned long pax_task_size = TASK_SIZE;
32632 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32633
32634 if (len & ~huge_page_mask(h))
32635 return -EINVAL;
32636 - if (len > TASK_SIZE)
32637 +
32638 +#ifdef CONFIG_PAX_SEGMEXEC
32639 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32640 + pax_task_size = SEGMEXEC_TASK_SIZE;
32641 +#endif
32642 +
32643 + pax_task_size -= PAGE_SIZE;
32644 +
32645 + if (len > pax_task_size)
32646 return -ENOMEM;
32647
32648 if (flags & MAP_FIXED) {
32649 @@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32650 return addr;
32651 }
32652
32653 +#ifdef CONFIG_PAX_RANDMMAP
32654 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32655 +#endif
32656 +
32657 if (addr) {
32658 addr = ALIGN(addr, huge_page_size(h));
32659 vma = find_vma(mm, addr);
32660 - if (TASK_SIZE - len >= addr &&
32661 - (!vma || addr + len <= vma->vm_start))
32662 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32663 return addr;
32664 }
32665 if (mm->get_unmapped_area == arch_get_unmapped_area)
32666 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32667 - pgoff, flags);
32668 + pgoff, flags, offset);
32669 else
32670 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32671 - pgoff, flags);
32672 + pgoff, flags, offset);
32673 }
32674 #endif /* CONFIG_HUGETLB_PAGE */
32675
32676 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32677 index 66dba36..f8082ec 100644
32678 --- a/arch/x86/mm/init.c
32679 +++ b/arch/x86/mm/init.c
32680 @@ -4,6 +4,7 @@
32681 #include <linux/swap.h>
32682 #include <linux/memblock.h>
32683 #include <linux/bootmem.h> /* for max_low_pfn */
32684 +#include <linux/tboot.h>
32685
32686 #include <asm/cacheflush.h>
32687 #include <asm/e820.h>
32688 @@ -17,6 +18,8 @@
32689 #include <asm/proto.h>
32690 #include <asm/dma.h> /* for MAX_DMA_PFN */
32691 #include <asm/microcode.h>
32692 +#include <asm/desc.h>
32693 +#include <asm/bios_ebda.h>
32694
32695 /*
32696 * We need to define the tracepoints somewhere, and tlb.c
32697 @@ -570,7 +573,18 @@ void __init init_mem_mapping(void)
32698 early_ioremap_page_table_range_init();
32699 #endif
32700
32701 +#ifdef CONFIG_PAX_PER_CPU_PGD
32702 + clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32703 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32704 + KERNEL_PGD_PTRS);
32705 + clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32706 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32707 + KERNEL_PGD_PTRS);
32708 + load_cr3(get_cpu_pgd(0, kernel));
32709 +#else
32710 load_cr3(swapper_pg_dir);
32711 +#endif
32712 +
32713 __flush_tlb_all();
32714
32715 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32716 @@ -586,10 +600,40 @@ void __init init_mem_mapping(void)
32717 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32718 * mmio resources as well as potential bios/acpi data regions.
32719 */
32720 +
32721 +#ifdef CONFIG_GRKERNSEC_KMEM
32722 +static unsigned int ebda_start __read_only;
32723 +static unsigned int ebda_end __read_only;
32724 +#endif
32725 +
32726 int devmem_is_allowed(unsigned long pagenr)
32727 {
32728 - if (pagenr < 256)
32729 +#ifdef CONFIG_GRKERNSEC_KMEM
32730 + /* allow BDA */
32731 + if (!pagenr)
32732 return 1;
32733 + /* allow EBDA */
32734 + if (pagenr >= ebda_start && pagenr < ebda_end)
32735 + return 1;
32736 + /* if tboot is in use, allow access to its hardcoded serial log range */
32737 + if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32738 + return 1;
32739 +#else
32740 + if (!pagenr)
32741 + return 1;
32742 +#ifdef CONFIG_VM86
32743 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32744 + return 1;
32745 +#endif
32746 +#endif
32747 +
32748 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32749 + return 1;
32750 +#ifdef CONFIG_GRKERNSEC_KMEM
32751 + /* throw out everything else below 1MB */
32752 + if (pagenr <= 256)
32753 + return 0;
32754 +#endif
32755 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32756 return 0;
32757 if (!page_is_ram(pagenr))
32758 @@ -635,8 +679,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32759 #endif
32760 }
32761
32762 +#ifdef CONFIG_GRKERNSEC_KMEM
32763 +static inline void gr_init_ebda(void)
32764 +{
32765 + unsigned int ebda_addr;
32766 + unsigned int ebda_size = 0;
32767 +
32768 + ebda_addr = get_bios_ebda();
32769 + if (ebda_addr) {
32770 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32771 + ebda_size <<= 10;
32772 + }
32773 + if (ebda_addr && ebda_size) {
32774 + ebda_start = ebda_addr >> PAGE_SHIFT;
32775 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32776 + } else {
32777 + ebda_start = 0x9f000 >> PAGE_SHIFT;
32778 + ebda_end = 0xa0000 >> PAGE_SHIFT;
32779 + }
32780 +}
32781 +#else
32782 +static inline void gr_init_ebda(void) { }
32783 +#endif
32784 +
32785 void free_initmem(void)
32786 {
32787 +#ifdef CONFIG_PAX_KERNEXEC
32788 +#ifdef CONFIG_X86_32
32789 + /* PaX: limit KERNEL_CS to actual size */
32790 + unsigned long addr, limit;
32791 + struct desc_struct d;
32792 + int cpu;
32793 +#else
32794 + pgd_t *pgd;
32795 + pud_t *pud;
32796 + pmd_t *pmd;
32797 + unsigned long addr, end;
32798 +#endif
32799 +#endif
32800 +
32801 + gr_init_ebda();
32802 +
32803 +#ifdef CONFIG_PAX_KERNEXEC
32804 +#ifdef CONFIG_X86_32
32805 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32806 + limit = (limit - 1UL) >> PAGE_SHIFT;
32807 +
32808 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32809 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32810 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32811 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32812 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32813 + }
32814 +
32815 + /* PaX: make KERNEL_CS read-only */
32816 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32817 + if (!paravirt_enabled())
32818 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32819 +/*
32820 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32821 + pgd = pgd_offset_k(addr);
32822 + pud = pud_offset(pgd, addr);
32823 + pmd = pmd_offset(pud, addr);
32824 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32825 + }
32826 +*/
32827 +#ifdef CONFIG_X86_PAE
32828 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32829 +/*
32830 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32831 + pgd = pgd_offset_k(addr);
32832 + pud = pud_offset(pgd, addr);
32833 + pmd = pmd_offset(pud, addr);
32834 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32835 + }
32836 +*/
32837 +#endif
32838 +
32839 +#ifdef CONFIG_MODULES
32840 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32841 +#endif
32842 +
32843 +#else
32844 + /* PaX: make kernel code/rodata read-only, rest non-executable */
32845 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32846 + pgd = pgd_offset_k(addr);
32847 + pud = pud_offset(pgd, addr);
32848 + pmd = pmd_offset(pud, addr);
32849 + if (!pmd_present(*pmd))
32850 + continue;
32851 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32852 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32853 + else
32854 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32855 + }
32856 +
32857 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32858 + end = addr + KERNEL_IMAGE_SIZE;
32859 + for (; addr < end; addr += PMD_SIZE) {
32860 + pgd = pgd_offset_k(addr);
32861 + pud = pud_offset(pgd, addr);
32862 + pmd = pmd_offset(pud, addr);
32863 + if (!pmd_present(*pmd))
32864 + continue;
32865 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32866 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32867 + }
32868 +#endif
32869 +
32870 + flush_tlb_all();
32871 +#endif
32872 +
32873 free_init_pages("unused kernel",
32874 (unsigned long)(&__init_begin),
32875 (unsigned long)(&__init_end));
32876 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32877 index c8140e1..59257fc 100644
32878 --- a/arch/x86/mm/init_32.c
32879 +++ b/arch/x86/mm/init_32.c
32880 @@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32881 bool __read_mostly __vmalloc_start_set = false;
32882
32883 /*
32884 - * Creates a middle page table and puts a pointer to it in the
32885 - * given global directory entry. This only returns the gd entry
32886 - * in non-PAE compilation mode, since the middle layer is folded.
32887 - */
32888 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
32889 -{
32890 - pud_t *pud;
32891 - pmd_t *pmd_table;
32892 -
32893 -#ifdef CONFIG_X86_PAE
32894 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32895 - pmd_table = (pmd_t *)alloc_low_page();
32896 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32897 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32898 - pud = pud_offset(pgd, 0);
32899 - BUG_ON(pmd_table != pmd_offset(pud, 0));
32900 -
32901 - return pmd_table;
32902 - }
32903 -#endif
32904 - pud = pud_offset(pgd, 0);
32905 - pmd_table = pmd_offset(pud, 0);
32906 -
32907 - return pmd_table;
32908 -}
32909 -
32910 -/*
32911 * Create a page table and place a pointer to it in a middle page
32912 * directory entry:
32913 */
32914 @@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32915 pte_t *page_table = (pte_t *)alloc_low_page();
32916
32917 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32918 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32919 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32920 +#else
32921 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32922 +#endif
32923 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32924 }
32925
32926 return pte_offset_kernel(pmd, 0);
32927 }
32928
32929 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
32930 +{
32931 + pud_t *pud;
32932 + pmd_t *pmd_table;
32933 +
32934 + pud = pud_offset(pgd, 0);
32935 + pmd_table = pmd_offset(pud, 0);
32936 +
32937 + return pmd_table;
32938 +}
32939 +
32940 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32941 {
32942 int pgd_idx = pgd_index(vaddr);
32943 @@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32944 int pgd_idx, pmd_idx;
32945 unsigned long vaddr;
32946 pgd_t *pgd;
32947 + pud_t *pud;
32948 pmd_t *pmd;
32949 pte_t *pte = NULL;
32950 unsigned long count = page_table_range_init_count(start, end);
32951 @@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32952 pgd = pgd_base + pgd_idx;
32953
32954 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32955 - pmd = one_md_table_init(pgd);
32956 - pmd = pmd + pmd_index(vaddr);
32957 + pud = pud_offset(pgd, vaddr);
32958 + pmd = pmd_offset(pud, vaddr);
32959 +
32960 +#ifdef CONFIG_X86_PAE
32961 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32962 +#endif
32963 +
32964 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32965 pmd++, pmd_idx++) {
32966 pte = page_table_kmap_check(one_page_table_init(pmd),
32967 @@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32968 }
32969 }
32970
32971 -static inline int is_kernel_text(unsigned long addr)
32972 +static inline int is_kernel_text(unsigned long start, unsigned long end)
32973 {
32974 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32975 - return 1;
32976 - return 0;
32977 + if ((start >= ktla_ktva((unsigned long)_etext) ||
32978 + end <= ktla_ktva((unsigned long)_stext)) &&
32979 + (start >= ktla_ktva((unsigned long)_einittext) ||
32980 + end <= ktla_ktva((unsigned long)_sinittext)) &&
32981 +
32982 +#ifdef CONFIG_ACPI_SLEEP
32983 + (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32984 +#endif
32985 +
32986 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32987 + return 0;
32988 + return 1;
32989 }
32990
32991 /*
32992 @@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32993 unsigned long last_map_addr = end;
32994 unsigned long start_pfn, end_pfn;
32995 pgd_t *pgd_base = swapper_pg_dir;
32996 - int pgd_idx, pmd_idx, pte_ofs;
32997 + unsigned int pgd_idx, pmd_idx, pte_ofs;
32998 unsigned long pfn;
32999 pgd_t *pgd;
33000 + pud_t *pud;
33001 pmd_t *pmd;
33002 pte_t *pte;
33003 unsigned pages_2m, pages_4k;
33004 @@ -291,8 +295,13 @@ repeat:
33005 pfn = start_pfn;
33006 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33007 pgd = pgd_base + pgd_idx;
33008 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33009 - pmd = one_md_table_init(pgd);
33010 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33011 + pud = pud_offset(pgd, 0);
33012 + pmd = pmd_offset(pud, 0);
33013 +
33014 +#ifdef CONFIG_X86_PAE
33015 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33016 +#endif
33017
33018 if (pfn >= end_pfn)
33019 continue;
33020 @@ -304,14 +313,13 @@ repeat:
33021 #endif
33022 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33023 pmd++, pmd_idx++) {
33024 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33025 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33026
33027 /*
33028 * Map with big pages if possible, otherwise
33029 * create normal page tables:
33030 */
33031 if (use_pse) {
33032 - unsigned int addr2;
33033 pgprot_t prot = PAGE_KERNEL_LARGE;
33034 /*
33035 * first pass will use the same initial
33036 @@ -322,11 +330,7 @@ repeat:
33037 _PAGE_PSE);
33038
33039 pfn &= PMD_MASK >> PAGE_SHIFT;
33040 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33041 - PAGE_OFFSET + PAGE_SIZE-1;
33042 -
33043 - if (is_kernel_text(addr) ||
33044 - is_kernel_text(addr2))
33045 + if (is_kernel_text(address, address + PMD_SIZE))
33046 prot = PAGE_KERNEL_LARGE_EXEC;
33047
33048 pages_2m++;
33049 @@ -343,7 +347,7 @@ repeat:
33050 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33051 pte += pte_ofs;
33052 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33053 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33054 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33055 pgprot_t prot = PAGE_KERNEL;
33056 /*
33057 * first pass will use the same initial
33058 @@ -351,7 +355,7 @@ repeat:
33059 */
33060 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33061
33062 - if (is_kernel_text(addr))
33063 + if (is_kernel_text(address, address + PAGE_SIZE))
33064 prot = PAGE_KERNEL_EXEC;
33065
33066 pages_4k++;
33067 @@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33068
33069 pud = pud_offset(pgd, va);
33070 pmd = pmd_offset(pud, va);
33071 - if (!pmd_present(*pmd))
33072 + if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33073 break;
33074
33075 /* should not be large page here */
33076 @@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33077
33078 static void __init pagetable_init(void)
33079 {
33080 - pgd_t *pgd_base = swapper_pg_dir;
33081 -
33082 - permanent_kmaps_init(pgd_base);
33083 + permanent_kmaps_init(swapper_pg_dir);
33084 }
33085
33086 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33087 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33088 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33089
33090 /* user-defined highmem size */
33091 @@ -787,10 +789,10 @@ void __init mem_init(void)
33092 ((unsigned long)&__init_end -
33093 (unsigned long)&__init_begin) >> 10,
33094
33095 - (unsigned long)&_etext, (unsigned long)&_edata,
33096 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33097 + (unsigned long)&_sdata, (unsigned long)&_edata,
33098 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33099
33100 - (unsigned long)&_text, (unsigned long)&_etext,
33101 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33102 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33103
33104 /*
33105 @@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33106 if (!kernel_set_to_readonly)
33107 return;
33108
33109 + start = ktla_ktva(start);
33110 pr_debug("Set kernel text: %lx - %lx for read write\n",
33111 start, start+size);
33112
33113 @@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33114 if (!kernel_set_to_readonly)
33115 return;
33116
33117 + start = ktla_ktva(start);
33118 pr_debug("Set kernel text: %lx - %lx for read only\n",
33119 start, start+size);
33120
33121 @@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33122 unsigned long start = PFN_ALIGN(_text);
33123 unsigned long size = PFN_ALIGN(_etext) - start;
33124
33125 + start = ktla_ktva(start);
33126 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33127 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33128 size >> 10);
33129 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33130 index 4e5dfec..6fd6dc5 100644
33131 --- a/arch/x86/mm/init_64.c
33132 +++ b/arch/x86/mm/init_64.c
33133 @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33134 * around without checking the pgd every time.
33135 */
33136
33137 -pteval_t __supported_pte_mask __read_mostly = ~0;
33138 +pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33139 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33140
33141 int force_personality32;
33142 @@ -184,7 +184,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33143
33144 for (address = start; address <= end; address += PGDIR_SIZE) {
33145 const pgd_t *pgd_ref = pgd_offset_k(address);
33146 +
33147 +#ifdef CONFIG_PAX_PER_CPU_PGD
33148 + unsigned long cpu;
33149 +#else
33150 struct page *page;
33151 +#endif
33152
33153 /*
33154 * When it is called after memory hot remove, pgd_none()
33155 @@ -195,6 +200,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33156 continue;
33157
33158 spin_lock(&pgd_lock);
33159 +
33160 +#ifdef CONFIG_PAX_PER_CPU_PGD
33161 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33162 + pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33163 +
33164 + if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33165 + BUG_ON(pgd_page_vaddr(*pgd)
33166 + != pgd_page_vaddr(*pgd_ref));
33167 +
33168 + if (removed) {
33169 + if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33170 + pgd_clear(pgd);
33171 + } else {
33172 + if (pgd_none(*pgd))
33173 + set_pgd(pgd, *pgd_ref);
33174 + }
33175 +
33176 + pgd = pgd_offset_cpu(cpu, kernel, address);
33177 +#else
33178 list_for_each_entry(page, &pgd_list, lru) {
33179 pgd_t *pgd;
33180 spinlock_t *pgt_lock;
33181 @@ -203,6 +227,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33182 /* the pgt_lock only for Xen */
33183 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33184 spin_lock(pgt_lock);
33185 +#endif
33186
33187 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33188 BUG_ON(pgd_page_vaddr(*pgd)
33189 @@ -216,7 +241,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33190 set_pgd(pgd, *pgd_ref);
33191 }
33192
33193 +#ifndef CONFIG_PAX_PER_CPU_PGD
33194 spin_unlock(pgt_lock);
33195 +#endif
33196 +
33197 }
33198 spin_unlock(&pgd_lock);
33199 }
33200 @@ -249,7 +277,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33201 {
33202 if (pgd_none(*pgd)) {
33203 pud_t *pud = (pud_t *)spp_getpage();
33204 - pgd_populate(&init_mm, pgd, pud);
33205 + pgd_populate_kernel(&init_mm, pgd, pud);
33206 if (pud != pud_offset(pgd, 0))
33207 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33208 pud, pud_offset(pgd, 0));
33209 @@ -261,7 +289,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33210 {
33211 if (pud_none(*pud)) {
33212 pmd_t *pmd = (pmd_t *) spp_getpage();
33213 - pud_populate(&init_mm, pud, pmd);
33214 + pud_populate_kernel(&init_mm, pud, pmd);
33215 if (pmd != pmd_offset(pud, 0))
33216 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33217 pmd, pmd_offset(pud, 0));
33218 @@ -290,7 +318,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33219 pmd = fill_pmd(pud, vaddr);
33220 pte = fill_pte(pmd, vaddr);
33221
33222 + pax_open_kernel();
33223 set_pte(pte, new_pte);
33224 + pax_close_kernel();
33225
33226 /*
33227 * It's enough to flush this one mapping.
33228 @@ -349,14 +379,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33229 pgd = pgd_offset_k((unsigned long)__va(phys));
33230 if (pgd_none(*pgd)) {
33231 pud = (pud_t *) spp_getpage();
33232 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33233 - _PAGE_USER));
33234 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33235 }
33236 pud = pud_offset(pgd, (unsigned long)__va(phys));
33237 if (pud_none(*pud)) {
33238 pmd = (pmd_t *) spp_getpage();
33239 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33240 - _PAGE_USER));
33241 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33242 }
33243 pmd = pmd_offset(pud, phys);
33244 BUG_ON(!pmd_none(*pmd));
33245 @@ -597,7 +625,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33246 prot);
33247
33248 spin_lock(&init_mm.page_table_lock);
33249 - pud_populate(&init_mm, pud, pmd);
33250 + pud_populate_kernel(&init_mm, pud, pmd);
33251 spin_unlock(&init_mm.page_table_lock);
33252 }
33253 __flush_tlb_all();
33254 @@ -638,7 +666,7 @@ kernel_physical_mapping_init(unsigned long start,
33255 page_size_mask);
33256
33257 spin_lock(&init_mm.page_table_lock);
33258 - pgd_populate(&init_mm, pgd, pud);
33259 + pgd_populate_kernel(&init_mm, pgd, pud);
33260 spin_unlock(&init_mm.page_table_lock);
33261 pgd_changed = true;
33262 }
33263 @@ -1217,8 +1245,8 @@ static struct vm_operations_struct gate_vma_ops = {
33264 static struct vm_area_struct gate_vma = {
33265 .vm_start = VSYSCALL_ADDR,
33266 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
33267 - .vm_page_prot = PAGE_READONLY_EXEC,
33268 - .vm_flags = VM_READ | VM_EXEC,
33269 + .vm_page_prot = PAGE_READONLY,
33270 + .vm_flags = VM_READ,
33271 .vm_ops = &gate_vma_ops,
33272 };
33273
33274 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33275 index 7b179b49..6bd17777 100644
33276 --- a/arch/x86/mm/iomap_32.c
33277 +++ b/arch/x86/mm/iomap_32.c
33278 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33279 type = kmap_atomic_idx_push();
33280 idx = type + KM_TYPE_NR * smp_processor_id();
33281 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33282 +
33283 + pax_open_kernel();
33284 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33285 + pax_close_kernel();
33286 +
33287 arch_flush_lazy_mmu_mode();
33288
33289 return (void *)vaddr;
33290 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33291 index af78e50..0790b03 100644
33292 --- a/arch/x86/mm/ioremap.c
33293 +++ b/arch/x86/mm/ioremap.c
33294 @@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33295 unsigned long i;
33296
33297 for (i = 0; i < nr_pages; ++i)
33298 - if (pfn_valid(start_pfn + i) &&
33299 - !PageReserved(pfn_to_page(start_pfn + i)))
33300 + if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33301 + !PageReserved(pfn_to_page(start_pfn + i))))
33302 return 1;
33303
33304 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33305 @@ -280,7 +280,7 @@ EXPORT_SYMBOL(ioremap_prot);
33306 *
33307 * Caller must ensure there is only one unmapping for the same pointer.
33308 */
33309 -void iounmap(volatile void __iomem *addr)
33310 +void iounmap(const volatile void __iomem *addr)
33311 {
33312 struct vm_struct *p, *o;
33313
33314 @@ -334,6 +334,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33315
33316 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33317 if (page_is_ram(start >> PAGE_SHIFT))
33318 +#ifdef CONFIG_HIGHMEM
33319 + if ((start >> PAGE_SHIFT) < max_low_pfn)
33320 +#endif
33321 return __va(phys);
33322
33323 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33324 @@ -346,13 +349,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33325 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
33326 {
33327 if (page_is_ram(phys >> PAGE_SHIFT))
33328 +#ifdef CONFIG_HIGHMEM
33329 + if ((phys >> PAGE_SHIFT) < max_low_pfn)
33330 +#endif
33331 return;
33332
33333 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33334 return;
33335 }
33336
33337 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33338 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33339
33340 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33341 {
33342 @@ -388,8 +394,7 @@ void __init early_ioremap_init(void)
33343 early_ioremap_setup();
33344
33345 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33346 - memset(bm_pte, 0, sizeof(bm_pte));
33347 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
33348 + pmd_populate_user(&init_mm, pmd, bm_pte);
33349
33350 /*
33351 * The boot-ioremap range spans multiple pmds, for which
33352 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33353 index b4f2e7e..96c9c3e 100644
33354 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
33355 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33356 @@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33357 * memory (e.g. tracked pages)? For now, we need this to avoid
33358 * invoking kmemcheck for PnP BIOS calls.
33359 */
33360 - if (regs->flags & X86_VM_MASK)
33361 + if (v8086_mode(regs))
33362 return false;
33363 - if (regs->cs != __KERNEL_CS)
33364 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33365 return false;
33366
33367 pte = kmemcheck_pte_lookup(address);
33368 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33369 index 919b912..9267313 100644
33370 --- a/arch/x86/mm/mmap.c
33371 +++ b/arch/x86/mm/mmap.c
33372 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
33373 * Leave an at least ~128 MB hole with possible stack randomization.
33374 */
33375 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33376 -#define MAX_GAP (TASK_SIZE/6*5)
33377 +#define MAX_GAP (pax_task_size/6*5)
33378
33379 static int mmap_is_legacy(void)
33380 {
33381 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33382 return rnd << PAGE_SHIFT;
33383 }
33384
33385 -static unsigned long mmap_base(void)
33386 +static unsigned long mmap_base(struct mm_struct *mm)
33387 {
33388 unsigned long gap = rlimit(RLIMIT_STACK);
33389 + unsigned long pax_task_size = TASK_SIZE;
33390 +
33391 +#ifdef CONFIG_PAX_SEGMEXEC
33392 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
33393 + pax_task_size = SEGMEXEC_TASK_SIZE;
33394 +#endif
33395
33396 if (gap < MIN_GAP)
33397 gap = MIN_GAP;
33398 else if (gap > MAX_GAP)
33399 gap = MAX_GAP;
33400
33401 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33402 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33403 }
33404
33405 /*
33406 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33407 * does, but not when emulating X86_32
33408 */
33409 -static unsigned long mmap_legacy_base(void)
33410 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
33411 {
33412 - if (mmap_is_ia32())
33413 + if (mmap_is_ia32()) {
33414 +
33415 +#ifdef CONFIG_PAX_SEGMEXEC
33416 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
33417 + return SEGMEXEC_TASK_UNMAPPED_BASE;
33418 + else
33419 +#endif
33420 +
33421 return TASK_UNMAPPED_BASE;
33422 - else
33423 + } else
33424 return TASK_UNMAPPED_BASE + mmap_rnd();
33425 }
33426
33427 @@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33428 */
33429 void arch_pick_mmap_layout(struct mm_struct *mm)
33430 {
33431 - mm->mmap_legacy_base = mmap_legacy_base();
33432 - mm->mmap_base = mmap_base();
33433 + mm->mmap_legacy_base = mmap_legacy_base(mm);
33434 + mm->mmap_base = mmap_base(mm);
33435 +
33436 +#ifdef CONFIG_PAX_RANDMMAP
33437 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
33438 + mm->mmap_legacy_base += mm->delta_mmap;
33439 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33440 + }
33441 +#endif
33442
33443 if (mmap_is_legacy()) {
33444 mm->mmap_base = mm->mmap_legacy_base;
33445 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33446 index 0057a7a..95c7edd 100644
33447 --- a/arch/x86/mm/mmio-mod.c
33448 +++ b/arch/x86/mm/mmio-mod.c
33449 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33450 break;
33451 default:
33452 {
33453 - unsigned char *ip = (unsigned char *)instptr;
33454 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33455 my_trace->opcode = MMIO_UNKNOWN_OP;
33456 my_trace->width = 0;
33457 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33458 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33459 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33460 void __iomem *addr)
33461 {
33462 - static atomic_t next_id;
33463 + static atomic_unchecked_t next_id;
33464 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33465 /* These are page-unaligned. */
33466 struct mmiotrace_map map = {
33467 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33468 .private = trace
33469 },
33470 .phys = offset,
33471 - .id = atomic_inc_return(&next_id)
33472 + .id = atomic_inc_return_unchecked(&next_id)
33473 };
33474 map.map_id = trace->id;
33475
33476 @@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33477 ioremap_trace_core(offset, size, addr);
33478 }
33479
33480 -static void iounmap_trace_core(volatile void __iomem *addr)
33481 +static void iounmap_trace_core(const volatile void __iomem *addr)
33482 {
33483 struct mmiotrace_map map = {
33484 .phys = 0,
33485 @@ -328,7 +328,7 @@ not_enabled:
33486 }
33487 }
33488
33489 -void mmiotrace_iounmap(volatile void __iomem *addr)
33490 +void mmiotrace_iounmap(const volatile void __iomem *addr)
33491 {
33492 might_sleep();
33493 if (is_enabled()) /* recheck and proper locking in *_core() */
33494 diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33495 index 1a88370..3f598b5 100644
33496 --- a/arch/x86/mm/numa.c
33497 +++ b/arch/x86/mm/numa.c
33498 @@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33499 }
33500 }
33501
33502 -static int __init numa_register_memblks(struct numa_meminfo *mi)
33503 +static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33504 {
33505 unsigned long uninitialized_var(pfn_align);
33506 int i, nid;
33507 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33508 index 36de293..b820ddc 100644
33509 --- a/arch/x86/mm/pageattr.c
33510 +++ b/arch/x86/mm/pageattr.c
33511 @@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33512 */
33513 #ifdef CONFIG_PCI_BIOS
33514 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33515 - pgprot_val(forbidden) |= _PAGE_NX;
33516 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33517 #endif
33518
33519 /*
33520 @@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33521 * Does not cover __inittext since that is gone later on. On
33522 * 64bit we do not enforce !NX on the low mapping
33523 */
33524 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
33525 - pgprot_val(forbidden) |= _PAGE_NX;
33526 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33527 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33528
33529 +#ifdef CONFIG_DEBUG_RODATA
33530 /*
33531 * The .rodata section needs to be read-only. Using the pfn
33532 * catches all aliases.
33533 @@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33534 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33535 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33536 pgprot_val(forbidden) |= _PAGE_RW;
33537 +#endif
33538
33539 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33540 /*
33541 @@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33542 }
33543 #endif
33544
33545 +#ifdef CONFIG_PAX_KERNEXEC
33546 + if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33547 + pgprot_val(forbidden) |= _PAGE_RW;
33548 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33549 + }
33550 +#endif
33551 +
33552 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33553
33554 return prot;
33555 @@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33556 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33557 {
33558 /* change init_mm */
33559 + pax_open_kernel();
33560 set_pte_atomic(kpte, pte);
33561 +
33562 #ifdef CONFIG_X86_32
33563 if (!SHARED_KERNEL_PMD) {
33564 +
33565 +#ifdef CONFIG_PAX_PER_CPU_PGD
33566 + unsigned long cpu;
33567 +#else
33568 struct page *page;
33569 +#endif
33570
33571 +#ifdef CONFIG_PAX_PER_CPU_PGD
33572 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33573 + pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33574 +#else
33575 list_for_each_entry(page, &pgd_list, lru) {
33576 - pgd_t *pgd;
33577 + pgd_t *pgd = (pgd_t *)page_address(page);
33578 +#endif
33579 +
33580 pud_t *pud;
33581 pmd_t *pmd;
33582
33583 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
33584 + pgd += pgd_index(address);
33585 pud = pud_offset(pgd, address);
33586 pmd = pmd_offset(pud, address);
33587 set_pte_atomic((pte_t *)pmd, pte);
33588 }
33589 }
33590 #endif
33591 + pax_close_kernel();
33592 }
33593
33594 static int
33595 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33596 index 6574388..87e9bef 100644
33597 --- a/arch/x86/mm/pat.c
33598 +++ b/arch/x86/mm/pat.c
33599 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33600
33601 if (!entry) {
33602 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33603 - current->comm, current->pid, start, end - 1);
33604 + current->comm, task_pid_nr(current), start, end - 1);
33605 return -EINVAL;
33606 }
33607
33608 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33609
33610 while (cursor < to) {
33611 if (!devmem_is_allowed(pfn)) {
33612 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33613 - current->comm, from, to - 1);
33614 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33615 + current->comm, from, to - 1, cursor);
33616 return 0;
33617 }
33618 cursor += PAGE_SIZE;
33619 @@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33620 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33621 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33622 "for [mem %#010Lx-%#010Lx]\n",
33623 - current->comm, current->pid,
33624 + current->comm, task_pid_nr(current),
33625 cattr_name(flags),
33626 base, (unsigned long long)(base + size-1));
33627 return -EINVAL;
33628 @@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33629 flags = lookup_memtype(paddr);
33630 if (want_flags != flags) {
33631 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33632 - current->comm, current->pid,
33633 + current->comm, task_pid_nr(current),
33634 cattr_name(want_flags),
33635 (unsigned long long)paddr,
33636 (unsigned long long)(paddr + size - 1),
33637 @@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33638 free_memtype(paddr, paddr + size);
33639 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33640 " for [mem %#010Lx-%#010Lx], got %s\n",
33641 - current->comm, current->pid,
33642 + current->comm, task_pid_nr(current),
33643 cattr_name(want_flags),
33644 (unsigned long long)paddr,
33645 (unsigned long long)(paddr + size - 1),
33646 diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33647 index 415f6c4..d319983 100644
33648 --- a/arch/x86/mm/pat_rbtree.c
33649 +++ b/arch/x86/mm/pat_rbtree.c
33650 @@ -160,7 +160,7 @@ success:
33651
33652 failure:
33653 printk(KERN_INFO "%s:%d conflicting memory types "
33654 - "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33655 + "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33656 end, cattr_name(found_type), cattr_name(match->type));
33657 return -EBUSY;
33658 }
33659 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33660 index 9f0614d..92ae64a 100644
33661 --- a/arch/x86/mm/pf_in.c
33662 +++ b/arch/x86/mm/pf_in.c
33663 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33664 int i;
33665 enum reason_type rv = OTHERS;
33666
33667 - p = (unsigned char *)ins_addr;
33668 + p = (unsigned char *)ktla_ktva(ins_addr);
33669 p += skip_prefix(p, &prf);
33670 p += get_opcode(p, &opcode);
33671
33672 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33673 struct prefix_bits prf;
33674 int i;
33675
33676 - p = (unsigned char *)ins_addr;
33677 + p = (unsigned char *)ktla_ktva(ins_addr);
33678 p += skip_prefix(p, &prf);
33679 p += get_opcode(p, &opcode);
33680
33681 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33682 struct prefix_bits prf;
33683 int i;
33684
33685 - p = (unsigned char *)ins_addr;
33686 + p = (unsigned char *)ktla_ktva(ins_addr);
33687 p += skip_prefix(p, &prf);
33688 p += get_opcode(p, &opcode);
33689
33690 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33691 struct prefix_bits prf;
33692 int i;
33693
33694 - p = (unsigned char *)ins_addr;
33695 + p = (unsigned char *)ktla_ktva(ins_addr);
33696 p += skip_prefix(p, &prf);
33697 p += get_opcode(p, &opcode);
33698 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33699 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33700 struct prefix_bits prf;
33701 int i;
33702
33703 - p = (unsigned char *)ins_addr;
33704 + p = (unsigned char *)ktla_ktva(ins_addr);
33705 p += skip_prefix(p, &prf);
33706 p += get_opcode(p, &opcode);
33707 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33708 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33709 index 6fb6927..4fc13c0 100644
33710 --- a/arch/x86/mm/pgtable.c
33711 +++ b/arch/x86/mm/pgtable.c
33712 @@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33713 list_del(&page->lru);
33714 }
33715
33716 -#define UNSHARED_PTRS_PER_PGD \
33717 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33718 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33719 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33720
33721 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33722 +{
33723 + unsigned int count = USER_PGD_PTRS;
33724
33725 + if (!pax_user_shadow_base)
33726 + return;
33727 +
33728 + while (count--)
33729 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33730 +}
33731 +#endif
33732 +
33733 +#ifdef CONFIG_PAX_PER_CPU_PGD
33734 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33735 +{
33736 + unsigned int count = USER_PGD_PTRS;
33737 +
33738 + while (count--) {
33739 + pgd_t pgd;
33740 +
33741 +#ifdef CONFIG_X86_64
33742 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33743 +#else
33744 + pgd = *src++;
33745 +#endif
33746 +
33747 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33748 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33749 +#endif
33750 +
33751 + *dst++ = pgd;
33752 + }
33753 +
33754 +}
33755 +#endif
33756 +
33757 +#ifdef CONFIG_X86_64
33758 +#define pxd_t pud_t
33759 +#define pyd_t pgd_t
33760 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33761 +#define pgtable_pxd_page_ctor(page) true
33762 +#define pgtable_pxd_page_dtor(page)
33763 +#define pxd_free(mm, pud) pud_free((mm), (pud))
33764 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33765 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
33766 +#define PYD_SIZE PGDIR_SIZE
33767 +#else
33768 +#define pxd_t pmd_t
33769 +#define pyd_t pud_t
33770 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33771 +#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33772 +#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33773 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
33774 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33775 +#define pyd_offset(mm, address) pud_offset((mm), (address))
33776 +#define PYD_SIZE PUD_SIZE
33777 +#endif
33778 +
33779 +#ifdef CONFIG_PAX_PER_CPU_PGD
33780 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33781 +static inline void pgd_dtor(pgd_t *pgd) {}
33782 +#else
33783 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33784 {
33785 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33786 @@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33787 pgd_list_del(pgd);
33788 spin_unlock(&pgd_lock);
33789 }
33790 +#endif
33791
33792 /*
33793 * List of all pgd's needed for non-PAE so it can invalidate entries
33794 @@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33795 * -- nyc
33796 */
33797
33798 -#ifdef CONFIG_X86_PAE
33799 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33800 /*
33801 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33802 * updating the top-level pagetable entries to guarantee the
33803 @@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33804 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33805 * and initialize the kernel pmds here.
33806 */
33807 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33808 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33809
33810 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33811 {
33812 @@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33813 */
33814 flush_tlb_mm(mm);
33815 }
33816 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33817 +#define PREALLOCATED_PXDS USER_PGD_PTRS
33818 #else /* !CONFIG_X86_PAE */
33819
33820 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33821 -#define PREALLOCATED_PMDS 0
33822 +#define PREALLOCATED_PXDS 0
33823
33824 #endif /* CONFIG_X86_PAE */
33825
33826 -static void free_pmds(pmd_t *pmds[])
33827 +static void free_pxds(pxd_t *pxds[])
33828 {
33829 int i;
33830
33831 - for(i = 0; i < PREALLOCATED_PMDS; i++)
33832 - if (pmds[i]) {
33833 - pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33834 - free_page((unsigned long)pmds[i]);
33835 + for(i = 0; i < PREALLOCATED_PXDS; i++)
33836 + if (pxds[i]) {
33837 + pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33838 + free_page((unsigned long)pxds[i]);
33839 }
33840 }
33841
33842 -static int preallocate_pmds(pmd_t *pmds[])
33843 +static int preallocate_pxds(pxd_t *pxds[])
33844 {
33845 int i;
33846 bool failed = false;
33847
33848 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33849 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33850 - if (!pmd)
33851 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33852 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33853 + if (!pxd)
33854 failed = true;
33855 - if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33856 - free_page((unsigned long)pmd);
33857 - pmd = NULL;
33858 + if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33859 + free_page((unsigned long)pxd);
33860 + pxd = NULL;
33861 failed = true;
33862 }
33863 - pmds[i] = pmd;
33864 + pxds[i] = pxd;
33865 }
33866
33867 if (failed) {
33868 - free_pmds(pmds);
33869 + free_pxds(pxds);
33870 return -ENOMEM;
33871 }
33872
33873 @@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33874 * preallocate which never got a corresponding vma will need to be
33875 * freed manually.
33876 */
33877 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33878 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33879 {
33880 int i;
33881
33882 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33883 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33884 pgd_t pgd = pgdp[i];
33885
33886 if (pgd_val(pgd) != 0) {
33887 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33888 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33889
33890 - pgdp[i] = native_make_pgd(0);
33891 + set_pgd(pgdp + i, native_make_pgd(0));
33892
33893 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33894 - pmd_free(mm, pmd);
33895 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33896 + pxd_free(mm, pxd);
33897 }
33898 }
33899 }
33900
33901 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33902 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33903 {
33904 - pud_t *pud;
33905 + pyd_t *pyd;
33906 int i;
33907
33908 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33909 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33910 return;
33911
33912 - pud = pud_offset(pgd, 0);
33913 -
33914 - for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33915 - pmd_t *pmd = pmds[i];
33916 +#ifdef CONFIG_X86_64
33917 + pyd = pyd_offset(mm, 0L);
33918 +#else
33919 + pyd = pyd_offset(pgd, 0L);
33920 +#endif
33921
33922 + for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33923 + pxd_t *pxd = pxds[i];
33924 if (i >= KERNEL_PGD_BOUNDARY)
33925 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33926 - sizeof(pmd_t) * PTRS_PER_PMD);
33927 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33928 + sizeof(pxd_t) * PTRS_PER_PMD);
33929
33930 - pud_populate(mm, pud, pmd);
33931 + pyd_populate(mm, pyd, pxd);
33932 }
33933 }
33934
33935 pgd_t *pgd_alloc(struct mm_struct *mm)
33936 {
33937 pgd_t *pgd;
33938 - pmd_t *pmds[PREALLOCATED_PMDS];
33939 + pxd_t *pxds[PREALLOCATED_PXDS];
33940
33941 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33942
33943 @@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33944
33945 mm->pgd = pgd;
33946
33947 - if (preallocate_pmds(pmds) != 0)
33948 + if (preallocate_pxds(pxds) != 0)
33949 goto out_free_pgd;
33950
33951 if (paravirt_pgd_alloc(mm) != 0)
33952 - goto out_free_pmds;
33953 + goto out_free_pxds;
33954
33955 /*
33956 * Make sure that pre-populating the pmds is atomic with
33957 @@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33958 spin_lock(&pgd_lock);
33959
33960 pgd_ctor(mm, pgd);
33961 - pgd_prepopulate_pmd(mm, pgd, pmds);
33962 + pgd_prepopulate_pxd(mm, pgd, pxds);
33963
33964 spin_unlock(&pgd_lock);
33965
33966 return pgd;
33967
33968 -out_free_pmds:
33969 - free_pmds(pmds);
33970 +out_free_pxds:
33971 + free_pxds(pxds);
33972 out_free_pgd:
33973 free_page((unsigned long)pgd);
33974 out:
33975 @@ -313,7 +380,7 @@ out:
33976
33977 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33978 {
33979 - pgd_mop_up_pmds(mm, pgd);
33980 + pgd_mop_up_pxds(mm, pgd);
33981 pgd_dtor(pgd);
33982 paravirt_pgd_free(mm, pgd);
33983 free_page((unsigned long)pgd);
33984 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33985 index 75cc097..79a097f 100644
33986 --- a/arch/x86/mm/pgtable_32.c
33987 +++ b/arch/x86/mm/pgtable_32.c
33988 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33989 return;
33990 }
33991 pte = pte_offset_kernel(pmd, vaddr);
33992 +
33993 + pax_open_kernel();
33994 if (pte_val(pteval))
33995 set_pte_at(&init_mm, vaddr, pte, pteval);
33996 else
33997 pte_clear(&init_mm, vaddr, pte);
33998 + pax_close_kernel();
33999
34000 /*
34001 * It's enough to flush this one mapping.
34002 diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34003 index e666cbb..61788c45 100644
34004 --- a/arch/x86/mm/physaddr.c
34005 +++ b/arch/x86/mm/physaddr.c
34006 @@ -10,7 +10,7 @@
34007 #ifdef CONFIG_X86_64
34008
34009 #ifdef CONFIG_DEBUG_VIRTUAL
34010 -unsigned long __phys_addr(unsigned long x)
34011 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34012 {
34013 unsigned long y = x - __START_KERNEL_map;
34014
34015 @@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34016 #else
34017
34018 #ifdef CONFIG_DEBUG_VIRTUAL
34019 -unsigned long __phys_addr(unsigned long x)
34020 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34021 {
34022 unsigned long phys_addr = x - PAGE_OFFSET;
34023 /* VMALLOC_* aren't constants */
34024 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34025 index 90555bf..f5f1828 100644
34026 --- a/arch/x86/mm/setup_nx.c
34027 +++ b/arch/x86/mm/setup_nx.c
34028 @@ -5,8 +5,10 @@
34029 #include <asm/pgtable.h>
34030 #include <asm/proto.h>
34031
34032 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34033 static int disable_nx;
34034
34035 +#ifndef CONFIG_PAX_PAGEEXEC
34036 /*
34037 * noexec = on|off
34038 *
34039 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34040 return 0;
34041 }
34042 early_param("noexec", noexec_setup);
34043 +#endif
34044 +
34045 +#endif
34046
34047 void x86_configure_nx(void)
34048 {
34049 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34050 if (cpu_has_nx && !disable_nx)
34051 __supported_pte_mask |= _PAGE_NX;
34052 else
34053 +#endif
34054 __supported_pte_mask &= ~_PAGE_NX;
34055 }
34056
34057 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34058 index ee61c36..e6fedeb 100644
34059 --- a/arch/x86/mm/tlb.c
34060 +++ b/arch/x86/mm/tlb.c
34061 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
34062 BUG();
34063 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34064 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34065 +
34066 +#ifndef CONFIG_PAX_PER_CPU_PGD
34067 load_cr3(swapper_pg_dir);
34068 +#endif
34069 +
34070 /*
34071 * This gets called in the idle path where RCU
34072 * functions differently. Tracing normally
34073 diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34074 new file mode 100644
34075 index 0000000..dace51c
34076 --- /dev/null
34077 +++ b/arch/x86/mm/uderef_64.c
34078 @@ -0,0 +1,37 @@
34079 +#include <linux/mm.h>
34080 +#include <asm/pgtable.h>
34081 +#include <asm/uaccess.h>
34082 +
34083 +#ifdef CONFIG_PAX_MEMORY_UDEREF
34084 +/* PaX: due to the special call convention these functions must
34085 + * - remain leaf functions under all configurations,
34086 + * - never be called directly, only dereferenced from the wrappers.
34087 + */
34088 +void __pax_open_userland(void)
34089 +{
34090 + unsigned int cpu;
34091 +
34092 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
34093 + return;
34094 +
34095 + cpu = raw_get_cpu();
34096 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34097 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34098 + raw_put_cpu_no_resched();
34099 +}
34100 +EXPORT_SYMBOL(__pax_open_userland);
34101 +
34102 +void __pax_close_userland(void)
34103 +{
34104 + unsigned int cpu;
34105 +
34106 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
34107 + return;
34108 +
34109 + cpu = raw_get_cpu();
34110 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34111 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34112 + raw_put_cpu_no_resched();
34113 +}
34114 +EXPORT_SYMBOL(__pax_close_userland);
34115 +#endif
34116 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34117 index 6440221..f84b5c7 100644
34118 --- a/arch/x86/net/bpf_jit.S
34119 +++ b/arch/x86/net/bpf_jit.S
34120 @@ -9,6 +9,7 @@
34121 */
34122 #include <linux/linkage.h>
34123 #include <asm/dwarf2.h>
34124 +#include <asm/alternative-asm.h>
34125
34126 /*
34127 * Calling convention :
34128 @@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34129 jle bpf_slow_path_word
34130 mov (SKBDATA,%rsi),%eax
34131 bswap %eax /* ntohl() */
34132 + pax_force_retaddr
34133 ret
34134
34135 sk_load_half:
34136 @@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34137 jle bpf_slow_path_half
34138 movzwl (SKBDATA,%rsi),%eax
34139 rol $8,%ax # ntohs()
34140 + pax_force_retaddr
34141 ret
34142
34143 sk_load_byte:
34144 @@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34145 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34146 jle bpf_slow_path_byte
34147 movzbl (SKBDATA,%rsi),%eax
34148 + pax_force_retaddr
34149 ret
34150
34151 /* rsi contains offset and can be scratched */
34152 @@ -90,6 +94,7 @@ bpf_slow_path_word:
34153 js bpf_error
34154 mov - MAX_BPF_STACK + 32(%rbp),%eax
34155 bswap %eax
34156 + pax_force_retaddr
34157 ret
34158
34159 bpf_slow_path_half:
34160 @@ -98,12 +103,14 @@ bpf_slow_path_half:
34161 mov - MAX_BPF_STACK + 32(%rbp),%ax
34162 rol $8,%ax
34163 movzwl %ax,%eax
34164 + pax_force_retaddr
34165 ret
34166
34167 bpf_slow_path_byte:
34168 bpf_slow_path_common(1)
34169 js bpf_error
34170 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34171 + pax_force_retaddr
34172 ret
34173
34174 #define sk_negative_common(SIZE) \
34175 @@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34176 sk_negative_common(4)
34177 mov (%rax), %eax
34178 bswap %eax
34179 + pax_force_retaddr
34180 ret
34181
34182 bpf_slow_path_half_neg:
34183 @@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34184 mov (%rax),%ax
34185 rol $8,%ax
34186 movzwl %ax,%eax
34187 + pax_force_retaddr
34188 ret
34189
34190 bpf_slow_path_byte_neg:
34191 @@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34192 .globl sk_load_byte_negative_offset
34193 sk_negative_common(1)
34194 movzbl (%rax), %eax
34195 + pax_force_retaddr
34196 ret
34197
34198 bpf_error:
34199 @@ -156,4 +166,5 @@ bpf_error:
34200 mov - MAX_BPF_STACK + 16(%rbp),%r14
34201 mov - MAX_BPF_STACK + 24(%rbp),%r15
34202 leaveq
34203 + pax_force_retaddr
34204 ret
34205 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34206 index 3f62734..a57894f 100644
34207 --- a/arch/x86/net/bpf_jit_comp.c
34208 +++ b/arch/x86/net/bpf_jit_comp.c
34209 @@ -13,7 +13,11 @@
34210 #include <linux/if_vlan.h>
34211 #include <asm/cacheflush.h>
34212
34213 +#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34214 +int bpf_jit_enable __read_only;
34215 +#else
34216 int bpf_jit_enable __read_mostly;
34217 +#endif
34218
34219 /*
34220 * assembly code in arch/x86/net/bpf_jit.S
34221 @@ -174,7 +178,9 @@ static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34222 static void jit_fill_hole(void *area, unsigned int size)
34223 {
34224 /* fill whole space with int3 instructions */
34225 + pax_open_kernel();
34226 memset(area, 0xcc, size);
34227 + pax_close_kernel();
34228 }
34229
34230 struct jit_context {
34231 @@ -894,7 +900,9 @@ common_load:
34232 pr_err("bpf_jit_compile fatal error\n");
34233 return -EFAULT;
34234 }
34235 + pax_open_kernel();
34236 memcpy(image + proglen, temp, ilen);
34237 + pax_close_kernel();
34238 }
34239 proglen += ilen;
34240 addrs[i] = proglen;
34241 @@ -966,7 +974,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34242
34243 if (image) {
34244 bpf_flush_icache(header, image + proglen);
34245 - set_memory_ro((unsigned long)header, header->pages);
34246 prog->bpf_func = (void *)image;
34247 prog->jited = true;
34248 }
34249 @@ -979,12 +986,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34250 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34251 struct bpf_binary_header *header = (void *)addr;
34252
34253 - if (!fp->jited)
34254 - goto free_filter;
34255 + if (fp->jited)
34256 + bpf_jit_binary_free(header);
34257
34258 - set_memory_rw(addr, header->pages);
34259 - bpf_jit_binary_free(header);
34260 -
34261 -free_filter:
34262 bpf_prog_unlock_free(fp);
34263 }
34264 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34265 index 5d04be5..2beeaa2 100644
34266 --- a/arch/x86/oprofile/backtrace.c
34267 +++ b/arch/x86/oprofile/backtrace.c
34268 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34269 struct stack_frame_ia32 *fp;
34270 unsigned long bytes;
34271
34272 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34273 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34274 if (bytes != 0)
34275 return NULL;
34276
34277 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34278 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34279
34280 oprofile_add_trace(bufhead[0].return_address);
34281
34282 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34283 struct stack_frame bufhead[2];
34284 unsigned long bytes;
34285
34286 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34287 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34288 if (bytes != 0)
34289 return NULL;
34290
34291 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34292 {
34293 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34294
34295 - if (!user_mode_vm(regs)) {
34296 + if (!user_mode(regs)) {
34297 unsigned long stack = kernel_stack_pointer(regs);
34298 if (depth)
34299 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34300 diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34301 index 1d2e639..f6ef82a 100644
34302 --- a/arch/x86/oprofile/nmi_int.c
34303 +++ b/arch/x86/oprofile/nmi_int.c
34304 @@ -23,6 +23,7 @@
34305 #include <asm/nmi.h>
34306 #include <asm/msr.h>
34307 #include <asm/apic.h>
34308 +#include <asm/pgtable.h>
34309
34310 #include "op_counter.h"
34311 #include "op_x86_model.h"
34312 @@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34313 if (ret)
34314 return ret;
34315
34316 - if (!model->num_virt_counters)
34317 - model->num_virt_counters = model->num_counters;
34318 + if (!model->num_virt_counters) {
34319 + pax_open_kernel();
34320 + *(unsigned int *)&model->num_virt_counters = model->num_counters;
34321 + pax_close_kernel();
34322 + }
34323
34324 mux_init(ops);
34325
34326 diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34327 index 50d86c0..7985318 100644
34328 --- a/arch/x86/oprofile/op_model_amd.c
34329 +++ b/arch/x86/oprofile/op_model_amd.c
34330 @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34331 num_counters = AMD64_NUM_COUNTERS;
34332 }
34333
34334 - op_amd_spec.num_counters = num_counters;
34335 - op_amd_spec.num_controls = num_counters;
34336 - op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34337 + pax_open_kernel();
34338 + *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34339 + *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34340 + *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34341 + pax_close_kernel();
34342
34343 return 0;
34344 }
34345 diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34346 index d90528e..0127e2b 100644
34347 --- a/arch/x86/oprofile/op_model_ppro.c
34348 +++ b/arch/x86/oprofile/op_model_ppro.c
34349 @@ -19,6 +19,7 @@
34350 #include <asm/msr.h>
34351 #include <asm/apic.h>
34352 #include <asm/nmi.h>
34353 +#include <asm/pgtable.h>
34354
34355 #include "op_x86_model.h"
34356 #include "op_counter.h"
34357 @@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34358
34359 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34360
34361 - op_arch_perfmon_spec.num_counters = num_counters;
34362 - op_arch_perfmon_spec.num_controls = num_counters;
34363 + pax_open_kernel();
34364 + *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34365 + *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34366 + pax_close_kernel();
34367 }
34368
34369 static int arch_perfmon_init(struct oprofile_operations *ignore)
34370 diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34371 index 71e8a67..6a313bb 100644
34372 --- a/arch/x86/oprofile/op_x86_model.h
34373 +++ b/arch/x86/oprofile/op_x86_model.h
34374 @@ -52,7 +52,7 @@ struct op_x86_model_spec {
34375 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34376 struct op_msrs const * const msrs);
34377 #endif
34378 -};
34379 +} __do_const;
34380
34381 struct op_counter_config;
34382
34383 diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34384 index b9958c3..24229ab 100644
34385 --- a/arch/x86/pci/intel_mid_pci.c
34386 +++ b/arch/x86/pci/intel_mid_pci.c
34387 @@ -250,7 +250,7 @@ int __init intel_mid_pci_init(void)
34388 pci_mmcfg_late_init();
34389 pcibios_enable_irq = intel_mid_pci_irq_enable;
34390 pcibios_disable_irq = intel_mid_pci_irq_disable;
34391 - pci_root_ops = intel_mid_pci_ops;
34392 + memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34393 pci_soc_mode = 1;
34394 /* Continue with standard init */
34395 return 1;
34396 diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34397 index eb500c2..eab9e70 100644
34398 --- a/arch/x86/pci/irq.c
34399 +++ b/arch/x86/pci/irq.c
34400 @@ -51,7 +51,7 @@ struct irq_router {
34401 struct irq_router_handler {
34402 u16 vendor;
34403 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34404 -};
34405 +} __do_const;
34406
34407 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34408 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34409 @@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34410 return 0;
34411 }
34412
34413 -static __initdata struct irq_router_handler pirq_routers[] = {
34414 +static __initconst const struct irq_router_handler pirq_routers[] = {
34415 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34416 { PCI_VENDOR_ID_AL, ali_router_probe },
34417 { PCI_VENDOR_ID_ITE, ite_router_probe },
34418 @@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34419 static void __init pirq_find_router(struct irq_router *r)
34420 {
34421 struct irq_routing_table *rt = pirq_table;
34422 - struct irq_router_handler *h;
34423 + const struct irq_router_handler *h;
34424
34425 #ifdef CONFIG_PCI_BIOS
34426 if (!rt->signature) {
34427 @@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34428 return 0;
34429 }
34430
34431 -static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34432 +static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34433 {
34434 .callback = fix_broken_hp_bios_irq9,
34435 .ident = "HP Pavilion N5400 Series Laptop",
34436 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34437 index 9b83b90..4112152 100644
34438 --- a/arch/x86/pci/pcbios.c
34439 +++ b/arch/x86/pci/pcbios.c
34440 @@ -79,7 +79,7 @@ union bios32 {
34441 static struct {
34442 unsigned long address;
34443 unsigned short segment;
34444 -} bios32_indirect __initdata = { 0, __KERNEL_CS };
34445 +} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34446
34447 /*
34448 * Returns the entry point for the given service, NULL on error
34449 @@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34450 unsigned long length; /* %ecx */
34451 unsigned long entry; /* %edx */
34452 unsigned long flags;
34453 + struct desc_struct d, *gdt;
34454
34455 local_irq_save(flags);
34456 - __asm__("lcall *(%%edi); cld"
34457 +
34458 + gdt = get_cpu_gdt_table(smp_processor_id());
34459 +
34460 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34461 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34462 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34463 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34464 +
34465 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34466 : "=a" (return_code),
34467 "=b" (address),
34468 "=c" (length),
34469 "=d" (entry)
34470 : "0" (service),
34471 "1" (0),
34472 - "D" (&bios32_indirect));
34473 + "D" (&bios32_indirect),
34474 + "r"(__PCIBIOS_DS)
34475 + : "memory");
34476 +
34477 + pax_open_kernel();
34478 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34479 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34480 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34481 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34482 + pax_close_kernel();
34483 +
34484 local_irq_restore(flags);
34485
34486 switch (return_code) {
34487 - case 0:
34488 - return address + entry;
34489 - case 0x80: /* Not present */
34490 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34491 - return 0;
34492 - default: /* Shouldn't happen */
34493 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34494 - service, return_code);
34495 + case 0: {
34496 + int cpu;
34497 + unsigned char flags;
34498 +
34499 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34500 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34501 + printk(KERN_WARNING "bios32_service: not valid\n");
34502 return 0;
34503 + }
34504 + address = address + PAGE_OFFSET;
34505 + length += 16UL; /* some BIOSs underreport this... */
34506 + flags = 4;
34507 + if (length >= 64*1024*1024) {
34508 + length >>= PAGE_SHIFT;
34509 + flags |= 8;
34510 + }
34511 +
34512 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34513 + gdt = get_cpu_gdt_table(cpu);
34514 + pack_descriptor(&d, address, length, 0x9b, flags);
34515 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34516 + pack_descriptor(&d, address, length, 0x93, flags);
34517 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34518 + }
34519 + return entry;
34520 + }
34521 + case 0x80: /* Not present */
34522 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34523 + return 0;
34524 + default: /* Shouldn't happen */
34525 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34526 + service, return_code);
34527 + return 0;
34528 }
34529 }
34530
34531 static struct {
34532 unsigned long address;
34533 unsigned short segment;
34534 -} pci_indirect = { 0, __KERNEL_CS };
34535 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34536
34537 -static int pci_bios_present;
34538 +static int pci_bios_present __read_only;
34539
34540 static int __init check_pcibios(void)
34541 {
34542 @@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34543 unsigned long flags, pcibios_entry;
34544
34545 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34546 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34547 + pci_indirect.address = pcibios_entry;
34548
34549 local_irq_save(flags);
34550 - __asm__(
34551 - "lcall *(%%edi); cld\n\t"
34552 + __asm__("movw %w6, %%ds\n\t"
34553 + "lcall *%%ss:(%%edi); cld\n\t"
34554 + "push %%ss\n\t"
34555 + "pop %%ds\n\t"
34556 "jc 1f\n\t"
34557 "xor %%ah, %%ah\n"
34558 "1:"
34559 @@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34560 "=b" (ebx),
34561 "=c" (ecx)
34562 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34563 - "D" (&pci_indirect)
34564 + "D" (&pci_indirect),
34565 + "r" (__PCIBIOS_DS)
34566 : "memory");
34567 local_irq_restore(flags);
34568
34569 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34570
34571 switch (len) {
34572 case 1:
34573 - __asm__("lcall *(%%esi); cld\n\t"
34574 + __asm__("movw %w6, %%ds\n\t"
34575 + "lcall *%%ss:(%%esi); cld\n\t"
34576 + "push %%ss\n\t"
34577 + "pop %%ds\n\t"
34578 "jc 1f\n\t"
34579 "xor %%ah, %%ah\n"
34580 "1:"
34581 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34582 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34583 "b" (bx),
34584 "D" ((long)reg),
34585 - "S" (&pci_indirect));
34586 + "S" (&pci_indirect),
34587 + "r" (__PCIBIOS_DS));
34588 /*
34589 * Zero-extend the result beyond 8 bits, do not trust the
34590 * BIOS having done it:
34591 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34592 *value &= 0xff;
34593 break;
34594 case 2:
34595 - __asm__("lcall *(%%esi); cld\n\t"
34596 + __asm__("movw %w6, %%ds\n\t"
34597 + "lcall *%%ss:(%%esi); cld\n\t"
34598 + "push %%ss\n\t"
34599 + "pop %%ds\n\t"
34600 "jc 1f\n\t"
34601 "xor %%ah, %%ah\n"
34602 "1:"
34603 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34604 : "1" (PCIBIOS_READ_CONFIG_WORD),
34605 "b" (bx),
34606 "D" ((long)reg),
34607 - "S" (&pci_indirect));
34608 + "S" (&pci_indirect),
34609 + "r" (__PCIBIOS_DS));
34610 /*
34611 * Zero-extend the result beyond 16 bits, do not trust the
34612 * BIOS having done it:
34613 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34614 *value &= 0xffff;
34615 break;
34616 case 4:
34617 - __asm__("lcall *(%%esi); cld\n\t"
34618 + __asm__("movw %w6, %%ds\n\t"
34619 + "lcall *%%ss:(%%esi); cld\n\t"
34620 + "push %%ss\n\t"
34621 + "pop %%ds\n\t"
34622 "jc 1f\n\t"
34623 "xor %%ah, %%ah\n"
34624 "1:"
34625 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34626 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34627 "b" (bx),
34628 "D" ((long)reg),
34629 - "S" (&pci_indirect));
34630 + "S" (&pci_indirect),
34631 + "r" (__PCIBIOS_DS));
34632 break;
34633 }
34634
34635 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34636
34637 switch (len) {
34638 case 1:
34639 - __asm__("lcall *(%%esi); cld\n\t"
34640 + __asm__("movw %w6, %%ds\n\t"
34641 + "lcall *%%ss:(%%esi); cld\n\t"
34642 + "push %%ss\n\t"
34643 + "pop %%ds\n\t"
34644 "jc 1f\n\t"
34645 "xor %%ah, %%ah\n"
34646 "1:"
34647 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34648 "c" (value),
34649 "b" (bx),
34650 "D" ((long)reg),
34651 - "S" (&pci_indirect));
34652 + "S" (&pci_indirect),
34653 + "r" (__PCIBIOS_DS));
34654 break;
34655 case 2:
34656 - __asm__("lcall *(%%esi); cld\n\t"
34657 + __asm__("movw %w6, %%ds\n\t"
34658 + "lcall *%%ss:(%%esi); cld\n\t"
34659 + "push %%ss\n\t"
34660 + "pop %%ds\n\t"
34661 "jc 1f\n\t"
34662 "xor %%ah, %%ah\n"
34663 "1:"
34664 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34665 "c" (value),
34666 "b" (bx),
34667 "D" ((long)reg),
34668 - "S" (&pci_indirect));
34669 + "S" (&pci_indirect),
34670 + "r" (__PCIBIOS_DS));
34671 break;
34672 case 4:
34673 - __asm__("lcall *(%%esi); cld\n\t"
34674 + __asm__("movw %w6, %%ds\n\t"
34675 + "lcall *%%ss:(%%esi); cld\n\t"
34676 + "push %%ss\n\t"
34677 + "pop %%ds\n\t"
34678 "jc 1f\n\t"
34679 "xor %%ah, %%ah\n"
34680 "1:"
34681 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34682 "c" (value),
34683 "b" (bx),
34684 "D" ((long)reg),
34685 - "S" (&pci_indirect));
34686 + "S" (&pci_indirect),
34687 + "r" (__PCIBIOS_DS));
34688 break;
34689 }
34690
34691 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34692
34693 DBG("PCI: Fetching IRQ routing table... ");
34694 __asm__("push %%es\n\t"
34695 + "movw %w8, %%ds\n\t"
34696 "push %%ds\n\t"
34697 "pop %%es\n\t"
34698 - "lcall *(%%esi); cld\n\t"
34699 + "lcall *%%ss:(%%esi); cld\n\t"
34700 "pop %%es\n\t"
34701 + "push %%ss\n\t"
34702 + "pop %%ds\n"
34703 "jc 1f\n\t"
34704 "xor %%ah, %%ah\n"
34705 "1:"
34706 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34707 "1" (0),
34708 "D" ((long) &opt),
34709 "S" (&pci_indirect),
34710 - "m" (opt)
34711 + "m" (opt),
34712 + "r" (__PCIBIOS_DS)
34713 : "memory");
34714 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34715 if (ret & 0xff00)
34716 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34717 {
34718 int ret;
34719
34720 - __asm__("lcall *(%%esi); cld\n\t"
34721 + __asm__("movw %w5, %%ds\n\t"
34722 + "lcall *%%ss:(%%esi); cld\n\t"
34723 + "push %%ss\n\t"
34724 + "pop %%ds\n"
34725 "jc 1f\n\t"
34726 "xor %%ah, %%ah\n"
34727 "1:"
34728 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34729 : "0" (PCIBIOS_SET_PCI_HW_INT),
34730 "b" ((dev->bus->number << 8) | dev->devfn),
34731 "c" ((irq << 8) | (pin + 10)),
34732 - "S" (&pci_indirect));
34733 + "S" (&pci_indirect),
34734 + "r" (__PCIBIOS_DS));
34735 return !(ret & 0xff00);
34736 }
34737 EXPORT_SYMBOL(pcibios_set_irq_routing);
34738 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34739 index 40e7cda..c7e6672 100644
34740 --- a/arch/x86/platform/efi/efi_32.c
34741 +++ b/arch/x86/platform/efi/efi_32.c
34742 @@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34743 {
34744 struct desc_ptr gdt_descr;
34745
34746 +#ifdef CONFIG_PAX_KERNEXEC
34747 + struct desc_struct d;
34748 +#endif
34749 +
34750 local_irq_save(efi_rt_eflags);
34751
34752 load_cr3(initial_page_table);
34753 __flush_tlb_all();
34754
34755 +#ifdef CONFIG_PAX_KERNEXEC
34756 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34757 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34758 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34759 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34760 +#endif
34761 +
34762 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34763 gdt_descr.size = GDT_SIZE - 1;
34764 load_gdt(&gdt_descr);
34765 @@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34766 {
34767 struct desc_ptr gdt_descr;
34768
34769 +#ifdef CONFIG_PAX_KERNEXEC
34770 + struct desc_struct d;
34771 +
34772 + memset(&d, 0, sizeof d);
34773 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34774 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34775 +#endif
34776 +
34777 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34778 gdt_descr.size = GDT_SIZE - 1;
34779 load_gdt(&gdt_descr);
34780
34781 +#ifdef CONFIG_PAX_PER_CPU_PGD
34782 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34783 +#else
34784 load_cr3(swapper_pg_dir);
34785 +#endif
34786 +
34787 __flush_tlb_all();
34788
34789 local_irq_restore(efi_rt_eflags);
34790 diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34791 index 35aecb6..46177db 100644
34792 --- a/arch/x86/platform/efi/efi_64.c
34793 +++ b/arch/x86/platform/efi/efi_64.c
34794 @@ -99,6 +99,11 @@ void __init efi_call_phys_prolog(void)
34795 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34796 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34797 }
34798 +
34799 +#ifdef CONFIG_PAX_PER_CPU_PGD
34800 + load_cr3(swapper_pg_dir);
34801 +#endif
34802 +
34803 __flush_tlb_all();
34804 }
34805
34806 @@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34807 for (pgd = 0; pgd < n_pgds; pgd++)
34808 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34809 kfree(save_pgd);
34810 +
34811 +#ifdef CONFIG_PAX_PER_CPU_PGD
34812 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34813 +#endif
34814 +
34815 __flush_tlb_all();
34816 local_irq_restore(efi_flags);
34817 early_code_mapping_set_exec(0);
34818 @@ -146,8 +156,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34819 unsigned npages;
34820 pgd_t *pgd;
34821
34822 - if (efi_enabled(EFI_OLD_MEMMAP))
34823 + if (efi_enabled(EFI_OLD_MEMMAP)) {
34824 + /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34825 + * able to execute the EFI services.
34826 + */
34827 + if (__supported_pte_mask & _PAGE_NX) {
34828 + unsigned long addr = (unsigned long) __va(0);
34829 + pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34830 +
34831 + pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34832 +#ifdef CONFIG_PAX_PER_CPU_PGD
34833 + set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34834 +#endif
34835 + set_pgd(pgd_offset_k(addr), pe);
34836 + }
34837 +
34838 return 0;
34839 + }
34840
34841 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34842 pgd = __va(efi_scratch.efi_pgt);
34843 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34844 index 040192b..7d3300f 100644
34845 --- a/arch/x86/platform/efi/efi_stub_32.S
34846 +++ b/arch/x86/platform/efi/efi_stub_32.S
34847 @@ -6,7 +6,9 @@
34848 */
34849
34850 #include <linux/linkage.h>
34851 +#include <linux/init.h>
34852 #include <asm/page_types.h>
34853 +#include <asm/segment.h>
34854
34855 /*
34856 * efi_call_phys(void *, ...) is a function with variable parameters.
34857 @@ -20,7 +22,7 @@
34858 * service functions will comply with gcc calling convention, too.
34859 */
34860
34861 -.text
34862 +__INIT
34863 ENTRY(efi_call_phys)
34864 /*
34865 * 0. The function can only be called in Linux kernel. So CS has been
34866 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34867 * The mapping of lower virtual memory has been created in prolog and
34868 * epilog.
34869 */
34870 - movl $1f, %edx
34871 - subl $__PAGE_OFFSET, %edx
34872 - jmp *%edx
34873 +#ifdef CONFIG_PAX_KERNEXEC
34874 + movl $(__KERNEXEC_EFI_DS), %edx
34875 + mov %edx, %ds
34876 + mov %edx, %es
34877 + mov %edx, %ss
34878 + addl $2f,(1f)
34879 + ljmp *(1f)
34880 +
34881 +__INITDATA
34882 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34883 +.previous
34884 +
34885 +2:
34886 + subl $2b,(1b)
34887 +#else
34888 + jmp 1f-__PAGE_OFFSET
34889 1:
34890 +#endif
34891
34892 /*
34893 * 2. Now on the top of stack is the return
34894 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34895 * parameter 2, ..., param n. To make things easy, we save the return
34896 * address of efi_call_phys in a global variable.
34897 */
34898 - popl %edx
34899 - movl %edx, saved_return_addr
34900 - /* get the function pointer into ECX*/
34901 - popl %ecx
34902 - movl %ecx, efi_rt_function_ptr
34903 - movl $2f, %edx
34904 - subl $__PAGE_OFFSET, %edx
34905 - pushl %edx
34906 + popl (saved_return_addr)
34907 + popl (efi_rt_function_ptr)
34908
34909 /*
34910 * 3. Clear PG bit in %CR0.
34911 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34912 /*
34913 * 5. Call the physical function.
34914 */
34915 - jmp *%ecx
34916 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
34917
34918 -2:
34919 /*
34920 * 6. After EFI runtime service returns, control will return to
34921 * following instruction. We'd better readjust stack pointer first.
34922 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34923 movl %cr0, %edx
34924 orl $0x80000000, %edx
34925 movl %edx, %cr0
34926 - jmp 1f
34927 -1:
34928 +
34929 /*
34930 * 8. Now restore the virtual mode from flat mode by
34931 * adding EIP with PAGE_OFFSET.
34932 */
34933 - movl $1f, %edx
34934 - jmp *%edx
34935 +#ifdef CONFIG_PAX_KERNEXEC
34936 + movl $(__KERNEL_DS), %edx
34937 + mov %edx, %ds
34938 + mov %edx, %es
34939 + mov %edx, %ss
34940 + ljmp $(__KERNEL_CS),$1f
34941 +#else
34942 + jmp 1f+__PAGE_OFFSET
34943 +#endif
34944 1:
34945
34946 /*
34947 * 9. Balance the stack. And because EAX contain the return value,
34948 * we'd better not clobber it.
34949 */
34950 - leal efi_rt_function_ptr, %edx
34951 - movl (%edx), %ecx
34952 - pushl %ecx
34953 + pushl (efi_rt_function_ptr)
34954
34955 /*
34956 - * 10. Push the saved return address onto the stack and return.
34957 + * 10. Return to the saved return address.
34958 */
34959 - leal saved_return_addr, %edx
34960 - movl (%edx), %ecx
34961 - pushl %ecx
34962 - ret
34963 + jmpl *(saved_return_addr)
34964 ENDPROC(efi_call_phys)
34965 .previous
34966
34967 -.data
34968 +__INITDATA
34969 saved_return_addr:
34970 .long 0
34971 efi_rt_function_ptr:
34972 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34973 index 5fcda72..cd4dc41 100644
34974 --- a/arch/x86/platform/efi/efi_stub_64.S
34975 +++ b/arch/x86/platform/efi/efi_stub_64.S
34976 @@ -11,6 +11,7 @@
34977 #include <asm/msr.h>
34978 #include <asm/processor-flags.h>
34979 #include <asm/page_types.h>
34980 +#include <asm/alternative-asm.h>
34981
34982 #define SAVE_XMM \
34983 mov %rsp, %rax; \
34984 @@ -88,6 +89,7 @@ ENTRY(efi_call)
34985 RESTORE_PGT
34986 addq $48, %rsp
34987 RESTORE_XMM
34988 + pax_force_retaddr 0, 1
34989 ret
34990 ENDPROC(efi_call)
34991
34992 @@ -245,8 +247,8 @@ efi_gdt64:
34993 .long 0 /* Filled out by user */
34994 .word 0
34995 .quad 0x0000000000000000 /* NULL descriptor */
34996 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
34997 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
34998 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
34999 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
35000 .quad 0x0080890000000000 /* TS descriptor */
35001 .quad 0x0000000000000000 /* TS continued */
35002 efi_gdt64_end:
35003 diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35004 index 1bbedc4..eb795b5 100644
35005 --- a/arch/x86/platform/intel-mid/intel-mid.c
35006 +++ b/arch/x86/platform/intel-mid/intel-mid.c
35007 @@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35008 {
35009 };
35010
35011 -static void intel_mid_reboot(void)
35012 +static void __noreturn intel_mid_reboot(void)
35013 {
35014 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35015 + BUG();
35016 }
35017
35018 static unsigned long __init intel_mid_calibrate_tsc(void)
35019 diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35020 index 3c1c386..59a68ed 100644
35021 --- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35022 +++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35023 @@ -13,6 +13,6 @@
35024 /* For every CPU addition a new get_<cpuname>_ops interface needs
35025 * to be added.
35026 */
35027 -extern void *get_penwell_ops(void);
35028 -extern void *get_cloverview_ops(void);
35029 -extern void *get_tangier_ops(void);
35030 +extern const void *get_penwell_ops(void);
35031 +extern const void *get_cloverview_ops(void);
35032 +extern const void *get_tangier_ops(void);
35033 diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35034 index 23381d2..8ddc10e 100644
35035 --- a/arch/x86/platform/intel-mid/mfld.c
35036 +++ b/arch/x86/platform/intel-mid/mfld.c
35037 @@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35038 pm_power_off = mfld_power_off;
35039 }
35040
35041 -void *get_penwell_ops(void)
35042 +const void *get_penwell_ops(void)
35043 {
35044 return &penwell_ops;
35045 }
35046
35047 -void *get_cloverview_ops(void)
35048 +const void *get_cloverview_ops(void)
35049 {
35050 return &penwell_ops;
35051 }
35052 diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35053 index aaca917..66eadbc 100644
35054 --- a/arch/x86/platform/intel-mid/mrfl.c
35055 +++ b/arch/x86/platform/intel-mid/mrfl.c
35056 @@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35057 .arch_setup = tangier_arch_setup,
35058 };
35059
35060 -void *get_tangier_ops(void)
35061 +const void *get_tangier_ops(void)
35062 {
35063 return &tangier_ops;
35064 }
35065 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35066 index d6ee929..3637cb5 100644
35067 --- a/arch/x86/platform/olpc/olpc_dt.c
35068 +++ b/arch/x86/platform/olpc/olpc_dt.c
35069 @@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35070 return res;
35071 }
35072
35073 -static struct of_pdt_ops prom_olpc_ops __initdata = {
35074 +static struct of_pdt_ops prom_olpc_ops __initconst = {
35075 .nextprop = olpc_dt_nextprop,
35076 .getproplen = olpc_dt_getproplen,
35077 .getproperty = olpc_dt_getproperty,
35078 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35079 index 6ec7910..ecdbb11 100644
35080 --- a/arch/x86/power/cpu.c
35081 +++ b/arch/x86/power/cpu.c
35082 @@ -137,11 +137,8 @@ static void do_fpu_end(void)
35083 static void fix_processor_context(void)
35084 {
35085 int cpu = smp_processor_id();
35086 - struct tss_struct *t = &per_cpu(init_tss, cpu);
35087 -#ifdef CONFIG_X86_64
35088 - struct desc_struct *desc = get_cpu_gdt_table(cpu);
35089 - tss_desc tss;
35090 -#endif
35091 + struct tss_struct *t = init_tss + cpu;
35092 +
35093 set_tss_desc(cpu, t); /*
35094 * This just modifies memory; should not be
35095 * necessary. But... This is necessary, because
35096 @@ -150,10 +147,6 @@ static void fix_processor_context(void)
35097 */
35098
35099 #ifdef CONFIG_X86_64
35100 - memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35101 - tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35102 - write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35103 -
35104 syscall_init(); /* This sets MSR_*STAR and related */
35105 #endif
35106 load_TR_desc(); /* This does ltr */
35107 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35108 index bad628a..a102610 100644
35109 --- a/arch/x86/realmode/init.c
35110 +++ b/arch/x86/realmode/init.c
35111 @@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35112 __va(real_mode_header->trampoline_header);
35113
35114 #ifdef CONFIG_X86_32
35115 - trampoline_header->start = __pa_symbol(startup_32_smp);
35116 + trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35117 +
35118 +#ifdef CONFIG_PAX_KERNEXEC
35119 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35120 +#endif
35121 +
35122 + trampoline_header->boot_cs = __BOOT_CS;
35123 trampoline_header->gdt_limit = __BOOT_DS + 7;
35124 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35125 #else
35126 @@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35127 *trampoline_cr4_features = read_cr4();
35128
35129 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35130 - trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35131 + trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35132 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35133 #endif
35134 }
35135 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35136 index 7c0d7be..d24dc88 100644
35137 --- a/arch/x86/realmode/rm/Makefile
35138 +++ b/arch/x86/realmode/rm/Makefile
35139 @@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35140
35141 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35142 -I$(srctree)/arch/x86/boot
35143 +ifdef CONSTIFY_PLUGIN
35144 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35145 +endif
35146 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35147 GCOV_PROFILE := n
35148 diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35149 index a28221d..93c40f1 100644
35150 --- a/arch/x86/realmode/rm/header.S
35151 +++ b/arch/x86/realmode/rm/header.S
35152 @@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35153 #endif
35154 /* APM/BIOS reboot */
35155 .long pa_machine_real_restart_asm
35156 -#ifdef CONFIG_X86_64
35157 +#ifdef CONFIG_X86_32
35158 + .long __KERNEL_CS
35159 +#else
35160 .long __KERNEL32_CS
35161 #endif
35162 END(real_mode_header)
35163 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35164 index 48ddd76..c26749f 100644
35165 --- a/arch/x86/realmode/rm/trampoline_32.S
35166 +++ b/arch/x86/realmode/rm/trampoline_32.S
35167 @@ -24,6 +24,12 @@
35168 #include <asm/page_types.h>
35169 #include "realmode.h"
35170
35171 +#ifdef CONFIG_PAX_KERNEXEC
35172 +#define ta(X) (X)
35173 +#else
35174 +#define ta(X) (pa_ ## X)
35175 +#endif
35176 +
35177 .text
35178 .code16
35179
35180 @@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35181
35182 cli # We should be safe anyway
35183
35184 - movl tr_start, %eax # where we need to go
35185 -
35186 movl $0xA5A5A5A5, trampoline_status
35187 # write marker for master knows we're running
35188
35189 @@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35190 movw $1, %dx # protected mode (PE) bit
35191 lmsw %dx # into protected mode
35192
35193 - ljmpl $__BOOT_CS, $pa_startup_32
35194 + ljmpl *(trampoline_header)
35195
35196 .section ".text32","ax"
35197 .code32
35198 @@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35199 .balign 8
35200 GLOBAL(trampoline_header)
35201 tr_start: .space 4
35202 - tr_gdt_pad: .space 2
35203 + tr_boot_cs: .space 2
35204 tr_gdt: .space 6
35205 END(trampoline_header)
35206
35207 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35208 index dac7b20..72dbaca 100644
35209 --- a/arch/x86/realmode/rm/trampoline_64.S
35210 +++ b/arch/x86/realmode/rm/trampoline_64.S
35211 @@ -93,6 +93,7 @@ ENTRY(startup_32)
35212 movl %edx, %gs
35213
35214 movl pa_tr_cr4, %eax
35215 + andl $~X86_CR4_PCIDE, %eax
35216 movl %eax, %cr4 # Enable PAE mode
35217
35218 # Setup trampoline 4 level pagetables
35219 @@ -106,7 +107,7 @@ ENTRY(startup_32)
35220 wrmsr
35221
35222 # Enable paging and in turn activate Long Mode
35223 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35224 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
35225 movl %eax, %cr0
35226
35227 /*
35228 diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35229 index 9e7e147..25a4158 100644
35230 --- a/arch/x86/realmode/rm/wakeup_asm.S
35231 +++ b/arch/x86/realmode/rm/wakeup_asm.S
35232 @@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35233 lgdtl pmode_gdt
35234
35235 /* This really couldn't... */
35236 - movl pmode_entry, %eax
35237 movl pmode_cr0, %ecx
35238 movl %ecx, %cr0
35239 - ljmpl $__KERNEL_CS, $pa_startup_32
35240 - /* -> jmp *%eax in trampoline_32.S */
35241 +
35242 + ljmpl *pmode_entry
35243 #else
35244 jmp trampoline_start
35245 #endif
35246 diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35247 index 604a37e..e49702a 100644
35248 --- a/arch/x86/tools/Makefile
35249 +++ b/arch/x86/tools/Makefile
35250 @@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35251
35252 $(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
35253
35254 -HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35255 +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35256 hostprogs-y += relocs
35257 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35258 PHONY += relocs
35259 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35260 index a5efb21..97490e9 100644
35261 --- a/arch/x86/tools/relocs.c
35262 +++ b/arch/x86/tools/relocs.c
35263 @@ -1,5 +1,7 @@
35264 /* This is included from relocs_32/64.c */
35265
35266 +#include "../../../include/generated/autoconf.h"
35267 +
35268 #define ElfW(type) _ElfW(ELF_BITS, type)
35269 #define _ElfW(bits, type) __ElfW(bits, type)
35270 #define __ElfW(bits, type) Elf##bits##_##type
35271 @@ -11,6 +13,7 @@
35272 #define Elf_Sym ElfW(Sym)
35273
35274 static Elf_Ehdr ehdr;
35275 +static Elf_Phdr *phdr;
35276
35277 struct relocs {
35278 uint32_t *offset;
35279 @@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35280 }
35281 }
35282
35283 +static void read_phdrs(FILE *fp)
35284 +{
35285 + unsigned int i;
35286 +
35287 + phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35288 + if (!phdr) {
35289 + die("Unable to allocate %d program headers\n",
35290 + ehdr.e_phnum);
35291 + }
35292 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35293 + die("Seek to %d failed: %s\n",
35294 + ehdr.e_phoff, strerror(errno));
35295 + }
35296 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35297 + die("Cannot read ELF program headers: %s\n",
35298 + strerror(errno));
35299 + }
35300 + for(i = 0; i < ehdr.e_phnum; i++) {
35301 + phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35302 + phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35303 + phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35304 + phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35305 + phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35306 + phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35307 + phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35308 + phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35309 + }
35310 +
35311 +}
35312 +
35313 static void read_shdrs(FILE *fp)
35314 {
35315 - int i;
35316 + unsigned int i;
35317 Elf_Shdr shdr;
35318
35319 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35320 @@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35321
35322 static void read_strtabs(FILE *fp)
35323 {
35324 - int i;
35325 + unsigned int i;
35326 for (i = 0; i < ehdr.e_shnum; i++) {
35327 struct section *sec = &secs[i];
35328 if (sec->shdr.sh_type != SHT_STRTAB) {
35329 @@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35330
35331 static void read_symtabs(FILE *fp)
35332 {
35333 - int i,j;
35334 + unsigned int i,j;
35335 for (i = 0; i < ehdr.e_shnum; i++) {
35336 struct section *sec = &secs[i];
35337 if (sec->shdr.sh_type != SHT_SYMTAB) {
35338 @@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35339 }
35340
35341
35342 -static void read_relocs(FILE *fp)
35343 +static void read_relocs(FILE *fp, int use_real_mode)
35344 {
35345 - int i,j;
35346 + unsigned int i,j;
35347 + uint32_t base;
35348 +
35349 for (i = 0; i < ehdr.e_shnum; i++) {
35350 struct section *sec = &secs[i];
35351 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35352 @@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35353 die("Cannot read symbol table: %s\n",
35354 strerror(errno));
35355 }
35356 + base = 0;
35357 +
35358 +#ifdef CONFIG_X86_32
35359 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35360 + if (phdr[j].p_type != PT_LOAD )
35361 + continue;
35362 + 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)
35363 + continue;
35364 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35365 + break;
35366 + }
35367 +#endif
35368 +
35369 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35370 Elf_Rel *rel = &sec->reltab[j];
35371 - rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35372 + rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35373 rel->r_info = elf_xword_to_cpu(rel->r_info);
35374 #if (SHT_REL_TYPE == SHT_RELA)
35375 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35376 @@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35377
35378 static void print_absolute_symbols(void)
35379 {
35380 - int i;
35381 + unsigned int i;
35382 const char *format;
35383
35384 if (ELF_BITS == 64)
35385 @@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35386 for (i = 0; i < ehdr.e_shnum; i++) {
35387 struct section *sec = &secs[i];
35388 char *sym_strtab;
35389 - int j;
35390 + unsigned int j;
35391
35392 if (sec->shdr.sh_type != SHT_SYMTAB) {
35393 continue;
35394 @@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35395
35396 static void print_absolute_relocs(void)
35397 {
35398 - int i, printed = 0;
35399 + unsigned int i, printed = 0;
35400 const char *format;
35401
35402 if (ELF_BITS == 64)
35403 @@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35404 struct section *sec_applies, *sec_symtab;
35405 char *sym_strtab;
35406 Elf_Sym *sh_symtab;
35407 - int j;
35408 + unsigned int j;
35409 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35410 continue;
35411 }
35412 @@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35413 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35414 Elf_Sym *sym, const char *symname))
35415 {
35416 - int i;
35417 + unsigned int i;
35418 /* Walk through the relocations */
35419 for (i = 0; i < ehdr.e_shnum; i++) {
35420 char *sym_strtab;
35421 Elf_Sym *sh_symtab;
35422 struct section *sec_applies, *sec_symtab;
35423 - int j;
35424 + unsigned int j;
35425 struct section *sec = &secs[i];
35426
35427 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35428 @@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35429 {
35430 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35431 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35432 + char *sym_strtab = sec->link->link->strtab;
35433 +
35434 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35435 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35436 + return 0;
35437 +
35438 +#ifdef CONFIG_PAX_KERNEXEC
35439 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35440 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35441 + return 0;
35442 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35443 + return 0;
35444 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35445 + return 0;
35446 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35447 + return 0;
35448 +#endif
35449
35450 switch (r_type) {
35451 case R_386_NONE:
35452 @@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35453
35454 static void emit_relocs(int as_text, int use_real_mode)
35455 {
35456 - int i;
35457 + unsigned int i;
35458 int (*write_reloc)(uint32_t, FILE *) = write32;
35459 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35460 const char *symname);
35461 @@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35462 {
35463 regex_init(use_real_mode);
35464 read_ehdr(fp);
35465 + read_phdrs(fp);
35466 read_shdrs(fp);
35467 read_strtabs(fp);
35468 read_symtabs(fp);
35469 - read_relocs(fp);
35470 + read_relocs(fp, use_real_mode);
35471 if (ELF_BITS == 64)
35472 percpu_init();
35473 if (show_absolute_syms) {
35474 diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35475 index f40281e..92728c9 100644
35476 --- a/arch/x86/um/mem_32.c
35477 +++ b/arch/x86/um/mem_32.c
35478 @@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35479 gate_vma.vm_start = FIXADDR_USER_START;
35480 gate_vma.vm_end = FIXADDR_USER_END;
35481 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35482 - gate_vma.vm_page_prot = __P101;
35483 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35484
35485 return 0;
35486 }
35487 diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35488 index 80ffa5b..a33bd15 100644
35489 --- a/arch/x86/um/tls_32.c
35490 +++ b/arch/x86/um/tls_32.c
35491 @@ -260,7 +260,7 @@ out:
35492 if (unlikely(task == current &&
35493 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35494 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35495 - "without flushed TLS.", current->pid);
35496 + "without flushed TLS.", task_pid_nr(current));
35497 }
35498
35499 return 0;
35500 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35501 index 5a4affe..9e2d522 100644
35502 --- a/arch/x86/vdso/Makefile
35503 +++ b/arch/x86/vdso/Makefile
35504 @@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
35505 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35506 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35507
35508 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35509 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35510 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35511 GCOV_PROFILE := n
35512
35513 diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35514 index 0224987..c7d65a5 100644
35515 --- a/arch/x86/vdso/vdso2c.h
35516 +++ b/arch/x86/vdso/vdso2c.h
35517 @@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35518 unsigned long load_size = -1; /* Work around bogus warning */
35519 unsigned long mapping_size;
35520 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35521 - int i;
35522 + unsigned int i;
35523 unsigned long j;
35524 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35525 *alt_sec = NULL;
35526 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35527 index e904c27..b9eaa03 100644
35528 --- a/arch/x86/vdso/vdso32-setup.c
35529 +++ b/arch/x86/vdso/vdso32-setup.c
35530 @@ -14,6 +14,7 @@
35531 #include <asm/cpufeature.h>
35532 #include <asm/processor.h>
35533 #include <asm/vdso.h>
35534 +#include <asm/mman.h>
35535
35536 #ifdef CONFIG_COMPAT_VDSO
35537 #define VDSO_DEFAULT 0
35538 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35539 index 970463b..da82d3e 100644
35540 --- a/arch/x86/vdso/vma.c
35541 +++ b/arch/x86/vdso/vma.c
35542 @@ -16,10 +16,9 @@
35543 #include <asm/vdso.h>
35544 #include <asm/page.h>
35545 #include <asm/hpet.h>
35546 +#include <asm/mman.h>
35547
35548 #if defined(CONFIG_X86_64)
35549 -unsigned int __read_mostly vdso64_enabled = 1;
35550 -
35551 extern unsigned short vdso_sync_cpuid;
35552 #endif
35553
35554 @@ -101,6 +100,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35555 .pages = no_pages,
35556 };
35557
35558 +#ifdef CONFIG_PAX_RANDMMAP
35559 + if (mm->pax_flags & MF_PAX_RANDMMAP)
35560 + calculate_addr = false;
35561 +#endif
35562 +
35563 if (calculate_addr) {
35564 addr = vdso_addr(current->mm->start_stack,
35565 image->size - image->sym_vvar_start);
35566 @@ -111,14 +115,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35567 down_write(&mm->mmap_sem);
35568
35569 addr = get_unmapped_area(NULL, addr,
35570 - image->size - image->sym_vvar_start, 0, 0);
35571 + image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35572 if (IS_ERR_VALUE(addr)) {
35573 ret = addr;
35574 goto up_fail;
35575 }
35576
35577 text_start = addr - image->sym_vvar_start;
35578 - current->mm->context.vdso = (void __user *)text_start;
35579 + mm->context.vdso = text_start;
35580
35581 /*
35582 * MAYWRITE to allow gdb to COW and set breakpoints
35583 @@ -163,15 +167,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35584 hpet_address >> PAGE_SHIFT,
35585 PAGE_SIZE,
35586 pgprot_noncached(PAGE_READONLY));
35587 -
35588 - if (ret)
35589 - goto up_fail;
35590 }
35591 #endif
35592
35593 up_fail:
35594 if (ret)
35595 - current->mm->context.vdso = NULL;
35596 + current->mm->context.vdso = 0;
35597
35598 up_write(&mm->mmap_sem);
35599 return ret;
35600 @@ -191,8 +192,8 @@ static int load_vdso32(void)
35601
35602 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35603 current_thread_info()->sysenter_return =
35604 - current->mm->context.vdso +
35605 - selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35606 + (void __force_user *)(current->mm->context.vdso +
35607 + selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35608
35609 return 0;
35610 }
35611 @@ -201,9 +202,6 @@ static int load_vdso32(void)
35612 #ifdef CONFIG_X86_64
35613 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35614 {
35615 - if (!vdso64_enabled)
35616 - return 0;
35617 -
35618 return map_vdso(&vdso_image_64, true);
35619 }
35620
35621 @@ -212,12 +210,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35622 int uses_interp)
35623 {
35624 #ifdef CONFIG_X86_X32_ABI
35625 - if (test_thread_flag(TIF_X32)) {
35626 - if (!vdso64_enabled)
35627 - return 0;
35628 -
35629 + if (test_thread_flag(TIF_X32))
35630 return map_vdso(&vdso_image_x32, true);
35631 - }
35632 #endif
35633
35634 return load_vdso32();
35635 @@ -229,12 +223,3 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35636 return load_vdso32();
35637 }
35638 #endif
35639 -
35640 -#ifdef CONFIG_X86_64
35641 -static __init int vdso_setup(char *s)
35642 -{
35643 - vdso64_enabled = simple_strtoul(s, NULL, 0);
35644 - return 0;
35645 -}
35646 -__setup("vdso=", vdso_setup);
35647 -#endif
35648 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35649 index e88fda8..76ce7ce 100644
35650 --- a/arch/x86/xen/Kconfig
35651 +++ b/arch/x86/xen/Kconfig
35652 @@ -9,6 +9,7 @@ config XEN
35653 select XEN_HAVE_PVMMU
35654 depends on X86_64 || (X86_32 && X86_PAE)
35655 depends on X86_TSC
35656 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35657 help
35658 This is the Linux Xen port. Enabling this will allow the
35659 kernel to boot in a paravirtualized environment under the
35660 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35661 index fac5e4f..5b5cf4f 100644
35662 --- a/arch/x86/xen/enlighten.c
35663 +++ b/arch/x86/xen/enlighten.c
35664 @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35665
35666 struct shared_info xen_dummy_shared_info;
35667
35668 -void *xen_initial_gdt;
35669 -
35670 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35671 __read_mostly int xen_have_vector_callback;
35672 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35673 @@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35674 {
35675 unsigned long va = dtr->address;
35676 unsigned int size = dtr->size + 1;
35677 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35678 - unsigned long frames[pages];
35679 + unsigned long frames[65536 / PAGE_SIZE];
35680 int f;
35681
35682 /*
35683 @@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35684 {
35685 unsigned long va = dtr->address;
35686 unsigned int size = dtr->size + 1;
35687 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35688 - unsigned long frames[pages];
35689 + unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35690 int f;
35691
35692 /*
35693 @@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35694 * 8-byte entries, or 16 4k pages..
35695 */
35696
35697 - BUG_ON(size > 65536);
35698 + BUG_ON(size > GDT_SIZE);
35699 BUG_ON(va & ~PAGE_MASK);
35700
35701 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35702 @@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35703 return 0;
35704 }
35705
35706 -static void set_xen_basic_apic_ops(void)
35707 +static void __init set_xen_basic_apic_ops(void)
35708 {
35709 apic->read = xen_apic_read;
35710 apic->write = xen_apic_write;
35711 @@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35712 #endif
35713 };
35714
35715 -static void xen_reboot(int reason)
35716 +static __noreturn void xen_reboot(int reason)
35717 {
35718 struct sched_shutdown r = { .reason = reason };
35719
35720 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35721 - BUG();
35722 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35723 + BUG();
35724 }
35725
35726 -static void xen_restart(char *msg)
35727 +static __noreturn void xen_restart(char *msg)
35728 {
35729 xen_reboot(SHUTDOWN_reboot);
35730 }
35731
35732 -static void xen_emergency_restart(void)
35733 +static __noreturn void xen_emergency_restart(void)
35734 {
35735 xen_reboot(SHUTDOWN_reboot);
35736 }
35737
35738 -static void xen_machine_halt(void)
35739 +static __noreturn void xen_machine_halt(void)
35740 {
35741 xen_reboot(SHUTDOWN_poweroff);
35742 }
35743
35744 -static void xen_machine_power_off(void)
35745 +static __noreturn void xen_machine_power_off(void)
35746 {
35747 if (pm_power_off)
35748 pm_power_off();
35749 @@ -1573,7 +1569,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35750 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35751
35752 /* Work out if we support NX */
35753 - x86_configure_nx();
35754 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35755 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35756 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35757 + unsigned l, h;
35758 +
35759 + __supported_pte_mask |= _PAGE_NX;
35760 + rdmsr(MSR_EFER, l, h);
35761 + l |= EFER_NX;
35762 + wrmsr(MSR_EFER, l, h);
35763 + }
35764 +#endif
35765
35766 /* Get mfn list */
35767 xen_build_dynamic_phys_to_machine();
35768 @@ -1601,13 +1607,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35769
35770 machine_ops = xen_machine_ops;
35771
35772 - /*
35773 - * The only reliable way to retain the initial address of the
35774 - * percpu gdt_page is to remember it here, so we can go and
35775 - * mark it RW later, when the initial percpu area is freed.
35776 - */
35777 - xen_initial_gdt = &per_cpu(gdt_page, 0);
35778 -
35779 xen_smp_init();
35780
35781 #ifdef CONFIG_ACPI_NUMA
35782 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35783 index a8a1a3d..8216142 100644
35784 --- a/arch/x86/xen/mmu.c
35785 +++ b/arch/x86/xen/mmu.c
35786 @@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35787 return val;
35788 }
35789
35790 -static pteval_t pte_pfn_to_mfn(pteval_t val)
35791 +static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35792 {
35793 if (val & _PAGE_PRESENT) {
35794 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35795 @@ -1867,7 +1867,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35796 * L3_k[511] -> level2_fixmap_pgt */
35797 convert_pfn_mfn(level3_kernel_pgt);
35798
35799 + convert_pfn_mfn(level3_vmalloc_start_pgt);
35800 + convert_pfn_mfn(level3_vmalloc_end_pgt);
35801 + convert_pfn_mfn(level3_vmemmap_pgt);
35802 /* L3_k[511][506] -> level1_fixmap_pgt */
35803 + /* L3_k[511][507] -> level1_vsyscall_pgt */
35804 convert_pfn_mfn(level2_fixmap_pgt);
35805 }
35806 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35807 @@ -1892,11 +1896,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35808 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35809 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35810 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35811 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35812 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35813 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35814 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35815 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35816 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35817 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35818 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35819 set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35820 + set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35821
35822 /* Pin down new L4 */
35823 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35824 @@ -2080,6 +2089,7 @@ static void __init xen_post_allocator_init(void)
35825 pv_mmu_ops.set_pud = xen_set_pud;
35826 #if PAGETABLE_LEVELS == 4
35827 pv_mmu_ops.set_pgd = xen_set_pgd;
35828 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35829 #endif
35830
35831 /* This will work as long as patching hasn't happened yet
35832 @@ -2158,6 +2168,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35833 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35834 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35835 .set_pgd = xen_set_pgd_hyper,
35836 + .set_pgd_batched = xen_set_pgd_hyper,
35837
35838 .alloc_pud = xen_alloc_pmd_init,
35839 .release_pud = xen_release_pmd_init,
35840 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35841 index 4c071ae..00e7049 100644
35842 --- a/arch/x86/xen/smp.c
35843 +++ b/arch/x86/xen/smp.c
35844 @@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35845
35846 if (xen_pv_domain()) {
35847 if (!xen_feature(XENFEAT_writable_page_tables))
35848 - /* We've switched to the "real" per-cpu gdt, so make
35849 - * sure the old memory can be recycled. */
35850 - make_lowmem_page_readwrite(xen_initial_gdt);
35851 -
35852 #ifdef CONFIG_X86_32
35853 /*
35854 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35855 * expects __USER_DS
35856 */
35857 - loadsegment(ds, __USER_DS);
35858 - loadsegment(es, __USER_DS);
35859 + loadsegment(ds, __KERNEL_DS);
35860 + loadsegment(es, __KERNEL_DS);
35861 #endif
35862
35863 xen_filter_cpu_maps();
35864 @@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35865 #ifdef CONFIG_X86_32
35866 /* Note: PVH is not yet supported on x86_32. */
35867 ctxt->user_regs.fs = __KERNEL_PERCPU;
35868 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35869 + savesegment(gs, ctxt->user_regs.gs);
35870 #endif
35871 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35872
35873 @@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35874 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35875 ctxt->flags = VGCF_IN_KERNEL;
35876 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35877 - ctxt->user_regs.ds = __USER_DS;
35878 - ctxt->user_regs.es = __USER_DS;
35879 + ctxt->user_regs.ds = __KERNEL_DS;
35880 + ctxt->user_regs.es = __KERNEL_DS;
35881 ctxt->user_regs.ss = __KERNEL_DS;
35882
35883 xen_copy_trap_info(ctxt->trap_ctxt);
35884 @@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35885 int rc;
35886
35887 per_cpu(current_task, cpu) = idle;
35888 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
35889 #ifdef CONFIG_X86_32
35890 irq_ctx_init(cpu);
35891 #else
35892 clear_tsk_thread_flag(idle, TIF_FORK);
35893 #endif
35894 - per_cpu(kernel_stack, cpu) =
35895 - (unsigned long)task_stack_page(idle) -
35896 - KERNEL_STACK_OFFSET + THREAD_SIZE;
35897 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35898
35899 xen_setup_runstate_info(cpu);
35900 xen_setup_timer(cpu);
35901 @@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35902
35903 void __init xen_smp_init(void)
35904 {
35905 - smp_ops = xen_smp_ops;
35906 + memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35907 xen_fill_possible_map();
35908 }
35909
35910 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35911 index fd92a64..1f72641 100644
35912 --- a/arch/x86/xen/xen-asm_32.S
35913 +++ b/arch/x86/xen/xen-asm_32.S
35914 @@ -99,7 +99,7 @@ ENTRY(xen_iret)
35915 pushw %fs
35916 movl $(__KERNEL_PERCPU), %eax
35917 movl %eax, %fs
35918 - movl %fs:xen_vcpu, %eax
35919 + mov PER_CPU_VAR(xen_vcpu), %eax
35920 POP_FS
35921 #else
35922 movl %ss:xen_vcpu, %eax
35923 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35924 index 674b2225..f1f5dc1 100644
35925 --- a/arch/x86/xen/xen-head.S
35926 +++ b/arch/x86/xen/xen-head.S
35927 @@ -39,6 +39,17 @@ ENTRY(startup_xen)
35928 #ifdef CONFIG_X86_32
35929 mov %esi,xen_start_info
35930 mov $init_thread_union+THREAD_SIZE,%esp
35931 +#ifdef CONFIG_SMP
35932 + movl $cpu_gdt_table,%edi
35933 + movl $__per_cpu_load,%eax
35934 + movw %ax,__KERNEL_PERCPU + 2(%edi)
35935 + rorl $16,%eax
35936 + movb %al,__KERNEL_PERCPU + 4(%edi)
35937 + movb %ah,__KERNEL_PERCPU + 7(%edi)
35938 + movl $__per_cpu_end - 1,%eax
35939 + subl $__per_cpu_start,%eax
35940 + movw %ax,__KERNEL_PERCPU + 0(%edi)
35941 +#endif
35942 #else
35943 mov %rsi,xen_start_info
35944 mov $init_thread_union+THREAD_SIZE,%rsp
35945 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35946 index 28c7e0b..2acfec7 100644
35947 --- a/arch/x86/xen/xen-ops.h
35948 +++ b/arch/x86/xen/xen-ops.h
35949 @@ -10,8 +10,6 @@
35950 extern const char xen_hypervisor_callback[];
35951 extern const char xen_failsafe_callback[];
35952
35953 -extern void *xen_initial_gdt;
35954 -
35955 struct trap_info;
35956 void xen_copy_trap_info(struct trap_info *traps);
35957
35958 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35959 index 525bd3d..ef888b1 100644
35960 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
35961 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35962 @@ -119,9 +119,9 @@
35963 ----------------------------------------------------------------------*/
35964
35965 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35966 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35967 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35968 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35969 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35970
35971 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35972 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35973 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35974 index 2f33760..835e50a 100644
35975 --- a/arch/xtensa/variants/fsf/include/variant/core.h
35976 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
35977 @@ -11,6 +11,7 @@
35978 #ifndef _XTENSA_CORE_H
35979 #define _XTENSA_CORE_H
35980
35981 +#include <linux/const.h>
35982
35983 /****************************************************************************
35984 Parameters Useful for Any Code, USER or PRIVILEGED
35985 @@ -112,9 +113,9 @@
35986 ----------------------------------------------------------------------*/
35987
35988 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35989 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35990 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35991 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35992 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35993
35994 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35995 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35996 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35997 index af00795..2bb8105 100644
35998 --- a/arch/xtensa/variants/s6000/include/variant/core.h
35999 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
36000 @@ -11,6 +11,7 @@
36001 #ifndef _XTENSA_CORE_CONFIGURATION_H
36002 #define _XTENSA_CORE_CONFIGURATION_H
36003
36004 +#include <linux/const.h>
36005
36006 /****************************************************************************
36007 Parameters Useful for Any Code, USER or PRIVILEGED
36008 @@ -118,9 +119,9 @@
36009 ----------------------------------------------------------------------*/
36010
36011 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36012 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36013 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36014 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36015 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36016
36017 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
36018 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
36019 diff --git a/block/bio.c b/block/bio.c
36020 index 3e6e198..5c65199 100644
36021 --- a/block/bio.c
36022 +++ b/block/bio.c
36023 @@ -1163,7 +1163,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36024 /*
36025 * Overflow, abort
36026 */
36027 - if (end < start)
36028 + if (end < start || end - start > INT_MAX - nr_pages)
36029 return ERR_PTR(-EINVAL);
36030
36031 nr_pages += end - start;
36032 @@ -1297,7 +1297,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
36033 /*
36034 * Overflow, abort
36035 */
36036 - if (end < start)
36037 + if (end < start || end - start > INT_MAX - nr_pages)
36038 return ERR_PTR(-EINVAL);
36039
36040 nr_pages += end - start;
36041 @@ -1559,7 +1559,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
36042 const int read = bio_data_dir(bio) == READ;
36043 struct bio_map_data *bmd = bio->bi_private;
36044 int i;
36045 - char *p = bmd->sgvecs[0].iov_base;
36046 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
36047
36048 bio_for_each_segment_all(bvec, bio, i) {
36049 char *addr = page_address(bvec->bv_page);
36050 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36051 index 0736729..2ec3b48 100644
36052 --- a/block/blk-iopoll.c
36053 +++ b/block/blk-iopoll.c
36054 @@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36055 }
36056 EXPORT_SYMBOL(blk_iopoll_complete);
36057
36058 -static void blk_iopoll_softirq(struct softirq_action *h)
36059 +static __latent_entropy void blk_iopoll_softirq(void)
36060 {
36061 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36062 int rearm = 0, budget = blk_iopoll_budget;
36063 diff --git a/block/blk-map.c b/block/blk-map.c
36064 index f890d43..97b0482 100644
36065 --- a/block/blk-map.c
36066 +++ b/block/blk-map.c
36067 @@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36068 if (!len || !kbuf)
36069 return -EINVAL;
36070
36071 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36072 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36073 if (do_copy)
36074 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36075 else
36076 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36077 index 53b1737..08177d2e 100644
36078 --- a/block/blk-softirq.c
36079 +++ b/block/blk-softirq.c
36080 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36081 * Softirq action handler - move entries to local list and loop over them
36082 * while passing them to the queue registered handler.
36083 */
36084 -static void blk_done_softirq(struct softirq_action *h)
36085 +static __latent_entropy void blk_done_softirq(void)
36086 {
36087 struct list_head *cpu_list, local_list;
36088
36089 diff --git a/block/bsg.c b/block/bsg.c
36090 index 276e869..6fe4c61 100644
36091 --- a/block/bsg.c
36092 +++ b/block/bsg.c
36093 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36094 struct sg_io_v4 *hdr, struct bsg_device *bd,
36095 fmode_t has_write_perm)
36096 {
36097 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36098 + unsigned char *cmdptr;
36099 +
36100 if (hdr->request_len > BLK_MAX_CDB) {
36101 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36102 if (!rq->cmd)
36103 return -ENOMEM;
36104 - }
36105 + cmdptr = rq->cmd;
36106 + } else
36107 + cmdptr = tmpcmd;
36108
36109 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36110 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36111 hdr->request_len))
36112 return -EFAULT;
36113
36114 + if (cmdptr != rq->cmd)
36115 + memcpy(rq->cmd, cmdptr, hdr->request_len);
36116 +
36117 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36118 if (blk_verify_command(rq->cmd, has_write_perm))
36119 return -EPERM;
36120 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36121 index f678c73..f35aa18 100644
36122 --- a/block/compat_ioctl.c
36123 +++ b/block/compat_ioctl.c
36124 @@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36125 cgc = compat_alloc_user_space(sizeof(*cgc));
36126 cgc32 = compat_ptr(arg);
36127
36128 - if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36129 + if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36130 get_user(data, &cgc32->buffer) ||
36131 put_user(compat_ptr(data), &cgc->buffer) ||
36132 copy_in_user(&cgc->buflen, &cgc32->buflen,
36133 @@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36134 err |= __get_user(f->spec1, &uf->spec1);
36135 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36136 err |= __get_user(name, &uf->name);
36137 - f->name = compat_ptr(name);
36138 + f->name = (void __force_kernel *)compat_ptr(name);
36139 if (err) {
36140 err = -EFAULT;
36141 goto out;
36142 diff --git a/block/genhd.c b/block/genhd.c
36143 index bd30606..bbc9b90 100644
36144 --- a/block/genhd.c
36145 +++ b/block/genhd.c
36146 @@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36147
36148 /*
36149 * Register device numbers dev..(dev+range-1)
36150 - * range must be nonzero
36151 + * Noop if @range is zero.
36152 * The hash chain is sorted on range, so that subranges can override.
36153 */
36154 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36155 struct kobject *(*probe)(dev_t, int *, void *),
36156 int (*lock)(dev_t, void *), void *data)
36157 {
36158 - kobj_map(bdev_map, devt, range, module, probe, lock, data);
36159 + if (range)
36160 + kobj_map(bdev_map, devt, range, module, probe, lock, data);
36161 }
36162
36163 EXPORT_SYMBOL(blk_register_region);
36164
36165 +/* undo blk_register_region(), noop if @range is zero */
36166 void blk_unregister_region(dev_t devt, unsigned long range)
36167 {
36168 - kobj_unmap(bdev_map, devt, range);
36169 + if (range)
36170 + kobj_unmap(bdev_map, devt, range);
36171 }
36172
36173 EXPORT_SYMBOL(blk_unregister_region);
36174 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36175 index 56d08fd..2e07090 100644
36176 --- a/block/partitions/efi.c
36177 +++ b/block/partitions/efi.c
36178 @@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36179 if (!gpt)
36180 return NULL;
36181
36182 + if (!le32_to_cpu(gpt->num_partition_entries))
36183 + return NULL;
36184 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36185 + if (!pte)
36186 + return NULL;
36187 +
36188 count = le32_to_cpu(gpt->num_partition_entries) *
36189 le32_to_cpu(gpt->sizeof_partition_entry);
36190 - if (!count)
36191 - return NULL;
36192 - pte = kmalloc(count, GFP_KERNEL);
36193 - if (!pte)
36194 - return NULL;
36195 -
36196 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36197 (u8 *) pte, count) < count) {
36198 kfree(pte);
36199 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36200 index b0c2a61..10bb6ec 100644
36201 --- a/block/scsi_ioctl.c
36202 +++ b/block/scsi_ioctl.c
36203 @@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36204 return put_user(0, p);
36205 }
36206
36207 -static int sg_get_timeout(struct request_queue *q)
36208 +static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36209 {
36210 return jiffies_to_clock_t(q->sg_timeout);
36211 }
36212 @@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36213 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36214 struct sg_io_hdr *hdr, fmode_t mode)
36215 {
36216 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36217 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36218 + unsigned char *cmdptr;
36219 +
36220 + if (rq->cmd != rq->__cmd)
36221 + cmdptr = rq->cmd;
36222 + else
36223 + cmdptr = tmpcmd;
36224 +
36225 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36226 return -EFAULT;
36227 +
36228 + if (cmdptr != rq->cmd)
36229 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36230 +
36231 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36232 return -EPERM;
36233
36234 @@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36235 int err;
36236 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36237 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36238 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36239 + unsigned char *cmdptr;
36240
36241 if (!sic)
36242 return -EINVAL;
36243 @@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36244 */
36245 err = -EFAULT;
36246 rq->cmd_len = cmdlen;
36247 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
36248 +
36249 + if (rq->cmd != rq->__cmd)
36250 + cmdptr = rq->cmd;
36251 + else
36252 + cmdptr = tmpcmd;
36253 +
36254 + if (copy_from_user(cmdptr, sic->data, cmdlen))
36255 goto error;
36256
36257 + if (rq->cmd != cmdptr)
36258 + memcpy(rq->cmd, cmdptr, cmdlen);
36259 +
36260 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36261 goto error;
36262
36263 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36264 index e592c90..c566114 100644
36265 --- a/crypto/cryptd.c
36266 +++ b/crypto/cryptd.c
36267 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36268
36269 struct cryptd_blkcipher_request_ctx {
36270 crypto_completion_t complete;
36271 -};
36272 +} __no_const;
36273
36274 struct cryptd_hash_ctx {
36275 struct crypto_shash *child;
36276 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36277
36278 struct cryptd_aead_request_ctx {
36279 crypto_completion_t complete;
36280 -};
36281 +} __no_const;
36282
36283 static void cryptd_queue_worker(struct work_struct *work);
36284
36285 diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36286 index 309d345..1632720 100644
36287 --- a/crypto/pcrypt.c
36288 +++ b/crypto/pcrypt.c
36289 @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36290 int ret;
36291
36292 pinst->kobj.kset = pcrypt_kset;
36293 - ret = kobject_add(&pinst->kobj, NULL, name);
36294 + ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36295 if (!ret)
36296 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36297
36298 diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36299 index 6921c7f..78e1af7 100644
36300 --- a/drivers/acpi/acpica/hwxfsleep.c
36301 +++ b/drivers/acpi/acpica/hwxfsleep.c
36302 @@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36303 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36304
36305 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36306 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36307 - acpi_hw_extended_sleep},
36308 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36309 - acpi_hw_extended_wake_prep},
36310 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36311 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36312 + .extended_function = acpi_hw_extended_sleep},
36313 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36314 + .extended_function = acpi_hw_extended_wake_prep},
36315 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36316 + .extended_function = acpi_hw_extended_wake}
36317 };
36318
36319 /*
36320 diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36321 index 16129c7..8b675cd 100644
36322 --- a/drivers/acpi/apei/apei-internal.h
36323 +++ b/drivers/acpi/apei/apei-internal.h
36324 @@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36325 struct apei_exec_ins_type {
36326 u32 flags;
36327 apei_exec_ins_func_t run;
36328 -};
36329 +} __do_const;
36330
36331 struct apei_exec_context {
36332 u32 ip;
36333 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36334 index fc5f780..e5ac91a 100644
36335 --- a/drivers/acpi/apei/ghes.c
36336 +++ b/drivers/acpi/apei/ghes.c
36337 @@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36338 const struct acpi_hest_generic *generic,
36339 const struct acpi_hest_generic_status *estatus)
36340 {
36341 - static atomic_t seqno;
36342 + static atomic_unchecked_t seqno;
36343 unsigned int curr_seqno;
36344 char pfx_seq[64];
36345
36346 @@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36347 else
36348 pfx = KERN_ERR;
36349 }
36350 - curr_seqno = atomic_inc_return(&seqno);
36351 + curr_seqno = atomic_inc_return_unchecked(&seqno);
36352 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36353 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36354 pfx_seq, generic->header.source_id);
36355 diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36356 index a83e3c6..c3d617f 100644
36357 --- a/drivers/acpi/bgrt.c
36358 +++ b/drivers/acpi/bgrt.c
36359 @@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36360 if (!bgrt_image)
36361 return -ENODEV;
36362
36363 - bin_attr_image.private = bgrt_image;
36364 - bin_attr_image.size = bgrt_image_size;
36365 + pax_open_kernel();
36366 + *(void **)&bin_attr_image.private = bgrt_image;
36367 + *(size_t *)&bin_attr_image.size = bgrt_image_size;
36368 + pax_close_kernel();
36369
36370 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36371 if (!bgrt_kobj)
36372 diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36373 index 7556e7c..89a96bd 100644
36374 --- a/drivers/acpi/blacklist.c
36375 +++ b/drivers/acpi/blacklist.c
36376 @@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36377 u32 is_critical_error;
36378 };
36379
36380 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36381 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36382
36383 /*
36384 * POLICY: If *anything* doesn't work, put it on the blacklist.
36385 @@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36386 return 0;
36387 }
36388
36389 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36390 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36391 {
36392 .callback = dmi_disable_osi_vista,
36393 .ident = "Fujitsu Siemens",
36394 diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36395 index c68e724..e863008 100644
36396 --- a/drivers/acpi/custom_method.c
36397 +++ b/drivers/acpi/custom_method.c
36398 @@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36399 struct acpi_table_header table;
36400 acpi_status status;
36401
36402 +#ifdef CONFIG_GRKERNSEC_KMEM
36403 + return -EPERM;
36404 +#endif
36405 +
36406 if (!(*ppos)) {
36407 /* parse the table header to get the table length */
36408 if (count <= sizeof(struct acpi_table_header))
36409 diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36410 index 7db1931..302dd5f 100644
36411 --- a/drivers/acpi/device_pm.c
36412 +++ b/drivers/acpi/device_pm.c
36413 @@ -1021,6 +1021,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36414
36415 #endif /* CONFIG_PM_SLEEP */
36416
36417 +static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36418 +
36419 static struct dev_pm_domain acpi_general_pm_domain = {
36420 .ops = {
36421 #ifdef CONFIG_PM_RUNTIME
36422 @@ -1039,6 +1041,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36423 .restore_early = acpi_subsys_resume_early,
36424 #endif
36425 },
36426 + .detach = acpi_dev_pm_detach
36427 };
36428
36429 /**
36430 @@ -1108,7 +1111,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36431 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36432 }
36433
36434 - dev->pm_domain->detach = acpi_dev_pm_detach;
36435 return 0;
36436 }
36437 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36438 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36439 index 17f9ec5..d9a455e 100644
36440 --- a/drivers/acpi/processor_idle.c
36441 +++ b/drivers/acpi/processor_idle.c
36442 @@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36443 {
36444 int i, count = CPUIDLE_DRIVER_STATE_START;
36445 struct acpi_processor_cx *cx;
36446 - struct cpuidle_state *state;
36447 + cpuidle_state_no_const *state;
36448 struct cpuidle_driver *drv = &acpi_idle_driver;
36449
36450 if (!pr->flags.power_setup_done)
36451 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36452 index 13e577c..cef11ee 100644
36453 --- a/drivers/acpi/sysfs.c
36454 +++ b/drivers/acpi/sysfs.c
36455 @@ -423,11 +423,11 @@ static u32 num_counters;
36456 static struct attribute **all_attrs;
36457 static u32 acpi_gpe_count;
36458
36459 -static struct attribute_group interrupt_stats_attr_group = {
36460 +static attribute_group_no_const interrupt_stats_attr_group = {
36461 .name = "interrupts",
36462 };
36463
36464 -static struct kobj_attribute *counter_attrs;
36465 +static kobj_attribute_no_const *counter_attrs;
36466
36467 static void delete_gpe_attr_array(void)
36468 {
36469 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36470 index 97683e4..655f6ba 100644
36471 --- a/drivers/ata/libahci.c
36472 +++ b/drivers/ata/libahci.c
36473 @@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36474 }
36475 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36476
36477 -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36478 +static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36479 struct ata_taskfile *tf, int is_cmd, u16 flags,
36480 unsigned long timeout_msec)
36481 {
36482 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36483 index c5ba15a..75ec7a8 100644
36484 --- a/drivers/ata/libata-core.c
36485 +++ b/drivers/ata/libata-core.c
36486 @@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36487 static void ata_dev_xfermask(struct ata_device *dev);
36488 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36489
36490 -atomic_t ata_print_id = ATOMIC_INIT(0);
36491 +atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36492
36493 struct ata_force_param {
36494 const char *name;
36495 @@ -4797,7 +4797,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36496 struct ata_port *ap;
36497 unsigned int tag;
36498
36499 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36500 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36501 ap = qc->ap;
36502
36503 qc->flags = 0;
36504 @@ -4813,7 +4813,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36505 struct ata_port *ap;
36506 struct ata_link *link;
36507
36508 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36509 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36510 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36511 ap = qc->ap;
36512 link = qc->dev->link;
36513 @@ -5917,6 +5917,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36514 return;
36515
36516 spin_lock(&lock);
36517 + pax_open_kernel();
36518
36519 for (cur = ops->inherits; cur; cur = cur->inherits) {
36520 void **inherit = (void **)cur;
36521 @@ -5930,8 +5931,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36522 if (IS_ERR(*pp))
36523 *pp = NULL;
36524
36525 - ops->inherits = NULL;
36526 + *(struct ata_port_operations **)&ops->inherits = NULL;
36527
36528 + pax_close_kernel();
36529 spin_unlock(&lock);
36530 }
36531
36532 @@ -6127,7 +6129,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36533
36534 /* give ports names and add SCSI hosts */
36535 for (i = 0; i < host->n_ports; i++) {
36536 - host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36537 + host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36538 host->ports[i]->local_port_no = i + 1;
36539 }
36540
36541 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36542 index 0586f66..1a8f74a 100644
36543 --- a/drivers/ata/libata-scsi.c
36544 +++ b/drivers/ata/libata-scsi.c
36545 @@ -4151,7 +4151,7 @@ int ata_sas_port_init(struct ata_port *ap)
36546
36547 if (rc)
36548 return rc;
36549 - ap->print_id = atomic_inc_return(&ata_print_id);
36550 + ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36551 return 0;
36552 }
36553 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36554 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36555 index 5f4e0cc..ff2c347 100644
36556 --- a/drivers/ata/libata.h
36557 +++ b/drivers/ata/libata.h
36558 @@ -53,7 +53,7 @@ enum {
36559 ATA_DNXFER_QUIET = (1 << 31),
36560 };
36561
36562 -extern atomic_t ata_print_id;
36563 +extern atomic_unchecked_t ata_print_id;
36564 extern int atapi_passthru16;
36565 extern int libata_fua;
36566 extern int libata_noacpi;
36567 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36568 index 38216b9..4ec6aeb 100644
36569 --- a/drivers/ata/pata_arasan_cf.c
36570 +++ b/drivers/ata/pata_arasan_cf.c
36571 @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36572 /* Handle platform specific quirks */
36573 if (quirk) {
36574 if (quirk & CF_BROKEN_PIO) {
36575 - ap->ops->set_piomode = NULL;
36576 + pax_open_kernel();
36577 + *(void **)&ap->ops->set_piomode = NULL;
36578 + pax_close_kernel();
36579 ap->pio_mask = 0;
36580 }
36581 if (quirk & CF_BROKEN_MWDMA)
36582 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36583 index f9b983a..887b9d8 100644
36584 --- a/drivers/atm/adummy.c
36585 +++ b/drivers/atm/adummy.c
36586 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36587 vcc->pop(vcc, skb);
36588 else
36589 dev_kfree_skb_any(skb);
36590 - atomic_inc(&vcc->stats->tx);
36591 + atomic_inc_unchecked(&vcc->stats->tx);
36592
36593 return 0;
36594 }
36595 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36596 index f1a9198..f466a4a 100644
36597 --- a/drivers/atm/ambassador.c
36598 +++ b/drivers/atm/ambassador.c
36599 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36600 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36601
36602 // VC layer stats
36603 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36604 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36605
36606 // free the descriptor
36607 kfree (tx_descr);
36608 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36609 dump_skb ("<<<", vc, skb);
36610
36611 // VC layer stats
36612 - atomic_inc(&atm_vcc->stats->rx);
36613 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36614 __net_timestamp(skb);
36615 // end of our responsibility
36616 atm_vcc->push (atm_vcc, skb);
36617 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36618 } else {
36619 PRINTK (KERN_INFO, "dropped over-size frame");
36620 // should we count this?
36621 - atomic_inc(&atm_vcc->stats->rx_drop);
36622 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36623 }
36624
36625 } else {
36626 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36627 }
36628
36629 if (check_area (skb->data, skb->len)) {
36630 - atomic_inc(&atm_vcc->stats->tx_err);
36631 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36632 return -ENOMEM; // ?
36633 }
36634
36635 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36636 index 480fa6f..947067c 100644
36637 --- a/drivers/atm/atmtcp.c
36638 +++ b/drivers/atm/atmtcp.c
36639 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36640 if (vcc->pop) vcc->pop(vcc,skb);
36641 else dev_kfree_skb(skb);
36642 if (dev_data) return 0;
36643 - atomic_inc(&vcc->stats->tx_err);
36644 + atomic_inc_unchecked(&vcc->stats->tx_err);
36645 return -ENOLINK;
36646 }
36647 size = skb->len+sizeof(struct atmtcp_hdr);
36648 @@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36649 if (!new_skb) {
36650 if (vcc->pop) vcc->pop(vcc,skb);
36651 else dev_kfree_skb(skb);
36652 - atomic_inc(&vcc->stats->tx_err);
36653 + atomic_inc_unchecked(&vcc->stats->tx_err);
36654 return -ENOBUFS;
36655 }
36656 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36657 @@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36658 if (vcc->pop) vcc->pop(vcc,skb);
36659 else dev_kfree_skb(skb);
36660 out_vcc->push(out_vcc,new_skb);
36661 - atomic_inc(&vcc->stats->tx);
36662 - atomic_inc(&out_vcc->stats->rx);
36663 + atomic_inc_unchecked(&vcc->stats->tx);
36664 + atomic_inc_unchecked(&out_vcc->stats->rx);
36665 return 0;
36666 }
36667
36668 @@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36669 read_unlock(&vcc_sklist_lock);
36670 if (!out_vcc) {
36671 result = -EUNATCH;
36672 - atomic_inc(&vcc->stats->tx_err);
36673 + atomic_inc_unchecked(&vcc->stats->tx_err);
36674 goto done;
36675 }
36676 skb_pull(skb,sizeof(struct atmtcp_hdr));
36677 @@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36678 __net_timestamp(new_skb);
36679 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36680 out_vcc->push(out_vcc,new_skb);
36681 - atomic_inc(&vcc->stats->tx);
36682 - atomic_inc(&out_vcc->stats->rx);
36683 + atomic_inc_unchecked(&vcc->stats->tx);
36684 + atomic_inc_unchecked(&out_vcc->stats->rx);
36685 done:
36686 if (vcc->pop) vcc->pop(vcc,skb);
36687 else dev_kfree_skb(skb);
36688 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36689 index d65975a..0b87e20 100644
36690 --- a/drivers/atm/eni.c
36691 +++ b/drivers/atm/eni.c
36692 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36693 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36694 vcc->dev->number);
36695 length = 0;
36696 - atomic_inc(&vcc->stats->rx_err);
36697 + atomic_inc_unchecked(&vcc->stats->rx_err);
36698 }
36699 else {
36700 length = ATM_CELL_SIZE-1; /* no HEC */
36701 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36702 size);
36703 }
36704 eff = length = 0;
36705 - atomic_inc(&vcc->stats->rx_err);
36706 + atomic_inc_unchecked(&vcc->stats->rx_err);
36707 }
36708 else {
36709 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36710 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36711 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36712 vcc->dev->number,vcc->vci,length,size << 2,descr);
36713 length = eff = 0;
36714 - atomic_inc(&vcc->stats->rx_err);
36715 + atomic_inc_unchecked(&vcc->stats->rx_err);
36716 }
36717 }
36718 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36719 @@ -767,7 +767,7 @@ rx_dequeued++;
36720 vcc->push(vcc,skb);
36721 pushed++;
36722 }
36723 - atomic_inc(&vcc->stats->rx);
36724 + atomic_inc_unchecked(&vcc->stats->rx);
36725 }
36726 wake_up(&eni_dev->rx_wait);
36727 }
36728 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36729 PCI_DMA_TODEVICE);
36730 if (vcc->pop) vcc->pop(vcc,skb);
36731 else dev_kfree_skb_irq(skb);
36732 - atomic_inc(&vcc->stats->tx);
36733 + atomic_inc_unchecked(&vcc->stats->tx);
36734 wake_up(&eni_dev->tx_wait);
36735 dma_complete++;
36736 }
36737 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36738 index 82f2ae0..f205c02 100644
36739 --- a/drivers/atm/firestream.c
36740 +++ b/drivers/atm/firestream.c
36741 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36742 }
36743 }
36744
36745 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36746 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36747
36748 fs_dprintk (FS_DEBUG_TXMEM, "i");
36749 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36750 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36751 #endif
36752 skb_put (skb, qe->p1 & 0xffff);
36753 ATM_SKB(skb)->vcc = atm_vcc;
36754 - atomic_inc(&atm_vcc->stats->rx);
36755 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36756 __net_timestamp(skb);
36757 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36758 atm_vcc->push (atm_vcc, skb);
36759 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36760 kfree (pe);
36761 }
36762 if (atm_vcc)
36763 - atomic_inc(&atm_vcc->stats->rx_drop);
36764 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36765 break;
36766 case 0x1f: /* Reassembly abort: no buffers. */
36767 /* Silently increment error counter. */
36768 if (atm_vcc)
36769 - atomic_inc(&atm_vcc->stats->rx_drop);
36770 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36771 break;
36772 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36773 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36774 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36775 index d4725fc..2d4ea65 100644
36776 --- a/drivers/atm/fore200e.c
36777 +++ b/drivers/atm/fore200e.c
36778 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36779 #endif
36780 /* check error condition */
36781 if (*entry->status & STATUS_ERROR)
36782 - atomic_inc(&vcc->stats->tx_err);
36783 + atomic_inc_unchecked(&vcc->stats->tx_err);
36784 else
36785 - atomic_inc(&vcc->stats->tx);
36786 + atomic_inc_unchecked(&vcc->stats->tx);
36787 }
36788 }
36789
36790 @@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36791 if (skb == NULL) {
36792 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36793
36794 - atomic_inc(&vcc->stats->rx_drop);
36795 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36796 return -ENOMEM;
36797 }
36798
36799 @@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36800
36801 dev_kfree_skb_any(skb);
36802
36803 - atomic_inc(&vcc->stats->rx_drop);
36804 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36805 return -ENOMEM;
36806 }
36807
36808 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36809
36810 vcc->push(vcc, skb);
36811 - atomic_inc(&vcc->stats->rx);
36812 + atomic_inc_unchecked(&vcc->stats->rx);
36813
36814 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36815
36816 @@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36817 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36818 fore200e->atm_dev->number,
36819 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36820 - atomic_inc(&vcc->stats->rx_err);
36821 + atomic_inc_unchecked(&vcc->stats->rx_err);
36822 }
36823 }
36824
36825 @@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36826 goto retry_here;
36827 }
36828
36829 - atomic_inc(&vcc->stats->tx_err);
36830 + atomic_inc_unchecked(&vcc->stats->tx_err);
36831
36832 fore200e->tx_sat++;
36833 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36834 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36835 index c39702b..785b73b 100644
36836 --- a/drivers/atm/he.c
36837 +++ b/drivers/atm/he.c
36838 @@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36839
36840 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36841 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36842 - atomic_inc(&vcc->stats->rx_drop);
36843 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36844 goto return_host_buffers;
36845 }
36846
36847 @@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36848 RBRQ_LEN_ERR(he_dev->rbrq_head)
36849 ? "LEN_ERR" : "",
36850 vcc->vpi, vcc->vci);
36851 - atomic_inc(&vcc->stats->rx_err);
36852 + atomic_inc_unchecked(&vcc->stats->rx_err);
36853 goto return_host_buffers;
36854 }
36855
36856 @@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36857 vcc->push(vcc, skb);
36858 spin_lock(&he_dev->global_lock);
36859
36860 - atomic_inc(&vcc->stats->rx);
36861 + atomic_inc_unchecked(&vcc->stats->rx);
36862
36863 return_host_buffers:
36864 ++pdus_assembled;
36865 @@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36866 tpd->vcc->pop(tpd->vcc, tpd->skb);
36867 else
36868 dev_kfree_skb_any(tpd->skb);
36869 - atomic_inc(&tpd->vcc->stats->tx_err);
36870 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36871 }
36872 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36873 return;
36874 @@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36875 vcc->pop(vcc, skb);
36876 else
36877 dev_kfree_skb_any(skb);
36878 - atomic_inc(&vcc->stats->tx_err);
36879 + atomic_inc_unchecked(&vcc->stats->tx_err);
36880 return -EINVAL;
36881 }
36882
36883 @@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36884 vcc->pop(vcc, skb);
36885 else
36886 dev_kfree_skb_any(skb);
36887 - atomic_inc(&vcc->stats->tx_err);
36888 + atomic_inc_unchecked(&vcc->stats->tx_err);
36889 return -EINVAL;
36890 }
36891 #endif
36892 @@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36893 vcc->pop(vcc, skb);
36894 else
36895 dev_kfree_skb_any(skb);
36896 - atomic_inc(&vcc->stats->tx_err);
36897 + atomic_inc_unchecked(&vcc->stats->tx_err);
36898 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36899 return -ENOMEM;
36900 }
36901 @@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36902 vcc->pop(vcc, skb);
36903 else
36904 dev_kfree_skb_any(skb);
36905 - atomic_inc(&vcc->stats->tx_err);
36906 + atomic_inc_unchecked(&vcc->stats->tx_err);
36907 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36908 return -ENOMEM;
36909 }
36910 @@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36911 __enqueue_tpd(he_dev, tpd, cid);
36912 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36913
36914 - atomic_inc(&vcc->stats->tx);
36915 + atomic_inc_unchecked(&vcc->stats->tx);
36916
36917 return 0;
36918 }
36919 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36920 index 1dc0519..1aadaf7 100644
36921 --- a/drivers/atm/horizon.c
36922 +++ b/drivers/atm/horizon.c
36923 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36924 {
36925 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36926 // VC layer stats
36927 - atomic_inc(&vcc->stats->rx);
36928 + atomic_inc_unchecked(&vcc->stats->rx);
36929 __net_timestamp(skb);
36930 // end of our responsibility
36931 vcc->push (vcc, skb);
36932 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36933 dev->tx_iovec = NULL;
36934
36935 // VC layer stats
36936 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36937 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36938
36939 // free the skb
36940 hrz_kfree_skb (skb);
36941 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36942 index 2b24ed0..b3d6acc 100644
36943 --- a/drivers/atm/idt77252.c
36944 +++ b/drivers/atm/idt77252.c
36945 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36946 else
36947 dev_kfree_skb(skb);
36948
36949 - atomic_inc(&vcc->stats->tx);
36950 + atomic_inc_unchecked(&vcc->stats->tx);
36951 }
36952
36953 atomic_dec(&scq->used);
36954 @@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36955 if ((sb = dev_alloc_skb(64)) == NULL) {
36956 printk("%s: Can't allocate buffers for aal0.\n",
36957 card->name);
36958 - atomic_add(i, &vcc->stats->rx_drop);
36959 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
36960 break;
36961 }
36962 if (!atm_charge(vcc, sb->truesize)) {
36963 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36964 card->name);
36965 - atomic_add(i - 1, &vcc->stats->rx_drop);
36966 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36967 dev_kfree_skb(sb);
36968 break;
36969 }
36970 @@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36971 ATM_SKB(sb)->vcc = vcc;
36972 __net_timestamp(sb);
36973 vcc->push(vcc, sb);
36974 - atomic_inc(&vcc->stats->rx);
36975 + atomic_inc_unchecked(&vcc->stats->rx);
36976
36977 cell += ATM_CELL_PAYLOAD;
36978 }
36979 @@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36980 "(CDC: %08x)\n",
36981 card->name, len, rpp->len, readl(SAR_REG_CDC));
36982 recycle_rx_pool_skb(card, rpp);
36983 - atomic_inc(&vcc->stats->rx_err);
36984 + atomic_inc_unchecked(&vcc->stats->rx_err);
36985 return;
36986 }
36987 if (stat & SAR_RSQE_CRC) {
36988 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36989 recycle_rx_pool_skb(card, rpp);
36990 - atomic_inc(&vcc->stats->rx_err);
36991 + atomic_inc_unchecked(&vcc->stats->rx_err);
36992 return;
36993 }
36994 if (skb_queue_len(&rpp->queue) > 1) {
36995 @@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36996 RXPRINTK("%s: Can't alloc RX skb.\n",
36997 card->name);
36998 recycle_rx_pool_skb(card, rpp);
36999 - atomic_inc(&vcc->stats->rx_err);
37000 + atomic_inc_unchecked(&vcc->stats->rx_err);
37001 return;
37002 }
37003 if (!atm_charge(vcc, skb->truesize)) {
37004 @@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37005 __net_timestamp(skb);
37006
37007 vcc->push(vcc, skb);
37008 - atomic_inc(&vcc->stats->rx);
37009 + atomic_inc_unchecked(&vcc->stats->rx);
37010
37011 return;
37012 }
37013 @@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37014 __net_timestamp(skb);
37015
37016 vcc->push(vcc, skb);
37017 - atomic_inc(&vcc->stats->rx);
37018 + atomic_inc_unchecked(&vcc->stats->rx);
37019
37020 if (skb->truesize > SAR_FB_SIZE_3)
37021 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37022 @@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37023 if (vcc->qos.aal != ATM_AAL0) {
37024 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37025 card->name, vpi, vci);
37026 - atomic_inc(&vcc->stats->rx_drop);
37027 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37028 goto drop;
37029 }
37030
37031 if ((sb = dev_alloc_skb(64)) == NULL) {
37032 printk("%s: Can't allocate buffers for AAL0.\n",
37033 card->name);
37034 - atomic_inc(&vcc->stats->rx_err);
37035 + atomic_inc_unchecked(&vcc->stats->rx_err);
37036 goto drop;
37037 }
37038
37039 @@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37040 ATM_SKB(sb)->vcc = vcc;
37041 __net_timestamp(sb);
37042 vcc->push(vcc, sb);
37043 - atomic_inc(&vcc->stats->rx);
37044 + atomic_inc_unchecked(&vcc->stats->rx);
37045
37046 drop:
37047 skb_pull(queue, 64);
37048 @@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37049
37050 if (vc == NULL) {
37051 printk("%s: NULL connection in send().\n", card->name);
37052 - atomic_inc(&vcc->stats->tx_err);
37053 + atomic_inc_unchecked(&vcc->stats->tx_err);
37054 dev_kfree_skb(skb);
37055 return -EINVAL;
37056 }
37057 if (!test_bit(VCF_TX, &vc->flags)) {
37058 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37059 - atomic_inc(&vcc->stats->tx_err);
37060 + atomic_inc_unchecked(&vcc->stats->tx_err);
37061 dev_kfree_skb(skb);
37062 return -EINVAL;
37063 }
37064 @@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37065 break;
37066 default:
37067 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37068 - atomic_inc(&vcc->stats->tx_err);
37069 + atomic_inc_unchecked(&vcc->stats->tx_err);
37070 dev_kfree_skb(skb);
37071 return -EINVAL;
37072 }
37073
37074 if (skb_shinfo(skb)->nr_frags != 0) {
37075 printk("%s: No scatter-gather yet.\n", card->name);
37076 - atomic_inc(&vcc->stats->tx_err);
37077 + atomic_inc_unchecked(&vcc->stats->tx_err);
37078 dev_kfree_skb(skb);
37079 return -EINVAL;
37080 }
37081 @@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37082
37083 err = queue_skb(card, vc, skb, oam);
37084 if (err) {
37085 - atomic_inc(&vcc->stats->tx_err);
37086 + atomic_inc_unchecked(&vcc->stats->tx_err);
37087 dev_kfree_skb(skb);
37088 return err;
37089 }
37090 @@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37091 skb = dev_alloc_skb(64);
37092 if (!skb) {
37093 printk("%s: Out of memory in send_oam().\n", card->name);
37094 - atomic_inc(&vcc->stats->tx_err);
37095 + atomic_inc_unchecked(&vcc->stats->tx_err);
37096 return -ENOMEM;
37097 }
37098 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37099 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37100 index 4217f29..88f547a 100644
37101 --- a/drivers/atm/iphase.c
37102 +++ b/drivers/atm/iphase.c
37103 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37104 status = (u_short) (buf_desc_ptr->desc_mode);
37105 if (status & (RX_CER | RX_PTE | RX_OFL))
37106 {
37107 - atomic_inc(&vcc->stats->rx_err);
37108 + atomic_inc_unchecked(&vcc->stats->rx_err);
37109 IF_ERR(printk("IA: bad packet, dropping it");)
37110 if (status & RX_CER) {
37111 IF_ERR(printk(" cause: packet CRC error\n");)
37112 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37113 len = dma_addr - buf_addr;
37114 if (len > iadev->rx_buf_sz) {
37115 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37116 - atomic_inc(&vcc->stats->rx_err);
37117 + atomic_inc_unchecked(&vcc->stats->rx_err);
37118 goto out_free_desc;
37119 }
37120
37121 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37122 ia_vcc = INPH_IA_VCC(vcc);
37123 if (ia_vcc == NULL)
37124 {
37125 - atomic_inc(&vcc->stats->rx_err);
37126 + atomic_inc_unchecked(&vcc->stats->rx_err);
37127 atm_return(vcc, skb->truesize);
37128 dev_kfree_skb_any(skb);
37129 goto INCR_DLE;
37130 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37131 if ((length > iadev->rx_buf_sz) || (length >
37132 (skb->len - sizeof(struct cpcs_trailer))))
37133 {
37134 - atomic_inc(&vcc->stats->rx_err);
37135 + atomic_inc_unchecked(&vcc->stats->rx_err);
37136 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37137 length, skb->len);)
37138 atm_return(vcc, skb->truesize);
37139 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37140
37141 IF_RX(printk("rx_dle_intr: skb push");)
37142 vcc->push(vcc,skb);
37143 - atomic_inc(&vcc->stats->rx);
37144 + atomic_inc_unchecked(&vcc->stats->rx);
37145 iadev->rx_pkt_cnt++;
37146 }
37147 INCR_DLE:
37148 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37149 {
37150 struct k_sonet_stats *stats;
37151 stats = &PRIV(_ia_dev[board])->sonet_stats;
37152 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37153 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37154 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37155 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37156 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37157 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37158 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37159 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37160 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37161 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37162 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37163 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37164 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37165 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37166 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37167 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37168 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37169 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37170 }
37171 ia_cmds.status = 0;
37172 break;
37173 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37174 if ((desc == 0) || (desc > iadev->num_tx_desc))
37175 {
37176 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37177 - atomic_inc(&vcc->stats->tx);
37178 + atomic_inc_unchecked(&vcc->stats->tx);
37179 if (vcc->pop)
37180 vcc->pop(vcc, skb);
37181 else
37182 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37183 ATM_DESC(skb) = vcc->vci;
37184 skb_queue_tail(&iadev->tx_dma_q, skb);
37185
37186 - atomic_inc(&vcc->stats->tx);
37187 + atomic_inc_unchecked(&vcc->stats->tx);
37188 iadev->tx_pkt_cnt++;
37189 /* Increment transaction counter */
37190 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37191
37192 #if 0
37193 /* add flow control logic */
37194 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37195 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37196 if (iavcc->vc_desc_cnt > 10) {
37197 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37198 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37199 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37200 index 93eaf8d..b4ca7da 100644
37201 --- a/drivers/atm/lanai.c
37202 +++ b/drivers/atm/lanai.c
37203 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37204 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37205 lanai_endtx(lanai, lvcc);
37206 lanai_free_skb(lvcc->tx.atmvcc, skb);
37207 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37208 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37209 }
37210
37211 /* Try to fill the buffer - don't call unless there is backlog */
37212 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37213 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37214 __net_timestamp(skb);
37215 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37216 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37217 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37218 out:
37219 lvcc->rx.buf.ptr = end;
37220 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37221 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37222 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37223 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37224 lanai->stats.service_rxnotaal5++;
37225 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37226 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37227 return 0;
37228 }
37229 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37230 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37231 int bytes;
37232 read_unlock(&vcc_sklist_lock);
37233 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37234 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37235 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37236 lvcc->stats.x.aal5.service_trash++;
37237 bytes = (SERVICE_GET_END(s) * 16) -
37238 (((unsigned long) lvcc->rx.buf.ptr) -
37239 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37240 }
37241 if (s & SERVICE_STREAM) {
37242 read_unlock(&vcc_sklist_lock);
37243 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37244 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37245 lvcc->stats.x.aal5.service_stream++;
37246 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37247 "PDU on VCI %d!\n", lanai->number, vci);
37248 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37249 return 0;
37250 }
37251 DPRINTK("got rx crc error on vci %d\n", vci);
37252 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37253 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37254 lvcc->stats.x.aal5.service_rxcrc++;
37255 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37256 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37257 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37258 index 9988ac9..7c52585 100644
37259 --- a/drivers/atm/nicstar.c
37260 +++ b/drivers/atm/nicstar.c
37261 @@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37262 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37263 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37264 card->index);
37265 - atomic_inc(&vcc->stats->tx_err);
37266 + atomic_inc_unchecked(&vcc->stats->tx_err);
37267 dev_kfree_skb_any(skb);
37268 return -EINVAL;
37269 }
37270 @@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37271 if (!vc->tx) {
37272 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37273 card->index);
37274 - atomic_inc(&vcc->stats->tx_err);
37275 + atomic_inc_unchecked(&vcc->stats->tx_err);
37276 dev_kfree_skb_any(skb);
37277 return -EINVAL;
37278 }
37279 @@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37280 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37281 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37282 card->index);
37283 - atomic_inc(&vcc->stats->tx_err);
37284 + atomic_inc_unchecked(&vcc->stats->tx_err);
37285 dev_kfree_skb_any(skb);
37286 return -EINVAL;
37287 }
37288
37289 if (skb_shinfo(skb)->nr_frags != 0) {
37290 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37291 - atomic_inc(&vcc->stats->tx_err);
37292 + atomic_inc_unchecked(&vcc->stats->tx_err);
37293 dev_kfree_skb_any(skb);
37294 return -EINVAL;
37295 }
37296 @@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37297 }
37298
37299 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37300 - atomic_inc(&vcc->stats->tx_err);
37301 + atomic_inc_unchecked(&vcc->stats->tx_err);
37302 dev_kfree_skb_any(skb);
37303 return -EIO;
37304 }
37305 - atomic_inc(&vcc->stats->tx);
37306 + atomic_inc_unchecked(&vcc->stats->tx);
37307
37308 return 0;
37309 }
37310 @@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37311 printk
37312 ("nicstar%d: Can't allocate buffers for aal0.\n",
37313 card->index);
37314 - atomic_add(i, &vcc->stats->rx_drop);
37315 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
37316 break;
37317 }
37318 if (!atm_charge(vcc, sb->truesize)) {
37319 RXPRINTK
37320 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37321 card->index);
37322 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37323 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37324 dev_kfree_skb_any(sb);
37325 break;
37326 }
37327 @@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37328 ATM_SKB(sb)->vcc = vcc;
37329 __net_timestamp(sb);
37330 vcc->push(vcc, sb);
37331 - atomic_inc(&vcc->stats->rx);
37332 + atomic_inc_unchecked(&vcc->stats->rx);
37333 cell += ATM_CELL_PAYLOAD;
37334 }
37335
37336 @@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37337 if (iovb == NULL) {
37338 printk("nicstar%d: Out of iovec buffers.\n",
37339 card->index);
37340 - atomic_inc(&vcc->stats->rx_drop);
37341 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37342 recycle_rx_buf(card, skb);
37343 return;
37344 }
37345 @@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37346 small or large buffer itself. */
37347 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37348 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37349 - atomic_inc(&vcc->stats->rx_err);
37350 + atomic_inc_unchecked(&vcc->stats->rx_err);
37351 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37352 NS_MAX_IOVECS);
37353 NS_PRV_IOVCNT(iovb) = 0;
37354 @@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37355 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37356 card->index);
37357 which_list(card, skb);
37358 - atomic_inc(&vcc->stats->rx_err);
37359 + atomic_inc_unchecked(&vcc->stats->rx_err);
37360 recycle_rx_buf(card, skb);
37361 vc->rx_iov = NULL;
37362 recycle_iov_buf(card, iovb);
37363 @@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37364 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37365 card->index);
37366 which_list(card, skb);
37367 - atomic_inc(&vcc->stats->rx_err);
37368 + atomic_inc_unchecked(&vcc->stats->rx_err);
37369 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37370 NS_PRV_IOVCNT(iovb));
37371 vc->rx_iov = NULL;
37372 @@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37373 printk(" - PDU size mismatch.\n");
37374 else
37375 printk(".\n");
37376 - atomic_inc(&vcc->stats->rx_err);
37377 + atomic_inc_unchecked(&vcc->stats->rx_err);
37378 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37379 NS_PRV_IOVCNT(iovb));
37380 vc->rx_iov = NULL;
37381 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37382 /* skb points to a small buffer */
37383 if (!atm_charge(vcc, skb->truesize)) {
37384 push_rxbufs(card, skb);
37385 - atomic_inc(&vcc->stats->rx_drop);
37386 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37387 } else {
37388 skb_put(skb, len);
37389 dequeue_sm_buf(card, skb);
37390 @@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37391 ATM_SKB(skb)->vcc = vcc;
37392 __net_timestamp(skb);
37393 vcc->push(vcc, skb);
37394 - atomic_inc(&vcc->stats->rx);
37395 + atomic_inc_unchecked(&vcc->stats->rx);
37396 }
37397 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37398 struct sk_buff *sb;
37399 @@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37400 if (len <= NS_SMBUFSIZE) {
37401 if (!atm_charge(vcc, sb->truesize)) {
37402 push_rxbufs(card, sb);
37403 - atomic_inc(&vcc->stats->rx_drop);
37404 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37405 } else {
37406 skb_put(sb, len);
37407 dequeue_sm_buf(card, sb);
37408 @@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37409 ATM_SKB(sb)->vcc = vcc;
37410 __net_timestamp(sb);
37411 vcc->push(vcc, sb);
37412 - atomic_inc(&vcc->stats->rx);
37413 + atomic_inc_unchecked(&vcc->stats->rx);
37414 }
37415
37416 push_rxbufs(card, skb);
37417 @@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37418
37419 if (!atm_charge(vcc, skb->truesize)) {
37420 push_rxbufs(card, skb);
37421 - atomic_inc(&vcc->stats->rx_drop);
37422 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37423 } else {
37424 dequeue_lg_buf(card, skb);
37425 #ifdef NS_USE_DESTRUCTORS
37426 @@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37427 ATM_SKB(skb)->vcc = vcc;
37428 __net_timestamp(skb);
37429 vcc->push(vcc, skb);
37430 - atomic_inc(&vcc->stats->rx);
37431 + atomic_inc_unchecked(&vcc->stats->rx);
37432 }
37433
37434 push_rxbufs(card, sb);
37435 @@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37436 printk
37437 ("nicstar%d: Out of huge buffers.\n",
37438 card->index);
37439 - atomic_inc(&vcc->stats->rx_drop);
37440 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37441 recycle_iovec_rx_bufs(card,
37442 (struct iovec *)
37443 iovb->data,
37444 @@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37445 card->hbpool.count++;
37446 } else
37447 dev_kfree_skb_any(hb);
37448 - atomic_inc(&vcc->stats->rx_drop);
37449 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37450 } else {
37451 /* Copy the small buffer to the huge buffer */
37452 sb = (struct sk_buff *)iov->iov_base;
37453 @@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37454 #endif /* NS_USE_DESTRUCTORS */
37455 __net_timestamp(hb);
37456 vcc->push(vcc, hb);
37457 - atomic_inc(&vcc->stats->rx);
37458 + atomic_inc_unchecked(&vcc->stats->rx);
37459 }
37460 }
37461
37462 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37463 index 21b0bc6..b5f40ba 100644
37464 --- a/drivers/atm/solos-pci.c
37465 +++ b/drivers/atm/solos-pci.c
37466 @@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37467 }
37468 atm_charge(vcc, skb->truesize);
37469 vcc->push(vcc, skb);
37470 - atomic_inc(&vcc->stats->rx);
37471 + atomic_inc_unchecked(&vcc->stats->rx);
37472 break;
37473
37474 case PKT_STATUS:
37475 @@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37476 vcc = SKB_CB(oldskb)->vcc;
37477
37478 if (vcc) {
37479 - atomic_inc(&vcc->stats->tx);
37480 + atomic_inc_unchecked(&vcc->stats->tx);
37481 solos_pop(vcc, oldskb);
37482 } else {
37483 dev_kfree_skb_irq(oldskb);
37484 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37485 index 0215934..ce9f5b1 100644
37486 --- a/drivers/atm/suni.c
37487 +++ b/drivers/atm/suni.c
37488 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37489
37490
37491 #define ADD_LIMITED(s,v) \
37492 - atomic_add((v),&stats->s); \
37493 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37494 + atomic_add_unchecked((v),&stats->s); \
37495 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37496
37497
37498 static void suni_hz(unsigned long from_timer)
37499 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37500 index 5120a96..e2572bd 100644
37501 --- a/drivers/atm/uPD98402.c
37502 +++ b/drivers/atm/uPD98402.c
37503 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37504 struct sonet_stats tmp;
37505 int error = 0;
37506
37507 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37508 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37509 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37510 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37511 if (zero && !error) {
37512 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37513
37514
37515 #define ADD_LIMITED(s,v) \
37516 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37517 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37518 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37519 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37520 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37521 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37522
37523
37524 static void stat_event(struct atm_dev *dev)
37525 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37526 if (reason & uPD98402_INT_PFM) stat_event(dev);
37527 if (reason & uPD98402_INT_PCO) {
37528 (void) GET(PCOCR); /* clear interrupt cause */
37529 - atomic_add(GET(HECCT),
37530 + atomic_add_unchecked(GET(HECCT),
37531 &PRIV(dev)->sonet_stats.uncorr_hcs);
37532 }
37533 if ((reason & uPD98402_INT_RFO) &&
37534 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37535 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37536 uPD98402_INT_LOS),PIMR); /* enable them */
37537 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37538 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37539 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37540 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37541 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37542 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37543 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37544 return 0;
37545 }
37546
37547 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37548 index 969c3c2..9b72956 100644
37549 --- a/drivers/atm/zatm.c
37550 +++ b/drivers/atm/zatm.c
37551 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37552 }
37553 if (!size) {
37554 dev_kfree_skb_irq(skb);
37555 - if (vcc) atomic_inc(&vcc->stats->rx_err);
37556 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37557 continue;
37558 }
37559 if (!atm_charge(vcc,skb->truesize)) {
37560 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37561 skb->len = size;
37562 ATM_SKB(skb)->vcc = vcc;
37563 vcc->push(vcc,skb);
37564 - atomic_inc(&vcc->stats->rx);
37565 + atomic_inc_unchecked(&vcc->stats->rx);
37566 }
37567 zout(pos & 0xffff,MTA(mbx));
37568 #if 0 /* probably a stupid idea */
37569 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37570 skb_queue_head(&zatm_vcc->backlog,skb);
37571 break;
37572 }
37573 - atomic_inc(&vcc->stats->tx);
37574 + atomic_inc_unchecked(&vcc->stats->tx);
37575 wake_up(&zatm_vcc->tx_wait);
37576 }
37577
37578 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37579 index 83e910a..b224a73 100644
37580 --- a/drivers/base/bus.c
37581 +++ b/drivers/base/bus.c
37582 @@ -1124,7 +1124,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37583 return -EINVAL;
37584
37585 mutex_lock(&subsys->p->mutex);
37586 - list_add_tail(&sif->node, &subsys->p->interfaces);
37587 + pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37588 if (sif->add_dev) {
37589 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37590 while ((dev = subsys_dev_iter_next(&iter)))
37591 @@ -1149,7 +1149,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37592 subsys = sif->subsys;
37593
37594 mutex_lock(&subsys->p->mutex);
37595 - list_del_init(&sif->node);
37596 + pax_list_del_init((struct list_head *)&sif->node);
37597 if (sif->remove_dev) {
37598 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37599 while ((dev = subsys_dev_iter_next(&iter)))
37600 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37601 index 25798db..15f130e 100644
37602 --- a/drivers/base/devtmpfs.c
37603 +++ b/drivers/base/devtmpfs.c
37604 @@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37605 if (!thread)
37606 return 0;
37607
37608 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37609 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37610 if (err)
37611 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37612 else
37613 @@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37614 *err = sys_unshare(CLONE_NEWNS);
37615 if (*err)
37616 goto out;
37617 - *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37618 + *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37619 if (*err)
37620 goto out;
37621 - sys_chdir("/.."); /* will traverse into overmounted root */
37622 - sys_chroot(".");
37623 + sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37624 + sys_chroot((char __force_user *)".");
37625 complete(&setup_done);
37626 while (1) {
37627 spin_lock(&req_lock);
37628 diff --git a/drivers/base/node.c b/drivers/base/node.c
37629 index 472168c..4af587e 100644
37630 --- a/drivers/base/node.c
37631 +++ b/drivers/base/node.c
37632 @@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37633 struct node_attr {
37634 struct device_attribute attr;
37635 enum node_states state;
37636 -};
37637 +} __do_const;
37638
37639 static ssize_t show_node_state(struct device *dev,
37640 struct device_attribute *attr, char *buf)
37641 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37642 index fb83d4a..4aa50ec 100644
37643 --- a/drivers/base/power/domain.c
37644 +++ b/drivers/base/power/domain.c
37645 @@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37646 {
37647 struct cpuidle_driver *cpuidle_drv;
37648 struct gpd_cpuidle_data *cpuidle_data;
37649 - struct cpuidle_state *idle_state;
37650 + cpuidle_state_no_const *idle_state;
37651 int ret = 0;
37652
37653 if (IS_ERR_OR_NULL(genpd) || state < 0)
37654 @@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37655 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37656 {
37657 struct gpd_cpuidle_data *cpuidle_data;
37658 - struct cpuidle_state *idle_state;
37659 + cpuidle_state_no_const *idle_state;
37660 int ret = 0;
37661
37662 if (IS_ERR_OR_NULL(genpd))
37663 diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37664 index a9d26ed..74b8405 100644
37665 --- a/drivers/base/power/sysfs.c
37666 +++ b/drivers/base/power/sysfs.c
37667 @@ -182,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37668 return -EIO;
37669 }
37670 }
37671 - return sprintf(buf, p);
37672 + return sprintf(buf, "%s", p);
37673 }
37674
37675 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37676 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37677 index c2744b3..08fac19 100644
37678 --- a/drivers/base/power/wakeup.c
37679 +++ b/drivers/base/power/wakeup.c
37680 @@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37681 * They need to be modified together atomically, so it's better to use one
37682 * atomic variable to hold them both.
37683 */
37684 -static atomic_t combined_event_count = ATOMIC_INIT(0);
37685 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37686
37687 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37688 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37689
37690 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37691 {
37692 - unsigned int comb = atomic_read(&combined_event_count);
37693 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
37694
37695 *cnt = (comb >> IN_PROGRESS_BITS);
37696 *inpr = comb & MAX_IN_PROGRESS;
37697 @@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37698 ws->start_prevent_time = ws->last_time;
37699
37700 /* Increment the counter of events in progress. */
37701 - cec = atomic_inc_return(&combined_event_count);
37702 + cec = atomic_inc_return_unchecked(&combined_event_count);
37703
37704 trace_wakeup_source_activate(ws->name, cec);
37705 }
37706 @@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37707 * Increment the counter of registered wakeup events and decrement the
37708 * couter of wakeup events in progress simultaneously.
37709 */
37710 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37711 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37712 trace_wakeup_source_deactivate(ws->name, cec);
37713
37714 split_counters(&cnt, &inpr);
37715 diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37716 index 8d98a32..61d3165 100644
37717 --- a/drivers/base/syscore.c
37718 +++ b/drivers/base/syscore.c
37719 @@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37720 void register_syscore_ops(struct syscore_ops *ops)
37721 {
37722 mutex_lock(&syscore_ops_lock);
37723 - list_add_tail(&ops->node, &syscore_ops_list);
37724 + pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37725 mutex_unlock(&syscore_ops_lock);
37726 }
37727 EXPORT_SYMBOL_GPL(register_syscore_ops);
37728 @@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37729 void unregister_syscore_ops(struct syscore_ops *ops)
37730 {
37731 mutex_lock(&syscore_ops_lock);
37732 - list_del(&ops->node);
37733 + pax_list_del((struct list_head *)&ops->node);
37734 mutex_unlock(&syscore_ops_lock);
37735 }
37736 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37737 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37738 index ff20f19..018f1da 100644
37739 --- a/drivers/block/cciss.c
37740 +++ b/drivers/block/cciss.c
37741 @@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37742 while (!list_empty(&h->reqQ)) {
37743 c = list_entry(h->reqQ.next, CommandList_struct, list);
37744 /* can't do anything if fifo is full */
37745 - if ((h->access.fifo_full(h))) {
37746 + if ((h->access->fifo_full(h))) {
37747 dev_warn(&h->pdev->dev, "fifo full\n");
37748 break;
37749 }
37750 @@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37751 h->Qdepth--;
37752
37753 /* Tell the controller execute command */
37754 - h->access.submit_command(h, c);
37755 + h->access->submit_command(h, c);
37756
37757 /* Put job onto the completed Q */
37758 addQ(&h->cmpQ, c);
37759 @@ -3444,17 +3444,17 @@ startio:
37760
37761 static inline unsigned long get_next_completion(ctlr_info_t *h)
37762 {
37763 - return h->access.command_completed(h);
37764 + return h->access->command_completed(h);
37765 }
37766
37767 static inline int interrupt_pending(ctlr_info_t *h)
37768 {
37769 - return h->access.intr_pending(h);
37770 + return h->access->intr_pending(h);
37771 }
37772
37773 static inline long interrupt_not_for_us(ctlr_info_t *h)
37774 {
37775 - return ((h->access.intr_pending(h) == 0) ||
37776 + return ((h->access->intr_pending(h) == 0) ||
37777 (h->interrupts_enabled == 0));
37778 }
37779
37780 @@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37781 u32 a;
37782
37783 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37784 - return h->access.command_completed(h);
37785 + return h->access->command_completed(h);
37786
37787 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37788 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37789 @@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37790 trans_support & CFGTBL_Trans_use_short_tags);
37791
37792 /* Change the access methods to the performant access methods */
37793 - h->access = SA5_performant_access;
37794 + h->access = &SA5_performant_access;
37795 h->transMethod = CFGTBL_Trans_Performant;
37796
37797 return;
37798 @@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37799 if (prod_index < 0)
37800 return -ENODEV;
37801 h->product_name = products[prod_index].product_name;
37802 - h->access = *(products[prod_index].access);
37803 + h->access = products[prod_index].access;
37804
37805 if (cciss_board_disabled(h)) {
37806 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37807 @@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37808 }
37809
37810 /* make sure the board interrupts are off */
37811 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37812 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37813 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37814 if (rc)
37815 goto clean2;
37816 @@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37817 * fake ones to scoop up any residual completions.
37818 */
37819 spin_lock_irqsave(&h->lock, flags);
37820 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37821 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37822 spin_unlock_irqrestore(&h->lock, flags);
37823 free_irq(h->intr[h->intr_mode], h);
37824 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37825 @@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37826 dev_info(&h->pdev->dev, "Board READY.\n");
37827 dev_info(&h->pdev->dev,
37828 "Waiting for stale completions to drain.\n");
37829 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37830 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37831 msleep(10000);
37832 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37833 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37834
37835 rc = controller_reset_failed(h->cfgtable);
37836 if (rc)
37837 @@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37838 cciss_scsi_setup(h);
37839
37840 /* Turn the interrupts on so we can service requests */
37841 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37842 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37843
37844 /* Get the firmware version */
37845 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37846 @@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37847 kfree(flush_buf);
37848 if (return_code != IO_OK)
37849 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37850 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37851 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37852 free_irq(h->intr[h->intr_mode], h);
37853 }
37854
37855 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37856 index 7fda30e..2f27946 100644
37857 --- a/drivers/block/cciss.h
37858 +++ b/drivers/block/cciss.h
37859 @@ -101,7 +101,7 @@ struct ctlr_info
37860 /* information about each logical volume */
37861 drive_info_struct *drv[CISS_MAX_LUN];
37862
37863 - struct access_method access;
37864 + struct access_method *access;
37865
37866 /* queue and queue Info */
37867 struct list_head reqQ;
37868 @@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37869 }
37870
37871 static struct access_method SA5_access = {
37872 - SA5_submit_command,
37873 - SA5_intr_mask,
37874 - SA5_fifo_full,
37875 - SA5_intr_pending,
37876 - SA5_completed,
37877 + .submit_command = SA5_submit_command,
37878 + .set_intr_mask = SA5_intr_mask,
37879 + .fifo_full = SA5_fifo_full,
37880 + .intr_pending = SA5_intr_pending,
37881 + .command_completed = SA5_completed,
37882 };
37883
37884 static struct access_method SA5B_access = {
37885 - SA5_submit_command,
37886 - SA5B_intr_mask,
37887 - SA5_fifo_full,
37888 - SA5B_intr_pending,
37889 - SA5_completed,
37890 + .submit_command = SA5_submit_command,
37891 + .set_intr_mask = SA5B_intr_mask,
37892 + .fifo_full = SA5_fifo_full,
37893 + .intr_pending = SA5B_intr_pending,
37894 + .command_completed = SA5_completed,
37895 };
37896
37897 static struct access_method SA5_performant_access = {
37898 - SA5_submit_command,
37899 - SA5_performant_intr_mask,
37900 - SA5_fifo_full,
37901 - SA5_performant_intr_pending,
37902 - SA5_performant_completed,
37903 + .submit_command = SA5_submit_command,
37904 + .set_intr_mask = SA5_performant_intr_mask,
37905 + .fifo_full = SA5_fifo_full,
37906 + .intr_pending = SA5_performant_intr_pending,
37907 + .command_completed = SA5_performant_completed,
37908 };
37909
37910 struct board_type {
37911 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37912 index 2b94403..fd6ad1f 100644
37913 --- a/drivers/block/cpqarray.c
37914 +++ b/drivers/block/cpqarray.c
37915 @@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37916 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37917 goto Enomem4;
37918 }
37919 - hba[i]->access.set_intr_mask(hba[i], 0);
37920 + hba[i]->access->set_intr_mask(hba[i], 0);
37921 if (request_irq(hba[i]->intr, do_ida_intr,
37922 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37923 {
37924 @@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37925 add_timer(&hba[i]->timer);
37926
37927 /* Enable IRQ now that spinlock and rate limit timer are set up */
37928 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37929 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37930
37931 for(j=0; j<NWD; j++) {
37932 struct gendisk *disk = ida_gendisk[i][j];
37933 @@ -694,7 +694,7 @@ DBGINFO(
37934 for(i=0; i<NR_PRODUCTS; i++) {
37935 if (board_id == products[i].board_id) {
37936 c->product_name = products[i].product_name;
37937 - c->access = *(products[i].access);
37938 + c->access = products[i].access;
37939 break;
37940 }
37941 }
37942 @@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37943 hba[ctlr]->intr = intr;
37944 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37945 hba[ctlr]->product_name = products[j].product_name;
37946 - hba[ctlr]->access = *(products[j].access);
37947 + hba[ctlr]->access = products[j].access;
37948 hba[ctlr]->ctlr = ctlr;
37949 hba[ctlr]->board_id = board_id;
37950 hba[ctlr]->pci_dev = NULL; /* not PCI */
37951 @@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37952
37953 while((c = h->reqQ) != NULL) {
37954 /* Can't do anything if we're busy */
37955 - if (h->access.fifo_full(h) == 0)
37956 + if (h->access->fifo_full(h) == 0)
37957 return;
37958
37959 /* Get the first entry from the request Q */
37960 @@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37961 h->Qdepth--;
37962
37963 /* Tell the controller to do our bidding */
37964 - h->access.submit_command(h, c);
37965 + h->access->submit_command(h, c);
37966
37967 /* Get onto the completion Q */
37968 addQ(&h->cmpQ, c);
37969 @@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37970 unsigned long flags;
37971 __u32 a,a1;
37972
37973 - istat = h->access.intr_pending(h);
37974 + istat = h->access->intr_pending(h);
37975 /* Is this interrupt for us? */
37976 if (istat == 0)
37977 return IRQ_NONE;
37978 @@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37979 */
37980 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37981 if (istat & FIFO_NOT_EMPTY) {
37982 - while((a = h->access.command_completed(h))) {
37983 + while((a = h->access->command_completed(h))) {
37984 a1 = a; a &= ~3;
37985 if ((c = h->cmpQ) == NULL)
37986 {
37987 @@ -1448,11 +1448,11 @@ static int sendcmd(
37988 /*
37989 * Disable interrupt
37990 */
37991 - info_p->access.set_intr_mask(info_p, 0);
37992 + info_p->access->set_intr_mask(info_p, 0);
37993 /* Make sure there is room in the command FIFO */
37994 /* Actually it should be completely empty at this time. */
37995 for (i = 200000; i > 0; i--) {
37996 - temp = info_p->access.fifo_full(info_p);
37997 + temp = info_p->access->fifo_full(info_p);
37998 if (temp != 0) {
37999 break;
38000 }
38001 @@ -1465,7 +1465,7 @@ DBG(
38002 /*
38003 * Send the cmd
38004 */
38005 - info_p->access.submit_command(info_p, c);
38006 + info_p->access->submit_command(info_p, c);
38007 complete = pollcomplete(ctlr);
38008
38009 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38010 @@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38011 * we check the new geometry. Then turn interrupts back on when
38012 * we're done.
38013 */
38014 - host->access.set_intr_mask(host, 0);
38015 + host->access->set_intr_mask(host, 0);
38016 getgeometry(ctlr);
38017 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38018 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38019
38020 for(i=0; i<NWD; i++) {
38021 struct gendisk *disk = ida_gendisk[ctlr][i];
38022 @@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38023 /* Wait (up to 2 seconds) for a command to complete */
38024
38025 for (i = 200000; i > 0; i--) {
38026 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
38027 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
38028 if (done == 0) {
38029 udelay(10); /* a short fixed delay */
38030 } else
38031 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38032 index be73e9d..7fbf140 100644
38033 --- a/drivers/block/cpqarray.h
38034 +++ b/drivers/block/cpqarray.h
38035 @@ -99,7 +99,7 @@ struct ctlr_info {
38036 drv_info_t drv[NWD];
38037 struct proc_dir_entry *proc;
38038
38039 - struct access_method access;
38040 + struct access_method *access;
38041
38042 cmdlist_t *reqQ;
38043 cmdlist_t *cmpQ;
38044 diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38045 index 434c77d..6d3219a 100644
38046 --- a/drivers/block/drbd/drbd_bitmap.c
38047 +++ b/drivers/block/drbd/drbd_bitmap.c
38048 @@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38049 submit_bio(rw, bio);
38050 /* this should not count as user activity and cause the
38051 * resync to throttle -- see drbd_rs_should_slow_down(). */
38052 - atomic_add(len >> 9, &device->rs_sect_ev);
38053 + atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38054 }
38055 }
38056
38057 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38058 index 9b22f8f..f2932af 100644
38059 --- a/drivers/block/drbd/drbd_int.h
38060 +++ b/drivers/block/drbd/drbd_int.h
38061 @@ -385,7 +385,7 @@ struct drbd_epoch {
38062 struct drbd_connection *connection;
38063 struct list_head list;
38064 unsigned int barrier_nr;
38065 - atomic_t epoch_size; /* increased on every request added. */
38066 + atomic_unchecked_t epoch_size; /* increased on every request added. */
38067 atomic_t active; /* increased on every req. added, and dec on every finished. */
38068 unsigned long flags;
38069 };
38070 @@ -946,7 +946,7 @@ struct drbd_device {
38071 unsigned int al_tr_number;
38072 int al_tr_cycle;
38073 wait_queue_head_t seq_wait;
38074 - atomic_t packet_seq;
38075 + atomic_unchecked_t packet_seq;
38076 unsigned int peer_seq;
38077 spinlock_t peer_seq_lock;
38078 unsigned long comm_bm_set; /* communicated number of set bits. */
38079 @@ -955,8 +955,8 @@ struct drbd_device {
38080 struct mutex own_state_mutex;
38081 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38082 char congestion_reason; /* Why we where congested... */
38083 - atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38084 - atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38085 + atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38086 + atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38087 int rs_last_sect_ev; /* counter to compare with */
38088 int rs_last_events; /* counter of read or write "events" (unit sectors)
38089 * on the lower level device when we last looked. */
38090 @@ -1567,7 +1567,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
38091 char __user *uoptval;
38092 int err;
38093
38094 - uoptval = (char __user __force *)optval;
38095 + uoptval = (char __force_user *)optval;
38096
38097 set_fs(KERNEL_DS);
38098 if (level == SOL_SOCKET)
38099 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38100 index 973c185..05d8b1a 100644
38101 --- a/drivers/block/drbd/drbd_main.c
38102 +++ b/drivers/block/drbd/drbd_main.c
38103 @@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38104 p->sector = sector;
38105 p->block_id = block_id;
38106 p->blksize = blksize;
38107 - p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38108 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38109 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38110 }
38111
38112 @@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38113 return -EIO;
38114 p->sector = cpu_to_be64(req->i.sector);
38115 p->block_id = (unsigned long)req;
38116 - p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38117 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38118 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38119 if (device->state.conn >= C_SYNC_SOURCE &&
38120 device->state.conn <= C_PAUSED_SYNC_T)
38121 @@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38122 atomic_set(&device->unacked_cnt, 0);
38123 atomic_set(&device->local_cnt, 0);
38124 atomic_set(&device->pp_in_use_by_net, 0);
38125 - atomic_set(&device->rs_sect_in, 0);
38126 - atomic_set(&device->rs_sect_ev, 0);
38127 + atomic_set_unchecked(&device->rs_sect_in, 0);
38128 + atomic_set_unchecked(&device->rs_sect_ev, 0);
38129 atomic_set(&device->ap_in_flight, 0);
38130 atomic_set(&device->md_io.in_use, 0);
38131
38132 @@ -2688,8 +2688,8 @@ void drbd_destroy_connection(struct kref *kref)
38133 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38134 struct drbd_resource *resource = connection->resource;
38135
38136 - if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38137 - drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38138 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38139 + drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38140 kfree(connection->current_epoch);
38141
38142 idr_destroy(&connection->peer_devices);
38143 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38144 index 1cd47df..57c53c0 100644
38145 --- a/drivers/block/drbd/drbd_nl.c
38146 +++ b/drivers/block/drbd/drbd_nl.c
38147 @@ -3645,13 +3645,13 @@ finish:
38148
38149 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38150 {
38151 - static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38152 + static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38153 struct sk_buff *msg;
38154 struct drbd_genlmsghdr *d_out;
38155 unsigned seq;
38156 int err = -ENOMEM;
38157
38158 - seq = atomic_inc_return(&drbd_genl_seq);
38159 + seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38160 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38161 if (!msg)
38162 goto failed;
38163 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38164 index 6960fb0..215d76b 100644
38165 --- a/drivers/block/drbd/drbd_receiver.c
38166 +++ b/drivers/block/drbd/drbd_receiver.c
38167 @@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38168 struct drbd_device *device = peer_device->device;
38169 int err;
38170
38171 - atomic_set(&device->packet_seq, 0);
38172 + atomic_set_unchecked(&device->packet_seq, 0);
38173 device->peer_seq = 0;
38174
38175 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38176 @@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38177 do {
38178 next_epoch = NULL;
38179
38180 - epoch_size = atomic_read(&epoch->epoch_size);
38181 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38182
38183 switch (ev & ~EV_CLEANUP) {
38184 case EV_PUT:
38185 @@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38186 rv = FE_DESTROYED;
38187 } else {
38188 epoch->flags = 0;
38189 - atomic_set(&epoch->epoch_size, 0);
38190 + atomic_set_unchecked(&epoch->epoch_size, 0);
38191 /* atomic_set(&epoch->active, 0); is already zero */
38192 if (rv == FE_STILL_LIVE)
38193 rv = FE_RECYCLED;
38194 @@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38195 conn_wait_active_ee_empty(connection);
38196 drbd_flush(connection);
38197
38198 - if (atomic_read(&connection->current_epoch->epoch_size)) {
38199 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38200 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38201 if (epoch)
38202 break;
38203 @@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38204 }
38205
38206 epoch->flags = 0;
38207 - atomic_set(&epoch->epoch_size, 0);
38208 + atomic_set_unchecked(&epoch->epoch_size, 0);
38209 atomic_set(&epoch->active, 0);
38210
38211 spin_lock(&connection->epoch_lock);
38212 - if (atomic_read(&connection->current_epoch->epoch_size)) {
38213 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38214 list_add(&epoch->list, &connection->current_epoch->list);
38215 connection->current_epoch = epoch;
38216 connection->epochs++;
38217 @@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38218 list_add_tail(&peer_req->w.list, &device->sync_ee);
38219 spin_unlock_irq(&device->resource->req_lock);
38220
38221 - atomic_add(pi->size >> 9, &device->rs_sect_ev);
38222 + atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38223 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38224 return 0;
38225
38226 @@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38227 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38228 }
38229
38230 - atomic_add(pi->size >> 9, &device->rs_sect_in);
38231 + atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38232
38233 return err;
38234 }
38235 @@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38236
38237 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38238 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38239 - atomic_inc(&connection->current_epoch->epoch_size);
38240 + atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38241 err2 = drbd_drain_block(peer_device, pi->size);
38242 if (!err)
38243 err = err2;
38244 @@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38245
38246 spin_lock(&connection->epoch_lock);
38247 peer_req->epoch = connection->current_epoch;
38248 - atomic_inc(&peer_req->epoch->epoch_size);
38249 + atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38250 atomic_inc(&peer_req->epoch->active);
38251 spin_unlock(&connection->epoch_lock);
38252
38253 @@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38254
38255 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38256 (int)part_stat_read(&disk->part0, sectors[1]) -
38257 - atomic_read(&device->rs_sect_ev);
38258 + atomic_read_unchecked(&device->rs_sect_ev);
38259
38260 if (atomic_read(&device->ap_actlog_cnt)
38261 || !device->rs_last_events || curr_events - device->rs_last_events > 64) {
38262 @@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38263 device->use_csums = true;
38264 } else if (pi->cmd == P_OV_REPLY) {
38265 /* track progress, we may need to throttle */
38266 - atomic_add(size >> 9, &device->rs_sect_in);
38267 + atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38268 peer_req->w.cb = w_e_end_ov_reply;
38269 dec_rs_pending(device);
38270 /* drbd_rs_begin_io done when we sent this request,
38271 @@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38272 goto out_free_e;
38273
38274 submit_for_resync:
38275 - atomic_add(size >> 9, &device->rs_sect_ev);
38276 + atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38277
38278 submit:
38279 update_receiver_timing_details(connection, drbd_submit_peer_request);
38280 @@ -4564,7 +4564,7 @@ struct data_cmd {
38281 int expect_payload;
38282 size_t pkt_size;
38283 int (*fn)(struct drbd_connection *, struct packet_info *);
38284 -};
38285 +} __do_const;
38286
38287 static struct data_cmd drbd_cmd_handler[] = {
38288 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38289 @@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38290 if (!list_empty(&connection->current_epoch->list))
38291 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38292 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38293 - atomic_set(&connection->current_epoch->epoch_size, 0);
38294 + atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38295 connection->send.seen_any_write_yet = false;
38296
38297 drbd_info(connection, "Connection closed\n");
38298 @@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38299 put_ldev(device);
38300 }
38301 dec_rs_pending(device);
38302 - atomic_add(blksize >> 9, &device->rs_sect_in);
38303 + atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38304
38305 return 0;
38306 }
38307 @@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38308 struct asender_cmd {
38309 size_t pkt_size;
38310 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38311 -};
38312 +} __do_const;
38313
38314 static struct asender_cmd asender_tbl[] = {
38315 [P_PING] = { 0, got_Ping },
38316 diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38317 index d2d1f97..6a1188f 100644
38318 --- a/drivers/block/drbd/drbd_worker.c
38319 +++ b/drivers/block/drbd/drbd_worker.c
38320 @@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38321 list_add_tail(&peer_req->w.list, &device->read_ee);
38322 spin_unlock_irq(&device->resource->req_lock);
38323
38324 - atomic_add(size >> 9, &device->rs_sect_ev);
38325 + atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38326 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38327 return 0;
38328
38329 @@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38330 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38331 int number, mxb;
38332
38333 - sect_in = atomic_xchg(&device->rs_sect_in, 0);
38334 + sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38335 device->rs_in_flight -= sect_in;
38336
38337 rcu_read_lock();
38338 @@ -1594,8 +1594,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38339 {
38340 struct fifo_buffer *plan;
38341
38342 - atomic_set(&device->rs_sect_in, 0);
38343 - atomic_set(&device->rs_sect_ev, 0);
38344 + atomic_set_unchecked(&device->rs_sect_in, 0);
38345 + atomic_set_unchecked(&device->rs_sect_ev, 0);
38346 device->rs_in_flight = 0;
38347
38348 /* Updating the RCU protected object in place is necessary since
38349 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38350 index 6cb1beb..bf490f7 100644
38351 --- a/drivers/block/loop.c
38352 +++ b/drivers/block/loop.c
38353 @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38354
38355 file_start_write(file);
38356 set_fs(get_ds());
38357 - bw = file->f_op->write(file, buf, len, &pos);
38358 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38359 set_fs(old_fs);
38360 file_end_write(file);
38361 if (likely(bw == len))
38362 diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
38363 index e2bb8af..44b8aef 100644
38364 --- a/drivers/block/nvme-core.c
38365 +++ b/drivers/block/nvme-core.c
38366 @@ -73,7 +73,6 @@ static LIST_HEAD(dev_list);
38367 static struct task_struct *nvme_thread;
38368 static struct workqueue_struct *nvme_workq;
38369 static wait_queue_head_t nvme_kthread_wait;
38370 -static struct notifier_block nvme_nb;
38371
38372 static void nvme_reset_failed_dev(struct work_struct *ws);
38373
38374 @@ -2926,6 +2925,10 @@ static struct pci_driver nvme_driver = {
38375 .err_handler = &nvme_err_handler,
38376 };
38377
38378 +static struct notifier_block nvme_nb = {
38379 + .notifier_call = &nvme_cpu_notify,
38380 +};
38381 +
38382 static int __init nvme_init(void)
38383 {
38384 int result;
38385 @@ -2942,7 +2945,6 @@ static int __init nvme_init(void)
38386 else if (result > 0)
38387 nvme_major = result;
38388
38389 - nvme_nb.notifier_call = &nvme_cpu_notify;
38390 result = register_hotcpu_notifier(&nvme_nb);
38391 if (result)
38392 goto unregister_blkdev;
38393 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38394 index 09e628da..7607aaa 100644
38395 --- a/drivers/block/pktcdvd.c
38396 +++ b/drivers/block/pktcdvd.c
38397 @@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38398
38399 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38400 {
38401 - return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38402 + return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38403 }
38404
38405 /*
38406 @@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38407 return -EROFS;
38408 }
38409 pd->settings.fp = ti.fp;
38410 - pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38411 + pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38412
38413 if (ti.nwa_v) {
38414 pd->nwa = be32_to_cpu(ti.next_writable);
38415 diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38416 index e5565fb..71be10b4 100644
38417 --- a/drivers/block/smart1,2.h
38418 +++ b/drivers/block/smart1,2.h
38419 @@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38420 }
38421
38422 static struct access_method smart4_access = {
38423 - smart4_submit_command,
38424 - smart4_intr_mask,
38425 - smart4_fifo_full,
38426 - smart4_intr_pending,
38427 - smart4_completed,
38428 + .submit_command = smart4_submit_command,
38429 + .set_intr_mask = smart4_intr_mask,
38430 + .fifo_full = smart4_fifo_full,
38431 + .intr_pending = smart4_intr_pending,
38432 + .command_completed = smart4_completed,
38433 };
38434
38435 /*
38436 @@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38437 }
38438
38439 static struct access_method smart2_access = {
38440 - smart2_submit_command,
38441 - smart2_intr_mask,
38442 - smart2_fifo_full,
38443 - smart2_intr_pending,
38444 - smart2_completed,
38445 + .submit_command = smart2_submit_command,
38446 + .set_intr_mask = smart2_intr_mask,
38447 + .fifo_full = smart2_fifo_full,
38448 + .intr_pending = smart2_intr_pending,
38449 + .command_completed = smart2_completed,
38450 };
38451
38452 /*
38453 @@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38454 }
38455
38456 static struct access_method smart2e_access = {
38457 - smart2e_submit_command,
38458 - smart2e_intr_mask,
38459 - smart2e_fifo_full,
38460 - smart2e_intr_pending,
38461 - smart2e_completed,
38462 + .submit_command = smart2e_submit_command,
38463 + .set_intr_mask = smart2e_intr_mask,
38464 + .fifo_full = smart2e_fifo_full,
38465 + .intr_pending = smart2e_intr_pending,
38466 + .command_completed = smart2e_completed,
38467 };
38468
38469 /*
38470 @@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38471 }
38472
38473 static struct access_method smart1_access = {
38474 - smart1_submit_command,
38475 - smart1_intr_mask,
38476 - smart1_fifo_full,
38477 - smart1_intr_pending,
38478 - smart1_completed,
38479 + .submit_command = smart1_submit_command,
38480 + .set_intr_mask = smart1_intr_mask,
38481 + .fifo_full = smart1_fifo_full,
38482 + .intr_pending = smart1_intr_pending,
38483 + .command_completed = smart1_completed,
38484 };
38485 diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38486 index f038dba..bb74c08 100644
38487 --- a/drivers/bluetooth/btwilink.c
38488 +++ b/drivers/bluetooth/btwilink.c
38489 @@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38490
38491 static int bt_ti_probe(struct platform_device *pdev)
38492 {
38493 - static struct ti_st *hst;
38494 + struct ti_st *hst;
38495 struct hci_dev *hdev;
38496 int err;
38497
38498 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38499 index 5d28a45..a538f90 100644
38500 --- a/drivers/cdrom/cdrom.c
38501 +++ b/drivers/cdrom/cdrom.c
38502 @@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38503 ENSURE(reset, CDC_RESET);
38504 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38505 cdi->mc_flags = 0;
38506 - cdo->n_minors = 0;
38507 cdi->options = CDO_USE_FFLAGS;
38508
38509 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38510 @@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38511 else
38512 cdi->cdda_method = CDDA_OLD;
38513
38514 - if (!cdo->generic_packet)
38515 - cdo->generic_packet = cdrom_dummy_generic_packet;
38516 + if (!cdo->generic_packet) {
38517 + pax_open_kernel();
38518 + *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38519 + pax_close_kernel();
38520 + }
38521
38522 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38523 mutex_lock(&cdrom_mutex);
38524 @@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38525 if (cdi->exit)
38526 cdi->exit(cdi);
38527
38528 - cdi->ops->n_minors--;
38529 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38530 }
38531
38532 @@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38533 */
38534 nr = nframes;
38535 do {
38536 - cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38537 + cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38538 if (cgc.buffer)
38539 break;
38540
38541 @@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38542 struct cdrom_device_info *cdi;
38543 int ret;
38544
38545 - ret = scnprintf(info + *pos, max_size - *pos, header);
38546 + ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38547 if (!ret)
38548 return 1;
38549
38550 diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38551 index 584bc31..e64a12c 100644
38552 --- a/drivers/cdrom/gdrom.c
38553 +++ b/drivers/cdrom/gdrom.c
38554 @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38555 .audio_ioctl = gdrom_audio_ioctl,
38556 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38557 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38558 - .n_minors = 1,
38559 };
38560
38561 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38562 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38563 index efefd12..4f1d494 100644
38564 --- a/drivers/char/Kconfig
38565 +++ b/drivers/char/Kconfig
38566 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38567
38568 config DEVKMEM
38569 bool "/dev/kmem virtual device support"
38570 - default y
38571 + default n
38572 + depends on !GRKERNSEC_KMEM
38573 help
38574 Say Y here if you want to support the /dev/kmem device. The
38575 /dev/kmem device is rarely used, but can be used for certain
38576 @@ -577,6 +578,7 @@ config DEVPORT
38577 bool
38578 depends on !M68K
38579 depends on ISA || PCI
38580 + depends on !GRKERNSEC_KMEM
38581 default y
38582
38583 source "drivers/s390/char/Kconfig"
38584 diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38585 index a48e05b..6bac831 100644
38586 --- a/drivers/char/agp/compat_ioctl.c
38587 +++ b/drivers/char/agp/compat_ioctl.c
38588 @@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38589 return -ENOMEM;
38590 }
38591
38592 - if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38593 + if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38594 sizeof(*usegment) * ureserve.seg_count)) {
38595 kfree(usegment);
38596 kfree(ksegment);
38597 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38598 index 09f17eb..8531d2f 100644
38599 --- a/drivers/char/agp/frontend.c
38600 +++ b/drivers/char/agp/frontend.c
38601 @@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38602 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38603 return -EFAULT;
38604
38605 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38606 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38607 return -EFAULT;
38608
38609 client = agp_find_client_by_pid(reserve.pid);
38610 @@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38611 if (segment == NULL)
38612 return -ENOMEM;
38613
38614 - if (copy_from_user(segment, (void __user *) reserve.seg_list,
38615 + if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38616 sizeof(struct agp_segment) * reserve.seg_count)) {
38617 kfree(segment);
38618 return -EFAULT;
38619 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38620 index 4f94375..413694e 100644
38621 --- a/drivers/char/genrtc.c
38622 +++ b/drivers/char/genrtc.c
38623 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38624 switch (cmd) {
38625
38626 case RTC_PLL_GET:
38627 + memset(&pll, 0, sizeof(pll));
38628 if (get_rtc_pll(&pll))
38629 return -EINVAL;
38630 else
38631 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38632 index d5d4cd8..22d561d 100644
38633 --- a/drivers/char/hpet.c
38634 +++ b/drivers/char/hpet.c
38635 @@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38636 }
38637
38638 static int
38639 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38640 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38641 struct hpet_info *info)
38642 {
38643 struct hpet_timer __iomem *timer;
38644 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38645 index f816211..89eadea 100644
38646 --- a/drivers/char/ipmi/ipmi_msghandler.c
38647 +++ b/drivers/char/ipmi/ipmi_msghandler.c
38648 @@ -438,7 +438,7 @@ struct ipmi_smi {
38649 struct proc_dir_entry *proc_dir;
38650 char proc_dir_name[10];
38651
38652 - atomic_t stats[IPMI_NUM_STATS];
38653 + atomic_unchecked_t stats[IPMI_NUM_STATS];
38654
38655 /*
38656 * run_to_completion duplicate of smb_info, smi_info
38657 @@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38658 static DEFINE_MUTEX(smi_watchers_mutex);
38659
38660 #define ipmi_inc_stat(intf, stat) \
38661 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38662 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38663 #define ipmi_get_stat(intf, stat) \
38664 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38665 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38666
38667 static int is_lan_addr(struct ipmi_addr *addr)
38668 {
38669 @@ -2925,7 +2925,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38670 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38671 init_waitqueue_head(&intf->waitq);
38672 for (i = 0; i < IPMI_NUM_STATS; i++)
38673 - atomic_set(&intf->stats[i], 0);
38674 + atomic_set_unchecked(&intf->stats[i], 0);
38675
38676 intf->proc_dir = NULL;
38677
38678 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38679 index 5c4e1f6..0ea58f9 100644
38680 --- a/drivers/char/ipmi/ipmi_si_intf.c
38681 +++ b/drivers/char/ipmi/ipmi_si_intf.c
38682 @@ -285,7 +285,7 @@ struct smi_info {
38683 unsigned char slave_addr;
38684
38685 /* Counters and things for the proc filesystem. */
38686 - atomic_t stats[SI_NUM_STATS];
38687 + atomic_unchecked_t stats[SI_NUM_STATS];
38688
38689 struct task_struct *thread;
38690
38691 @@ -294,9 +294,9 @@ struct smi_info {
38692 };
38693
38694 #define smi_inc_stat(smi, stat) \
38695 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38696 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38697 #define smi_get_stat(smi, stat) \
38698 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38699 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38700
38701 #define SI_MAX_PARMS 4
38702
38703 @@ -3377,7 +3377,7 @@ static int try_smi_init(struct smi_info *new_smi)
38704 atomic_set(&new_smi->req_events, 0);
38705 new_smi->run_to_completion = false;
38706 for (i = 0; i < SI_NUM_STATS; i++)
38707 - atomic_set(&new_smi->stats[i], 0);
38708 + atomic_set_unchecked(&new_smi->stats[i], 0);
38709
38710 new_smi->interrupt_disabled = true;
38711 atomic_set(&new_smi->stop_operation, 0);
38712 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38713 index 524b707..29d07c1 100644
38714 --- a/drivers/char/mem.c
38715 +++ b/drivers/char/mem.c
38716 @@ -18,6 +18,7 @@
38717 #include <linux/raw.h>
38718 #include <linux/tty.h>
38719 #include <linux/capability.h>
38720 +#include <linux/security.h>
38721 #include <linux/ptrace.h>
38722 #include <linux/device.h>
38723 #include <linux/highmem.h>
38724 @@ -36,6 +37,10 @@
38725
38726 #define DEVPORT_MINOR 4
38727
38728 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38729 +extern const struct file_operations grsec_fops;
38730 +#endif
38731 +
38732 static inline unsigned long size_inside_page(unsigned long start,
38733 unsigned long size)
38734 {
38735 @@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38736
38737 while (cursor < to) {
38738 if (!devmem_is_allowed(pfn)) {
38739 +#ifdef CONFIG_GRKERNSEC_KMEM
38740 + gr_handle_mem_readwrite(from, to);
38741 +#else
38742 printk(KERN_INFO
38743 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38744 current->comm, from, to);
38745 +#endif
38746 return 0;
38747 }
38748 cursor += PAGE_SIZE;
38749 @@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38750 }
38751 return 1;
38752 }
38753 +#elif defined(CONFIG_GRKERNSEC_KMEM)
38754 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38755 +{
38756 + return 0;
38757 +}
38758 #else
38759 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38760 {
38761 @@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38762
38763 while (count > 0) {
38764 unsigned long remaining;
38765 + char *temp;
38766
38767 sz = size_inside_page(p, count);
38768
38769 @@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38770 if (!ptr)
38771 return -EFAULT;
38772
38773 - remaining = copy_to_user(buf, ptr, sz);
38774 +#ifdef CONFIG_PAX_USERCOPY
38775 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38776 + if (!temp) {
38777 + unxlate_dev_mem_ptr(p, ptr);
38778 + return -ENOMEM;
38779 + }
38780 + memcpy(temp, ptr, sz);
38781 +#else
38782 + temp = ptr;
38783 +#endif
38784 +
38785 + remaining = copy_to_user(buf, temp, sz);
38786 +
38787 +#ifdef CONFIG_PAX_USERCOPY
38788 + kfree(temp);
38789 +#endif
38790 +
38791 unxlate_dev_mem_ptr(p, ptr);
38792 if (remaining)
38793 return -EFAULT;
38794 @@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38795 size_t count, loff_t *ppos)
38796 {
38797 unsigned long p = *ppos;
38798 - ssize_t low_count, read, sz;
38799 + ssize_t low_count, read, sz, err = 0;
38800 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38801 - int err = 0;
38802
38803 read = 0;
38804 if (p < (unsigned long) high_memory) {
38805 @@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38806 }
38807 #endif
38808 while (low_count > 0) {
38809 + char *temp;
38810 +
38811 sz = size_inside_page(p, low_count);
38812
38813 /*
38814 @@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38815 */
38816 kbuf = xlate_dev_kmem_ptr((char *)p);
38817
38818 - if (copy_to_user(buf, kbuf, sz))
38819 +#ifdef CONFIG_PAX_USERCOPY
38820 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38821 + if (!temp)
38822 + return -ENOMEM;
38823 + memcpy(temp, kbuf, sz);
38824 +#else
38825 + temp = kbuf;
38826 +#endif
38827 +
38828 + err = copy_to_user(buf, temp, sz);
38829 +
38830 +#ifdef CONFIG_PAX_USERCOPY
38831 + kfree(temp);
38832 +#endif
38833 +
38834 + if (err)
38835 return -EFAULT;
38836 buf += sz;
38837 p += sz;
38838 @@ -797,6 +844,9 @@ static const struct memdev {
38839 #ifdef CONFIG_PRINTK
38840 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38841 #endif
38842 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38843 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38844 +#endif
38845 };
38846
38847 static int memory_open(struct inode *inode, struct file *filp)
38848 @@ -868,7 +918,7 @@ static int __init chr_dev_init(void)
38849 continue;
38850
38851 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38852 - NULL, devlist[minor].name);
38853 + NULL, "%s", devlist[minor].name);
38854 }
38855
38856 return tty_init();
38857 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38858 index 9df78e2..01ba9ae 100644
38859 --- a/drivers/char/nvram.c
38860 +++ b/drivers/char/nvram.c
38861 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38862
38863 spin_unlock_irq(&rtc_lock);
38864
38865 - if (copy_to_user(buf, contents, tmp - contents))
38866 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38867 return -EFAULT;
38868
38869 *ppos = i;
38870 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38871 index 0ea9986..e7b07e4 100644
38872 --- a/drivers/char/pcmcia/synclink_cs.c
38873 +++ b/drivers/char/pcmcia/synclink_cs.c
38874 @@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38875
38876 if (debug_level >= DEBUG_LEVEL_INFO)
38877 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38878 - __FILE__, __LINE__, info->device_name, port->count);
38879 + __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38880
38881 if (tty_port_close_start(port, tty, filp) == 0)
38882 goto cleanup;
38883 @@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38884 cleanup:
38885 if (debug_level >= DEBUG_LEVEL_INFO)
38886 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38887 - tty->driver->name, port->count);
38888 + tty->driver->name, atomic_read(&port->count));
38889 }
38890
38891 /* Wait until the transmitter is empty.
38892 @@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38893
38894 if (debug_level >= DEBUG_LEVEL_INFO)
38895 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38896 - __FILE__, __LINE__, tty->driver->name, port->count);
38897 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38898
38899 /* If port is closing, signal caller to try again */
38900 if (port->flags & ASYNC_CLOSING){
38901 @@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38902 goto cleanup;
38903 }
38904 spin_lock(&port->lock);
38905 - port->count++;
38906 + atomic_inc(&port->count);
38907 spin_unlock(&port->lock);
38908 spin_unlock_irqrestore(&info->netlock, flags);
38909
38910 - if (port->count == 1) {
38911 + if (atomic_read(&port->count) == 1) {
38912 /* 1st open on this device, init hardware */
38913 retval = startup(info, tty);
38914 if (retval < 0)
38915 @@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38916 unsigned short new_crctype;
38917
38918 /* return error if TTY interface open */
38919 - if (info->port.count)
38920 + if (atomic_read(&info->port.count))
38921 return -EBUSY;
38922
38923 switch (encoding)
38924 @@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
38925
38926 /* arbitrate between network and tty opens */
38927 spin_lock_irqsave(&info->netlock, flags);
38928 - if (info->port.count != 0 || info->netcount != 0) {
38929 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38930 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38931 spin_unlock_irqrestore(&info->netlock, flags);
38932 return -EBUSY;
38933 @@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38934 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38935
38936 /* return error if TTY interface open */
38937 - if (info->port.count)
38938 + if (atomic_read(&info->port.count))
38939 return -EBUSY;
38940
38941 if (cmd != SIOCWANDEV)
38942 diff --git a/drivers/char/random.c b/drivers/char/random.c
38943 index 04645c0..560e350 100644
38944 --- a/drivers/char/random.c
38945 +++ b/drivers/char/random.c
38946 @@ -289,9 +289,6 @@
38947 /*
38948 * To allow fractional bits to be tracked, the entropy_count field is
38949 * denominated in units of 1/8th bits.
38950 - *
38951 - * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38952 - * credit_entropy_bits() needs to be 64 bits wide.
38953 */
38954 #define ENTROPY_SHIFT 3
38955 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38956 @@ -439,9 +436,9 @@ struct entropy_store {
38957 };
38958
38959 static void push_to_pool(struct work_struct *work);
38960 -static __u32 input_pool_data[INPUT_POOL_WORDS];
38961 -static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38962 -static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38963 +static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38964 +static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38965 +static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38966
38967 static struct entropy_store input_pool = {
38968 .poolinfo = &poolinfo_table[0],
38969 @@ -635,7 +632,7 @@ retry:
38970 /* The +2 corresponds to the /4 in the denominator */
38971
38972 do {
38973 - unsigned int anfrac = min(pnfrac, pool_size/2);
38974 + u64 anfrac = min(pnfrac, pool_size/2);
38975 unsigned int add =
38976 ((pool_size - entropy_count)*anfrac*3) >> s;
38977
38978 @@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38979
38980 extract_buf(r, tmp);
38981 i = min_t(int, nbytes, EXTRACT_SIZE);
38982 - if (copy_to_user(buf, tmp, i)) {
38983 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38984 ret = -EFAULT;
38985 break;
38986 }
38987 @@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
38988 static int proc_do_uuid(struct ctl_table *table, int write,
38989 void __user *buffer, size_t *lenp, loff_t *ppos)
38990 {
38991 - struct ctl_table fake_table;
38992 + ctl_table_no_const fake_table;
38993 unsigned char buf[64], tmp_uuid[16], *uuid;
38994
38995 uuid = table->data;
38996 @@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38997 static int proc_do_entropy(struct ctl_table *table, int write,
38998 void __user *buffer, size_t *lenp, loff_t *ppos)
38999 {
39000 - struct ctl_table fake_table;
39001 + ctl_table_no_const fake_table;
39002 int entropy_count;
39003
39004 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39005 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39006 index 7cc1fe22..b602d6b 100644
39007 --- a/drivers/char/sonypi.c
39008 +++ b/drivers/char/sonypi.c
39009 @@ -54,6 +54,7 @@
39010
39011 #include <asm/uaccess.h>
39012 #include <asm/io.h>
39013 +#include <asm/local.h>
39014
39015 #include <linux/sonypi.h>
39016
39017 @@ -490,7 +491,7 @@ static struct sonypi_device {
39018 spinlock_t fifo_lock;
39019 wait_queue_head_t fifo_proc_list;
39020 struct fasync_struct *fifo_async;
39021 - int open_count;
39022 + local_t open_count;
39023 int model;
39024 struct input_dev *input_jog_dev;
39025 struct input_dev *input_key_dev;
39026 @@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39027 static int sonypi_misc_release(struct inode *inode, struct file *file)
39028 {
39029 mutex_lock(&sonypi_device.lock);
39030 - sonypi_device.open_count--;
39031 + local_dec(&sonypi_device.open_count);
39032 mutex_unlock(&sonypi_device.lock);
39033 return 0;
39034 }
39035 @@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39036 {
39037 mutex_lock(&sonypi_device.lock);
39038 /* Flush input queue on first open */
39039 - if (!sonypi_device.open_count)
39040 + if (!local_read(&sonypi_device.open_count))
39041 kfifo_reset(&sonypi_device.fifo);
39042 - sonypi_device.open_count++;
39043 + local_inc(&sonypi_device.open_count);
39044 mutex_unlock(&sonypi_device.lock);
39045
39046 return 0;
39047 diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39048 index 565a947..dcdc06e 100644
39049 --- a/drivers/char/tpm/tpm_acpi.c
39050 +++ b/drivers/char/tpm/tpm_acpi.c
39051 @@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39052 virt = acpi_os_map_iomem(start, len);
39053 if (!virt) {
39054 kfree(log->bios_event_log);
39055 + log->bios_event_log = NULL;
39056 printk("%s: ERROR - Unable to map memory\n", __func__);
39057 return -EIO;
39058 }
39059
39060 - memcpy_fromio(log->bios_event_log, virt, len);
39061 + memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39062
39063 acpi_os_unmap_iomem(virt, len);
39064 return 0;
39065 diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39066 index 3a56a13..f8cbd25 100644
39067 --- a/drivers/char/tpm/tpm_eventlog.c
39068 +++ b/drivers/char/tpm/tpm_eventlog.c
39069 @@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39070 event = addr;
39071
39072 if ((event->event_type == 0 && event->event_size == 0) ||
39073 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39074 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39075 return NULL;
39076
39077 return addr;
39078 @@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39079 return NULL;
39080
39081 if ((event->event_type == 0 && event->event_size == 0) ||
39082 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39083 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39084 return NULL;
39085
39086 (*pos)++;
39087 @@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39088 int i;
39089
39090 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39091 - seq_putc(m, data[i]);
39092 + if (!seq_putc(m, data[i]))
39093 + return -EFAULT;
39094
39095 return 0;
39096 }
39097 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39098 index cf7a561..c319ce0 100644
39099 --- a/drivers/char/virtio_console.c
39100 +++ b/drivers/char/virtio_console.c
39101 @@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
39102 if (to_user) {
39103 ssize_t ret;
39104
39105 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39106 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39107 if (ret)
39108 return -EFAULT;
39109 } else {
39110 @@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39111 if (!port_has_data(port) && !port->host_connected)
39112 return 0;
39113
39114 - return fill_readbuf(port, ubuf, count, true);
39115 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39116 }
39117
39118 static int wait_port_writable(struct port *port, bool nonblock)
39119 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39120 index b9355da..9611f4e 100644
39121 --- a/drivers/clk/clk-composite.c
39122 +++ b/drivers/clk/clk-composite.c
39123 @@ -191,7 +191,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39124 struct clk *clk;
39125 struct clk_init_data init;
39126 struct clk_composite *composite;
39127 - struct clk_ops *clk_composite_ops;
39128 + clk_ops_no_const *clk_composite_ops;
39129
39130 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39131 if (!composite) {
39132 diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39133 index dd3a78c..386d49c 100644
39134 --- a/drivers/clk/socfpga/clk-gate.c
39135 +++ b/drivers/clk/socfpga/clk-gate.c
39136 @@ -22,6 +22,7 @@
39137 #include <linux/mfd/syscon.h>
39138 #include <linux/of.h>
39139 #include <linux/regmap.h>
39140 +#include <asm/pgtable.h>
39141
39142 #include "clk.h"
39143
39144 @@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39145 return 0;
39146 }
39147
39148 -static struct clk_ops gateclk_ops = {
39149 +static clk_ops_no_const gateclk_ops __read_only = {
39150 .prepare = socfpga_clk_prepare,
39151 .recalc_rate = socfpga_clk_recalc_rate,
39152 .get_parent = socfpga_clk_get_parent,
39153 @@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39154 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39155 socfpga_clk->hw.bit_idx = clk_gate[1];
39156
39157 - gateclk_ops.enable = clk_gate_ops.enable;
39158 - gateclk_ops.disable = clk_gate_ops.disable;
39159 + pax_open_kernel();
39160 + *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39161 + *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39162 + pax_close_kernel();
39163 }
39164
39165 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39166 diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39167 index de6da95..c98278b 100644
39168 --- a/drivers/clk/socfpga/clk-pll.c
39169 +++ b/drivers/clk/socfpga/clk-pll.c
39170 @@ -21,6 +21,7 @@
39171 #include <linux/io.h>
39172 #include <linux/of.h>
39173 #include <linux/of_address.h>
39174 +#include <asm/pgtable.h>
39175
39176 #include "clk.h"
39177
39178 @@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39179 CLK_MGR_PLL_CLK_SRC_MASK;
39180 }
39181
39182 -static struct clk_ops clk_pll_ops = {
39183 +static clk_ops_no_const clk_pll_ops __read_only = {
39184 .recalc_rate = clk_pll_recalc_rate,
39185 .get_parent = clk_pll_get_parent,
39186 };
39187 @@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39188 pll_clk->hw.hw.init = &init;
39189
39190 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39191 - clk_pll_ops.enable = clk_gate_ops.enable;
39192 - clk_pll_ops.disable = clk_gate_ops.disable;
39193 + pax_open_kernel();
39194 + *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39195 + *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39196 + pax_close_kernel();
39197
39198 clk = clk_register(NULL, &pll_clk->hw.hw);
39199 if (WARN_ON(IS_ERR(clk))) {
39200 diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39201 index b0c18ed..1713a80 100644
39202 --- a/drivers/cpufreq/acpi-cpufreq.c
39203 +++ b/drivers/cpufreq/acpi-cpufreq.c
39204 @@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39205 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39206 per_cpu(acfreq_data, cpu) = data;
39207
39208 - if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39209 - acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39210 + if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39211 + pax_open_kernel();
39212 + *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39213 + pax_close_kernel();
39214 + }
39215
39216 result = acpi_processor_register_performance(data->acpi_data, cpu);
39217 if (result)
39218 @@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39219 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39220 break;
39221 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39222 - acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39223 + pax_open_kernel();
39224 + *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39225 + pax_close_kernel();
39226 break;
39227 default:
39228 break;
39229 @@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39230 if (!msrs)
39231 return;
39232
39233 - acpi_cpufreq_driver.boost_supported = true;
39234 - acpi_cpufreq_driver.boost_enabled = boost_state(0);
39235 + pax_open_kernel();
39236 + *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39237 + *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39238 + pax_close_kernel();
39239
39240 cpu_notifier_register_begin();
39241
39242 diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39243 index f657c57..31d97ae 100644
39244 --- a/drivers/cpufreq/cpufreq-dt.c
39245 +++ b/drivers/cpufreq/cpufreq-dt.c
39246 @@ -362,7 +362,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39247 if (!IS_ERR(cpu_reg))
39248 regulator_put(cpu_reg);
39249
39250 - dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39251 + pax_open_kernel();
39252 + *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39253 + pax_close_kernel();
39254
39255 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39256 if (ret)
39257 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39258 index 4473eba..a4c9dc2 100644
39259 --- a/drivers/cpufreq/cpufreq.c
39260 +++ b/drivers/cpufreq/cpufreq.c
39261 @@ -2122,7 +2122,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39262 }
39263
39264 mutex_lock(&cpufreq_governor_mutex);
39265 - list_del(&governor->governor_list);
39266 + pax_list_del(&governor->governor_list);
39267 mutex_unlock(&cpufreq_governor_mutex);
39268 return;
39269 }
39270 @@ -2338,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39271 return NOTIFY_OK;
39272 }
39273
39274 -static struct notifier_block __refdata cpufreq_cpu_notifier = {
39275 +static struct notifier_block cpufreq_cpu_notifier = {
39276 .notifier_call = cpufreq_cpu_callback,
39277 };
39278
39279 @@ -2378,13 +2378,17 @@ int cpufreq_boost_trigger_state(int state)
39280 return 0;
39281
39282 write_lock_irqsave(&cpufreq_driver_lock, flags);
39283 - cpufreq_driver->boost_enabled = state;
39284 + pax_open_kernel();
39285 + *(bool *)&cpufreq_driver->boost_enabled = state;
39286 + pax_close_kernel();
39287 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39288
39289 ret = cpufreq_driver->set_boost(state);
39290 if (ret) {
39291 write_lock_irqsave(&cpufreq_driver_lock, flags);
39292 - cpufreq_driver->boost_enabled = !state;
39293 + pax_open_kernel();
39294 + *(bool *)&cpufreq_driver->boost_enabled = !state;
39295 + pax_close_kernel();
39296 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39297
39298 pr_err("%s: Cannot %s BOOST\n",
39299 @@ -2441,8 +2445,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39300
39301 pr_debug("trying to register driver %s\n", driver_data->name);
39302
39303 - if (driver_data->setpolicy)
39304 - driver_data->flags |= CPUFREQ_CONST_LOOPS;
39305 + if (driver_data->setpolicy) {
39306 + pax_open_kernel();
39307 + *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39308 + pax_close_kernel();
39309 + }
39310
39311 write_lock_irqsave(&cpufreq_driver_lock, flags);
39312 if (cpufreq_driver) {
39313 @@ -2457,8 +2464,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39314 * Check if driver provides function to enable boost -
39315 * if not, use cpufreq_boost_set_sw as default
39316 */
39317 - if (!cpufreq_driver->set_boost)
39318 - cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39319 + if (!cpufreq_driver->set_boost) {
39320 + pax_open_kernel();
39321 + *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39322 + pax_close_kernel();
39323 + }
39324
39325 ret = cpufreq_sysfs_create_file(&boost.attr);
39326 if (ret) {
39327 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39328 index 1b44496..b80ff5e 100644
39329 --- a/drivers/cpufreq/cpufreq_governor.c
39330 +++ b/drivers/cpufreq/cpufreq_governor.c
39331 @@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39332 struct dbs_data *dbs_data;
39333 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39334 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39335 - struct od_ops *od_ops = NULL;
39336 + const struct od_ops *od_ops = NULL;
39337 struct od_dbs_tuners *od_tuners = NULL;
39338 struct cs_dbs_tuners *cs_tuners = NULL;
39339 struct cpu_dbs_common_info *cpu_cdbs;
39340 @@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39341
39342 if ((cdata->governor == GOV_CONSERVATIVE) &&
39343 (!policy->governor->initialized)) {
39344 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39345 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39346
39347 cpufreq_register_notifier(cs_ops->notifier_block,
39348 CPUFREQ_TRANSITION_NOTIFIER);
39349 @@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39350
39351 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39352 (policy->governor->initialized == 1)) {
39353 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39354 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39355
39356 cpufreq_unregister_notifier(cs_ops->notifier_block,
39357 CPUFREQ_TRANSITION_NOTIFIER);
39358 diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39359 index cc401d1..8197340 100644
39360 --- a/drivers/cpufreq/cpufreq_governor.h
39361 +++ b/drivers/cpufreq/cpufreq_governor.h
39362 @@ -212,7 +212,7 @@ struct common_dbs_data {
39363 void (*exit)(struct dbs_data *dbs_data);
39364
39365 /* Governor specific ops, see below */
39366 - void *gov_ops;
39367 + const void *gov_ops;
39368 };
39369
39370 /* Governor Per policy data */
39371 @@ -232,7 +232,7 @@ struct od_ops {
39372 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39373 unsigned int freq_next, unsigned int relation);
39374 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39375 -};
39376 +} __no_const;
39377
39378 struct cs_ops {
39379 struct notifier_block *notifier_block;
39380 diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39381 index ad3f38f..8f086cd 100644
39382 --- a/drivers/cpufreq/cpufreq_ondemand.c
39383 +++ b/drivers/cpufreq/cpufreq_ondemand.c
39384 @@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39385
39386 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39387
39388 -static struct od_ops od_ops = {
39389 +static struct od_ops od_ops __read_only = {
39390 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39391 .powersave_bias_target = generic_powersave_bias_target,
39392 .freq_increase = dbs_freq_increase,
39393 @@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39394 (struct cpufreq_policy *, unsigned int, unsigned int),
39395 unsigned int powersave_bias)
39396 {
39397 - od_ops.powersave_bias_target = f;
39398 + pax_open_kernel();
39399 + *(void **)&od_ops.powersave_bias_target = f;
39400 + pax_close_kernel();
39401 od_set_powersave_bias(powersave_bias);
39402 }
39403 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39404
39405 void od_unregister_powersave_bias_handler(void)
39406 {
39407 - od_ops.powersave_bias_target = generic_powersave_bias_target;
39408 + pax_open_kernel();
39409 + *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39410 + pax_close_kernel();
39411 od_set_powersave_bias(0);
39412 }
39413 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39414 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39415 index 27bb6d3..4cf595c 100644
39416 --- a/drivers/cpufreq/intel_pstate.c
39417 +++ b/drivers/cpufreq/intel_pstate.c
39418 @@ -133,10 +133,10 @@ struct pstate_funcs {
39419 struct cpu_defaults {
39420 struct pstate_adjust_policy pid_policy;
39421 struct pstate_funcs funcs;
39422 -};
39423 +} __do_const;
39424
39425 static struct pstate_adjust_policy pid_params;
39426 -static struct pstate_funcs pstate_funcs;
39427 +static struct pstate_funcs *pstate_funcs;
39428
39429 struct perf_limits {
39430 int no_turbo;
39431 @@ -594,18 +594,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39432
39433 cpu->pstate.current_pstate = pstate;
39434
39435 - pstate_funcs.set(cpu, pstate);
39436 + pstate_funcs->set(cpu, pstate);
39437 }
39438
39439 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39440 {
39441 - cpu->pstate.min_pstate = pstate_funcs.get_min();
39442 - cpu->pstate.max_pstate = pstate_funcs.get_max();
39443 - cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39444 - cpu->pstate.scaling = pstate_funcs.get_scaling();
39445 + cpu->pstate.min_pstate = pstate_funcs->get_min();
39446 + cpu->pstate.max_pstate = pstate_funcs->get_max();
39447 + cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39448 + cpu->pstate.scaling = pstate_funcs->get_scaling();
39449
39450 - if (pstate_funcs.get_vid)
39451 - pstate_funcs.get_vid(cpu);
39452 + if (pstate_funcs->get_vid)
39453 + pstate_funcs->get_vid(cpu);
39454 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39455 }
39456
39457 @@ -875,9 +875,9 @@ static int intel_pstate_msrs_not_valid(void)
39458 rdmsrl(MSR_IA32_APERF, aperf);
39459 rdmsrl(MSR_IA32_MPERF, mperf);
39460
39461 - if (!pstate_funcs.get_max() ||
39462 - !pstate_funcs.get_min() ||
39463 - !pstate_funcs.get_turbo())
39464 + if (!pstate_funcs->get_max() ||
39465 + !pstate_funcs->get_min() ||
39466 + !pstate_funcs->get_turbo())
39467 return -ENODEV;
39468
39469 rdmsrl(MSR_IA32_APERF, tmp);
39470 @@ -891,7 +891,7 @@ static int intel_pstate_msrs_not_valid(void)
39471 return 0;
39472 }
39473
39474 -static void copy_pid_params(struct pstate_adjust_policy *policy)
39475 +static void copy_pid_params(const struct pstate_adjust_policy *policy)
39476 {
39477 pid_params.sample_rate_ms = policy->sample_rate_ms;
39478 pid_params.p_gain_pct = policy->p_gain_pct;
39479 @@ -903,12 +903,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39480
39481 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39482 {
39483 - pstate_funcs.get_max = funcs->get_max;
39484 - pstate_funcs.get_min = funcs->get_min;
39485 - pstate_funcs.get_turbo = funcs->get_turbo;
39486 - pstate_funcs.get_scaling = funcs->get_scaling;
39487 - pstate_funcs.set = funcs->set;
39488 - pstate_funcs.get_vid = funcs->get_vid;
39489 + pstate_funcs = funcs;
39490 }
39491
39492 #if IS_ENABLED(CONFIG_ACPI)
39493 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39494 index 529cfd9..0e28fff 100644
39495 --- a/drivers/cpufreq/p4-clockmod.c
39496 +++ b/drivers/cpufreq/p4-clockmod.c
39497 @@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39498 case 0x0F: /* Core Duo */
39499 case 0x16: /* Celeron Core */
39500 case 0x1C: /* Atom */
39501 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39502 + pax_open_kernel();
39503 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39504 + pax_close_kernel();
39505 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39506 case 0x0D: /* Pentium M (Dothan) */
39507 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39508 + pax_open_kernel();
39509 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39510 + pax_close_kernel();
39511 /* fall through */
39512 case 0x09: /* Pentium M (Banias) */
39513 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39514 @@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39515
39516 /* on P-4s, the TSC runs with constant frequency independent whether
39517 * throttling is active or not. */
39518 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39519 + pax_open_kernel();
39520 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39521 + pax_close_kernel();
39522
39523 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39524 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39525 diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39526 index 9bb42ba..b01b4a2 100644
39527 --- a/drivers/cpufreq/sparc-us3-cpufreq.c
39528 +++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39529 @@ -18,14 +18,12 @@
39530 #include <asm/head.h>
39531 #include <asm/timer.h>
39532
39533 -static struct cpufreq_driver *cpufreq_us3_driver;
39534 -
39535 struct us3_freq_percpu_info {
39536 struct cpufreq_frequency_table table[4];
39537 };
39538
39539 /* Indexed by cpu number. */
39540 -static struct us3_freq_percpu_info *us3_freq_table;
39541 +static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39542
39543 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39544 * in the Safari config register.
39545 @@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39546
39547 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39548 {
39549 - if (cpufreq_us3_driver)
39550 - us3_freq_target(policy, 0);
39551 + us3_freq_target(policy, 0);
39552
39553 return 0;
39554 }
39555
39556 +static int __init us3_freq_init(void);
39557 +static void __exit us3_freq_exit(void);
39558 +
39559 +static struct cpufreq_driver cpufreq_us3_driver = {
39560 + .init = us3_freq_cpu_init,
39561 + .verify = cpufreq_generic_frequency_table_verify,
39562 + .target_index = us3_freq_target,
39563 + .get = us3_freq_get,
39564 + .exit = us3_freq_cpu_exit,
39565 + .name = "UltraSPARC-III",
39566 +
39567 +};
39568 +
39569 static int __init us3_freq_init(void)
39570 {
39571 unsigned long manuf, impl, ver;
39572 - int ret;
39573
39574 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39575 return -ENODEV;
39576 @@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39577 (impl == CHEETAH_IMPL ||
39578 impl == CHEETAH_PLUS_IMPL ||
39579 impl == JAGUAR_IMPL ||
39580 - impl == PANTHER_IMPL)) {
39581 - struct cpufreq_driver *driver;
39582 -
39583 - ret = -ENOMEM;
39584 - driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39585 - if (!driver)
39586 - goto err_out;
39587 -
39588 - us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39589 - GFP_KERNEL);
39590 - if (!us3_freq_table)
39591 - goto err_out;
39592 -
39593 - driver->init = us3_freq_cpu_init;
39594 - driver->verify = cpufreq_generic_frequency_table_verify;
39595 - driver->target_index = us3_freq_target;
39596 - driver->get = us3_freq_get;
39597 - driver->exit = us3_freq_cpu_exit;
39598 - strcpy(driver->name, "UltraSPARC-III");
39599 -
39600 - cpufreq_us3_driver = driver;
39601 - ret = cpufreq_register_driver(driver);
39602 - if (ret)
39603 - goto err_out;
39604 -
39605 - return 0;
39606 -
39607 -err_out:
39608 - if (driver) {
39609 - kfree(driver);
39610 - cpufreq_us3_driver = NULL;
39611 - }
39612 - kfree(us3_freq_table);
39613 - us3_freq_table = NULL;
39614 - return ret;
39615 - }
39616 + impl == PANTHER_IMPL))
39617 + return cpufreq_register_driver(&cpufreq_us3_driver);
39618
39619 return -ENODEV;
39620 }
39621
39622 static void __exit us3_freq_exit(void)
39623 {
39624 - if (cpufreq_us3_driver) {
39625 - cpufreq_unregister_driver(cpufreq_us3_driver);
39626 - kfree(cpufreq_us3_driver);
39627 - cpufreq_us3_driver = NULL;
39628 - kfree(us3_freq_table);
39629 - us3_freq_table = NULL;
39630 - }
39631 + cpufreq_unregister_driver(&cpufreq_us3_driver);
39632 }
39633
39634 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39635 diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39636 index 7d4a315..21bb886 100644
39637 --- a/drivers/cpufreq/speedstep-centrino.c
39638 +++ b/drivers/cpufreq/speedstep-centrino.c
39639 @@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39640 !cpu_has(cpu, X86_FEATURE_EST))
39641 return -ENODEV;
39642
39643 - if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39644 - centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39645 + if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39646 + pax_open_kernel();
39647 + *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39648 + pax_close_kernel();
39649 + }
39650
39651 if (policy->cpu != 0)
39652 return -ENODEV;
39653 diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39654 index e431d11..d0b997e 100644
39655 --- a/drivers/cpuidle/driver.c
39656 +++ b/drivers/cpuidle/driver.c
39657 @@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39658
39659 static void poll_idle_init(struct cpuidle_driver *drv)
39660 {
39661 - struct cpuidle_state *state = &drv->states[0];
39662 + cpuidle_state_no_const *state = &drv->states[0];
39663
39664 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39665 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39666 diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39667 index fb9f511..213e6cc 100644
39668 --- a/drivers/cpuidle/governor.c
39669 +++ b/drivers/cpuidle/governor.c
39670 @@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39671 mutex_lock(&cpuidle_lock);
39672 if (__cpuidle_find_governor(gov->name) == NULL) {
39673 ret = 0;
39674 - list_add_tail(&gov->governor_list, &cpuidle_governors);
39675 + pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39676 if (!cpuidle_curr_governor ||
39677 cpuidle_curr_governor->rating < gov->rating)
39678 cpuidle_switch_governor(gov);
39679 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39680 index 97c5903..023ad23 100644
39681 --- a/drivers/cpuidle/sysfs.c
39682 +++ b/drivers/cpuidle/sysfs.c
39683 @@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39684 NULL
39685 };
39686
39687 -static struct attribute_group cpuidle_attr_group = {
39688 +static attribute_group_no_const cpuidle_attr_group = {
39689 .attrs = cpuidle_default_attrs,
39690 .name = "cpuidle",
39691 };
39692 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39693 index 8d2a772..33826c9 100644
39694 --- a/drivers/crypto/hifn_795x.c
39695 +++ b/drivers/crypto/hifn_795x.c
39696 @@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39697 MODULE_PARM_DESC(hifn_pll_ref,
39698 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39699
39700 -static atomic_t hifn_dev_number;
39701 +static atomic_unchecked_t hifn_dev_number;
39702
39703 #define ACRYPTO_OP_DECRYPT 0
39704 #define ACRYPTO_OP_ENCRYPT 1
39705 @@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39706 goto err_out_disable_pci_device;
39707
39708 snprintf(name, sizeof(name), "hifn%d",
39709 - atomic_inc_return(&hifn_dev_number)-1);
39710 + atomic_inc_return_unchecked(&hifn_dev_number)-1);
39711
39712 err = pci_request_regions(pdev, name);
39713 if (err)
39714 diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39715 index 30b538d8..1610d75 100644
39716 --- a/drivers/devfreq/devfreq.c
39717 +++ b/drivers/devfreq/devfreq.c
39718 @@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39719 goto err_out;
39720 }
39721
39722 - list_add(&governor->node, &devfreq_governor_list);
39723 + pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39724
39725 list_for_each_entry(devfreq, &devfreq_list, node) {
39726 int ret = 0;
39727 @@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39728 }
39729 }
39730
39731 - list_del(&governor->node);
39732 + pax_list_del((struct list_head *)&governor->node);
39733 err_out:
39734 mutex_unlock(&devfreq_list_lock);
39735
39736 diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39737 index 42d4974..2714f36 100644
39738 --- a/drivers/dma/sh/shdma-base.c
39739 +++ b/drivers/dma/sh/shdma-base.c
39740 @@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39741 schan->slave_id = -EINVAL;
39742 }
39743
39744 - schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39745 - sdev->desc_size, GFP_KERNEL);
39746 + schan->desc = kcalloc(sdev->desc_size,
39747 + NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39748 if (!schan->desc) {
39749 ret = -ENOMEM;
39750 goto edescalloc;
39751 diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39752 index 58eb857..d7e42c8 100644
39753 --- a/drivers/dma/sh/shdmac.c
39754 +++ b/drivers/dma/sh/shdmac.c
39755 @@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39756 return ret;
39757 }
39758
39759 -static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39760 +static struct notifier_block sh_dmae_nmi_notifier = {
39761 .notifier_call = sh_dmae_nmi_handler,
39762
39763 /* Run before NMI debug handler and KGDB */
39764 diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39765 index 592af5f..bb1d583 100644
39766 --- a/drivers/edac/edac_device.c
39767 +++ b/drivers/edac/edac_device.c
39768 @@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39769 */
39770 int edac_device_alloc_index(void)
39771 {
39772 - static atomic_t device_indexes = ATOMIC_INIT(0);
39773 + static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39774
39775 - return atomic_inc_return(&device_indexes) - 1;
39776 + return atomic_inc_return_unchecked(&device_indexes) - 1;
39777 }
39778 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39779
39780 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39781 index a6cd361..7bdbf53 100644
39782 --- a/drivers/edac/edac_mc_sysfs.c
39783 +++ b/drivers/edac/edac_mc_sysfs.c
39784 @@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39785 struct dev_ch_attribute {
39786 struct device_attribute attr;
39787 int channel;
39788 -};
39789 +} __do_const;
39790
39791 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39792 struct dev_ch_attribute dev_attr_legacy_##_name = \
39793 @@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39794 }
39795
39796 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39797 + pax_open_kernel();
39798 if (mci->get_sdram_scrub_rate) {
39799 - dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39800 - dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39801 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39802 + *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39803 }
39804 if (mci->set_sdram_scrub_rate) {
39805 - dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39806 - dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39807 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39808 + *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39809 }
39810 + pax_close_kernel();
39811 err = device_create_file(&mci->dev,
39812 &dev_attr_sdram_scrub_rate);
39813 if (err) {
39814 diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39815 index 2cf44b4d..6dd2dc7 100644
39816 --- a/drivers/edac/edac_pci.c
39817 +++ b/drivers/edac/edac_pci.c
39818 @@ -29,7 +29,7 @@
39819
39820 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39821 static LIST_HEAD(edac_pci_list);
39822 -static atomic_t pci_indexes = ATOMIC_INIT(0);
39823 +static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39824
39825 /*
39826 * edac_pci_alloc_ctl_info
39827 @@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39828 */
39829 int edac_pci_alloc_index(void)
39830 {
39831 - return atomic_inc_return(&pci_indexes) - 1;
39832 + return atomic_inc_return_unchecked(&pci_indexes) - 1;
39833 }
39834 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39835
39836 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39837 index e8658e4..22746d6 100644
39838 --- a/drivers/edac/edac_pci_sysfs.c
39839 +++ b/drivers/edac/edac_pci_sysfs.c
39840 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39841 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39842 static int edac_pci_poll_msec = 1000; /* one second workq period */
39843
39844 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
39845 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39846 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39847 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39848
39849 static struct kobject *edac_pci_top_main_kobj;
39850 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39851 @@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39852 void *value;
39853 ssize_t(*show) (void *, char *);
39854 ssize_t(*store) (void *, const char *, size_t);
39855 -};
39856 +} __do_const;
39857
39858 /* Set of show/store abstract level functions for PCI Parity object */
39859 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39860 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39861 edac_printk(KERN_CRIT, EDAC_PCI,
39862 "Signaled System Error on %s\n",
39863 pci_name(dev));
39864 - atomic_inc(&pci_nonparity_count);
39865 + atomic_inc_unchecked(&pci_nonparity_count);
39866 }
39867
39868 if (status & (PCI_STATUS_PARITY)) {
39869 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39870 "Master Data Parity Error on %s\n",
39871 pci_name(dev));
39872
39873 - atomic_inc(&pci_parity_count);
39874 + atomic_inc_unchecked(&pci_parity_count);
39875 }
39876
39877 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39878 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39879 "Detected Parity Error on %s\n",
39880 pci_name(dev));
39881
39882 - atomic_inc(&pci_parity_count);
39883 + atomic_inc_unchecked(&pci_parity_count);
39884 }
39885 }
39886
39887 @@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39888 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39889 "Signaled System Error on %s\n",
39890 pci_name(dev));
39891 - atomic_inc(&pci_nonparity_count);
39892 + atomic_inc_unchecked(&pci_nonparity_count);
39893 }
39894
39895 if (status & (PCI_STATUS_PARITY)) {
39896 @@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39897 "Master Data Parity Error on "
39898 "%s\n", pci_name(dev));
39899
39900 - atomic_inc(&pci_parity_count);
39901 + atomic_inc_unchecked(&pci_parity_count);
39902 }
39903
39904 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39905 @@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39906 "Detected Parity Error on %s\n",
39907 pci_name(dev));
39908
39909 - atomic_inc(&pci_parity_count);
39910 + atomic_inc_unchecked(&pci_parity_count);
39911 }
39912 }
39913 }
39914 @@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39915 if (!check_pci_errors)
39916 return;
39917
39918 - before_count = atomic_read(&pci_parity_count);
39919 + before_count = atomic_read_unchecked(&pci_parity_count);
39920
39921 /* scan all PCI devices looking for a Parity Error on devices and
39922 * bridges.
39923 @@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39924 /* Only if operator has selected panic on PCI Error */
39925 if (edac_pci_get_panic_on_pe()) {
39926 /* If the count is different 'after' from 'before' */
39927 - if (before_count != atomic_read(&pci_parity_count))
39928 + if (before_count != atomic_read_unchecked(&pci_parity_count))
39929 panic("EDAC: PCI Parity Error");
39930 }
39931 }
39932 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39933 index 51b7e3a..aa8a3e8 100644
39934 --- a/drivers/edac/mce_amd.h
39935 +++ b/drivers/edac/mce_amd.h
39936 @@ -77,7 +77,7 @@ struct amd_decoder_ops {
39937 bool (*mc0_mce)(u16, u8);
39938 bool (*mc1_mce)(u16, u8);
39939 bool (*mc2_mce)(u16, u8);
39940 -};
39941 +} __no_const;
39942
39943 void amd_report_gart_errors(bool);
39944 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39945 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39946 index 57ea7f4..af06b76 100644
39947 --- a/drivers/firewire/core-card.c
39948 +++ b/drivers/firewire/core-card.c
39949 @@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39950 const struct fw_card_driver *driver,
39951 struct device *device)
39952 {
39953 - static atomic_t index = ATOMIC_INIT(-1);
39954 + static atomic_unchecked_t index = ATOMIC_INIT(-1);
39955
39956 - card->index = atomic_inc_return(&index);
39957 + card->index = atomic_inc_return_unchecked(&index);
39958 card->driver = driver;
39959 card->device = device;
39960 card->current_tlabel = 0;
39961 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39962
39963 void fw_core_remove_card(struct fw_card *card)
39964 {
39965 - struct fw_card_driver dummy_driver = dummy_driver_template;
39966 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
39967
39968 card->driver->update_phy_reg(card, 4,
39969 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39970 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39971 index 2c6d5e1..a2cca6b 100644
39972 --- a/drivers/firewire/core-device.c
39973 +++ b/drivers/firewire/core-device.c
39974 @@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39975 struct config_rom_attribute {
39976 struct device_attribute attr;
39977 u32 key;
39978 -};
39979 +} __do_const;
39980
39981 static ssize_t show_immediate(struct device *dev,
39982 struct device_attribute *dattr, char *buf)
39983 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39984 index eb6935c..3cc2bfa 100644
39985 --- a/drivers/firewire/core-transaction.c
39986 +++ b/drivers/firewire/core-transaction.c
39987 @@ -38,6 +38,7 @@
39988 #include <linux/timer.h>
39989 #include <linux/types.h>
39990 #include <linux/workqueue.h>
39991 +#include <linux/sched.h>
39992
39993 #include <asm/byteorder.h>
39994
39995 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39996 index e1480ff6..1a429bd 100644
39997 --- a/drivers/firewire/core.h
39998 +++ b/drivers/firewire/core.h
39999 @@ -111,6 +111,7 @@ struct fw_card_driver {
40000
40001 int (*stop_iso)(struct fw_iso_context *ctx);
40002 };
40003 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40004
40005 void fw_card_initialize(struct fw_card *card,
40006 const struct fw_card_driver *driver, struct device *device);
40007 diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40008 index a66a321..f6caf20 100644
40009 --- a/drivers/firewire/ohci.c
40010 +++ b/drivers/firewire/ohci.c
40011 @@ -2056,10 +2056,12 @@ static void bus_reset_work(struct work_struct *work)
40012 be32_to_cpu(ohci->next_header));
40013 }
40014
40015 +#ifndef CONFIG_GRKERNSEC
40016 if (param_remote_dma) {
40017 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40018 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40019 }
40020 +#endif
40021
40022 spin_unlock_irq(&ohci->lock);
40023
40024 @@ -2591,8 +2593,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40025 unsigned long flags;
40026 int n, ret = 0;
40027
40028 +#ifndef CONFIG_GRKERNSEC
40029 if (param_remote_dma)
40030 return 0;
40031 +#endif
40032
40033 /*
40034 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40035 diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40036 index 94a58a0..f5eba42 100644
40037 --- a/drivers/firmware/dmi-id.c
40038 +++ b/drivers/firmware/dmi-id.c
40039 @@ -16,7 +16,7 @@
40040 struct dmi_device_attribute{
40041 struct device_attribute dev_attr;
40042 int field;
40043 -};
40044 +} __do_const;
40045 #define to_dmi_dev_attr(_dev_attr) \
40046 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40047
40048 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
40049 index 17afc51..0ef90cd 100644
40050 --- a/drivers/firmware/dmi_scan.c
40051 +++ b/drivers/firmware/dmi_scan.c
40052 @@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
40053 if (buf == NULL)
40054 return -1;
40055
40056 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40057 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40058
40059 dmi_unmap(buf);
40060 return 0;
40061 diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40062 index 5b53d61..72cee96 100644
40063 --- a/drivers/firmware/efi/cper.c
40064 +++ b/drivers/firmware/efi/cper.c
40065 @@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40066 */
40067 u64 cper_next_record_id(void)
40068 {
40069 - static atomic64_t seq;
40070 + static atomic64_unchecked_t seq;
40071
40072 - if (!atomic64_read(&seq))
40073 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
40074 + if (!atomic64_read_unchecked(&seq))
40075 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40076
40077 - return atomic64_inc_return(&seq);
40078 + return atomic64_inc_return_unchecked(&seq);
40079 }
40080 EXPORT_SYMBOL_GPL(cper_next_record_id);
40081
40082 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40083 index 8590099..d83627a 100644
40084 --- a/drivers/firmware/efi/efi.c
40085 +++ b/drivers/firmware/efi/efi.c
40086 @@ -148,14 +148,16 @@ static struct attribute_group efi_subsys_attr_group = {
40087 };
40088
40089 static struct efivars generic_efivars;
40090 -static struct efivar_operations generic_ops;
40091 +static efivar_operations_no_const generic_ops __read_only;
40092
40093 static int generic_ops_register(void)
40094 {
40095 - generic_ops.get_variable = efi.get_variable;
40096 - generic_ops.set_variable = efi.set_variable;
40097 - generic_ops.get_next_variable = efi.get_next_variable;
40098 - generic_ops.query_variable_store = efi_query_variable_store;
40099 + pax_open_kernel();
40100 + *(void **)&generic_ops.get_variable = efi.get_variable;
40101 + *(void **)&generic_ops.set_variable = efi.set_variable;
40102 + *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40103 + *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40104 + pax_close_kernel();
40105
40106 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40107 }
40108 diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40109 index f256ecd..387dcb1 100644
40110 --- a/drivers/firmware/efi/efivars.c
40111 +++ b/drivers/firmware/efi/efivars.c
40112 @@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40113 static int
40114 create_efivars_bin_attributes(void)
40115 {
40116 - struct bin_attribute *attr;
40117 + bin_attribute_no_const *attr;
40118 int error;
40119
40120 /* new_var */
40121 diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40122 index 2f569aa..c95f4fb 100644
40123 --- a/drivers/firmware/google/memconsole.c
40124 +++ b/drivers/firmware/google/memconsole.c
40125 @@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40126 if (!found_memconsole())
40127 return -ENODEV;
40128
40129 - memconsole_bin_attr.size = memconsole_length;
40130 + pax_open_kernel();
40131 + *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40132 + pax_close_kernel();
40133 +
40134 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40135 }
40136
40137 diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40138 index fe49ec3..1ade794 100644
40139 --- a/drivers/gpio/gpio-em.c
40140 +++ b/drivers/gpio/gpio-em.c
40141 @@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40142 struct em_gio_priv *p;
40143 struct resource *io[2], *irq[2];
40144 struct gpio_chip *gpio_chip;
40145 - struct irq_chip *irq_chip;
40146 + irq_chip_no_const *irq_chip;
40147 const char *name = dev_name(&pdev->dev);
40148 int ret;
40149
40150 diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40151 index 3784e81..73637b5 100644
40152 --- a/drivers/gpio/gpio-ich.c
40153 +++ b/drivers/gpio/gpio-ich.c
40154 @@ -94,7 +94,7 @@ struct ichx_desc {
40155 * this option allows driver caching written output values
40156 */
40157 bool use_outlvl_cache;
40158 -};
40159 +} __do_const;
40160
40161 static struct {
40162 spinlock_t lock;
40163 diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40164 index bf6c094..6573caf 100644
40165 --- a/drivers/gpio/gpio-rcar.c
40166 +++ b/drivers/gpio/gpio-rcar.c
40167 @@ -357,7 +357,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40168 struct gpio_rcar_priv *p;
40169 struct resource *io, *irq;
40170 struct gpio_chip *gpio_chip;
40171 - struct irq_chip *irq_chip;
40172 + irq_chip_no_const *irq_chip;
40173 struct device *dev = &pdev->dev;
40174 const char *name = dev_name(dev);
40175 int ret;
40176 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40177 index dbf28fa..04dad4e 100644
40178 --- a/drivers/gpio/gpio-vr41xx.c
40179 +++ b/drivers/gpio/gpio-vr41xx.c
40180 @@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40181 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40182 maskl, pendl, maskh, pendh);
40183
40184 - atomic_inc(&irq_err_count);
40185 + atomic_inc_unchecked(&irq_err_count);
40186
40187 return -EINVAL;
40188 }
40189 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40190 index e8e98ca..10f416e 100644
40191 --- a/drivers/gpio/gpiolib.c
40192 +++ b/drivers/gpio/gpiolib.c
40193 @@ -537,8 +537,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40194 }
40195
40196 if (gpiochip->irqchip) {
40197 - gpiochip->irqchip->irq_request_resources = NULL;
40198 - gpiochip->irqchip->irq_release_resources = NULL;
40199 + pax_open_kernel();
40200 + *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40201 + *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40202 + pax_close_kernel();
40203 gpiochip->irqchip = NULL;
40204 }
40205 }
40206 @@ -604,8 +606,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40207 gpiochip->irqchip = NULL;
40208 return -EINVAL;
40209 }
40210 - irqchip->irq_request_resources = gpiochip_irq_reqres;
40211 - irqchip->irq_release_resources = gpiochip_irq_relres;
40212 +
40213 + pax_open_kernel();
40214 + *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40215 + *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40216 + pax_close_kernel();
40217
40218 /*
40219 * Prepare the mapping since the irqchip shall be orthogonal to
40220 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40221 index e79c8d3..a9370bc 100644
40222 --- a/drivers/gpu/drm/drm_crtc.c
40223 +++ b/drivers/gpu/drm/drm_crtc.c
40224 @@ -3900,7 +3900,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40225 goto done;
40226 }
40227
40228 - if (copy_to_user(&enum_ptr[copied].name,
40229 + if (copy_to_user(enum_ptr[copied].name,
40230 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40231 ret = -EFAULT;
40232 goto done;
40233 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40234 index bc3da32..7289357 100644
40235 --- a/drivers/gpu/drm/drm_drv.c
40236 +++ b/drivers/gpu/drm/drm_drv.c
40237 @@ -443,7 +443,7 @@ void drm_unplug_dev(struct drm_device *dev)
40238
40239 drm_device_set_unplugged(dev);
40240
40241 - if (dev->open_count == 0) {
40242 + if (local_read(&dev->open_count) == 0) {
40243 drm_put_dev(dev);
40244 }
40245 mutex_unlock(&drm_global_mutex);
40246 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40247 index ed7bc68..0d536af 100644
40248 --- a/drivers/gpu/drm/drm_fops.c
40249 +++ b/drivers/gpu/drm/drm_fops.c
40250 @@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40251 return PTR_ERR(minor);
40252
40253 dev = minor->dev;
40254 - if (!dev->open_count++)
40255 + if (local_inc_return(&dev->open_count) == 1)
40256 need_setup = 1;
40257
40258 /* share address_space across all char-devs of a single device */
40259 @@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40260 return 0;
40261
40262 err_undo:
40263 - dev->open_count--;
40264 + local_dec(&dev->open_count);
40265 drm_minor_release(minor);
40266 return retcode;
40267 }
40268 @@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40269
40270 mutex_lock(&drm_global_mutex);
40271
40272 - DRM_DEBUG("open_count = %d\n", dev->open_count);
40273 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40274
40275 mutex_lock(&dev->struct_mutex);
40276 list_del(&file_priv->lhead);
40277 @@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40278 * Begin inline drm_release
40279 */
40280
40281 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40282 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40283 task_pid_nr(current),
40284 (long)old_encode_dev(file_priv->minor->kdev->devt),
40285 - dev->open_count);
40286 + local_read(&dev->open_count));
40287
40288 /* Release any auth tokens that might point to this file_priv,
40289 (do that under the drm_global_mutex) */
40290 @@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40291 * End inline drm_release
40292 */
40293
40294 - if (!--dev->open_count) {
40295 + if (local_dec_and_test(&dev->open_count)) {
40296 retcode = drm_lastclose(dev);
40297 if (drm_device_is_unplugged(dev))
40298 drm_put_dev(dev);
40299 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40300 index 3d2e91c..d31c4c9 100644
40301 --- a/drivers/gpu/drm/drm_global.c
40302 +++ b/drivers/gpu/drm/drm_global.c
40303 @@ -36,7 +36,7 @@
40304 struct drm_global_item {
40305 struct mutex mutex;
40306 void *object;
40307 - int refcount;
40308 + atomic_t refcount;
40309 };
40310
40311 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40312 @@ -49,7 +49,7 @@ void drm_global_init(void)
40313 struct drm_global_item *item = &glob[i];
40314 mutex_init(&item->mutex);
40315 item->object = NULL;
40316 - item->refcount = 0;
40317 + atomic_set(&item->refcount, 0);
40318 }
40319 }
40320
40321 @@ -59,7 +59,7 @@ void drm_global_release(void)
40322 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40323 struct drm_global_item *item = &glob[i];
40324 BUG_ON(item->object != NULL);
40325 - BUG_ON(item->refcount != 0);
40326 + BUG_ON(atomic_read(&item->refcount) != 0);
40327 }
40328 }
40329
40330 @@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40331 struct drm_global_item *item = &glob[ref->global_type];
40332
40333 mutex_lock(&item->mutex);
40334 - if (item->refcount == 0) {
40335 + if (atomic_read(&item->refcount) == 0) {
40336 item->object = kzalloc(ref->size, GFP_KERNEL);
40337 if (unlikely(item->object == NULL)) {
40338 ret = -ENOMEM;
40339 @@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40340 goto out_err;
40341
40342 }
40343 - ++item->refcount;
40344 + atomic_inc(&item->refcount);
40345 ref->object = item->object;
40346 mutex_unlock(&item->mutex);
40347 return 0;
40348 @@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40349 struct drm_global_item *item = &glob[ref->global_type];
40350
40351 mutex_lock(&item->mutex);
40352 - BUG_ON(item->refcount == 0);
40353 + BUG_ON(atomic_read(&item->refcount) == 0);
40354 BUG_ON(ref->object != item->object);
40355 - if (--item->refcount == 0) {
40356 + if (atomic_dec_and_test(&item->refcount)) {
40357 ref->release(ref);
40358 item->object = NULL;
40359 }
40360 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40361 index 51efebd..2b70935 100644
40362 --- a/drivers/gpu/drm/drm_info.c
40363 +++ b/drivers/gpu/drm/drm_info.c
40364 @@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40365 struct drm_local_map *map;
40366 struct drm_map_list *r_list;
40367
40368 - /* Hardcoded from _DRM_FRAME_BUFFER,
40369 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40370 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40371 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40372 + static const char * const types[] = {
40373 + [_DRM_FRAME_BUFFER] = "FB",
40374 + [_DRM_REGISTERS] = "REG",
40375 + [_DRM_SHM] = "SHM",
40376 + [_DRM_AGP] = "AGP",
40377 + [_DRM_SCATTER_GATHER] = "SG",
40378 + [_DRM_CONSISTENT] = "PCI"};
40379 const char *type;
40380 int i;
40381
40382 @@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40383 map = r_list->map;
40384 if (!map)
40385 continue;
40386 - if (map->type < 0 || map->type > 5)
40387 + if (map->type >= ARRAY_SIZE(types))
40388 type = "??";
40389 else
40390 type = types[map->type];
40391 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40392 index 2f4c4343..dd12cd2 100644
40393 --- a/drivers/gpu/drm/drm_ioc32.c
40394 +++ b/drivers/gpu/drm/drm_ioc32.c
40395 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40396 request = compat_alloc_user_space(nbytes);
40397 if (!access_ok(VERIFY_WRITE, request, nbytes))
40398 return -EFAULT;
40399 - list = (struct drm_buf_desc *) (request + 1);
40400 + list = (struct drm_buf_desc __user *) (request + 1);
40401
40402 if (__put_user(count, &request->count)
40403 || __put_user(list, &request->list))
40404 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40405 request = compat_alloc_user_space(nbytes);
40406 if (!access_ok(VERIFY_WRITE, request, nbytes))
40407 return -EFAULT;
40408 - list = (struct drm_buf_pub *) (request + 1);
40409 + list = (struct drm_buf_pub __user *) (request + 1);
40410
40411 if (__put_user(count, &request->count)
40412 || __put_user(list, &request->list))
40413 @@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40414 return 0;
40415 }
40416
40417 -drm_ioctl_compat_t *drm_compat_ioctls[] = {
40418 +drm_ioctl_compat_t drm_compat_ioctls[] = {
40419 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40420 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40421 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40422 @@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40423 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40424 {
40425 unsigned int nr = DRM_IOCTL_NR(cmd);
40426 - drm_ioctl_compat_t *fn;
40427 int ret;
40428
40429 /* Assume that ioctls without an explicit compat routine will just
40430 @@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40431 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40432 return drm_ioctl(filp, cmd, arg);
40433
40434 - fn = drm_compat_ioctls[nr];
40435 -
40436 - if (fn != NULL)
40437 - ret = (*fn) (filp, cmd, arg);
40438 + if (drm_compat_ioctls[nr] != NULL)
40439 + ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40440 else
40441 ret = drm_ioctl(filp, cmd, arg);
40442
40443 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40444 index 00587a1..57a65ca 100644
40445 --- a/drivers/gpu/drm/drm_ioctl.c
40446 +++ b/drivers/gpu/drm/drm_ioctl.c
40447 @@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
40448 struct drm_file *file_priv = filp->private_data;
40449 struct drm_device *dev;
40450 const struct drm_ioctl_desc *ioctl = NULL;
40451 - drm_ioctl_t *func;
40452 + drm_ioctl_no_const_t func;
40453 unsigned int nr = DRM_IOCTL_NR(cmd);
40454 int retcode = -EINVAL;
40455 char stack_kdata[128];
40456 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40457 index 93ec5dc..82acbaf 100644
40458 --- a/drivers/gpu/drm/i810/i810_drv.h
40459 +++ b/drivers/gpu/drm/i810/i810_drv.h
40460 @@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40461 int page_flipping;
40462
40463 wait_queue_head_t irq_queue;
40464 - atomic_t irq_received;
40465 - atomic_t irq_emitted;
40466 + atomic_unchecked_t irq_received;
40467 + atomic_unchecked_t irq_emitted;
40468
40469 int front_offset;
40470 } drm_i810_private_t;
40471 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40472 index 318ade9..1f5de55 100644
40473 --- a/drivers/gpu/drm/i915/i915_dma.c
40474 +++ b/drivers/gpu/drm/i915/i915_dma.c
40475 @@ -1294,7 +1294,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40476 * locking inversion with the driver load path. And the access here is
40477 * completely racy anyway. So don't bother with locking for now.
40478 */
40479 - return dev->open_count == 0;
40480 + return local_read(&dev->open_count) == 0;
40481 }
40482
40483 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40484 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40485 index 1a0611b..dd1fbfc 100644
40486 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40487 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40488 @@ -866,12 +866,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40489 static int
40490 validate_exec_list(struct drm_device *dev,
40491 struct drm_i915_gem_exec_object2 *exec,
40492 - int count)
40493 + unsigned int count)
40494 {
40495 unsigned relocs_total = 0;
40496 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40497 unsigned invalid_flags;
40498 - int i;
40499 + unsigned int i;
40500
40501 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40502 if (USES_FULL_PPGTT(dev))
40503 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40504 index 2e0613e..a8b94d9 100644
40505 --- a/drivers/gpu/drm/i915/i915_ioc32.c
40506 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
40507 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40508 (unsigned long)request);
40509 }
40510
40511 -static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40512 +static drm_ioctl_compat_t i915_compat_ioctls[] = {
40513 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40514 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40515 [DRM_I915_GETPARAM] = compat_i915_getparam,
40516 @@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40517 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40518 {
40519 unsigned int nr = DRM_IOCTL_NR(cmd);
40520 - drm_ioctl_compat_t *fn = NULL;
40521 int ret;
40522
40523 if (nr < DRM_COMMAND_BASE)
40524 return drm_compat_ioctl(filp, cmd, arg);
40525
40526 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40527 - fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40528 -
40529 - if (fn != NULL)
40530 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
40531 + drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40532 ret = (*fn) (filp, cmd, arg);
40533 - else
40534 + } else
40535 ret = drm_ioctl(filp, cmd, arg);
40536
40537 return ret;
40538 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40539 index 9cb5c95..9228666 100644
40540 --- a/drivers/gpu/drm/i915/intel_display.c
40541 +++ b/drivers/gpu/drm/i915/intel_display.c
40542 @@ -12811,13 +12811,13 @@ struct intel_quirk {
40543 int subsystem_vendor;
40544 int subsystem_device;
40545 void (*hook)(struct drm_device *dev);
40546 -};
40547 +} __do_const;
40548
40549 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40550 struct intel_dmi_quirk {
40551 void (*hook)(struct drm_device *dev);
40552 const struct dmi_system_id (*dmi_id_list)[];
40553 -};
40554 +} __do_const;
40555
40556 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40557 {
40558 @@ -12825,18 +12825,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40559 return 1;
40560 }
40561
40562 -static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40563 +static const struct dmi_system_id intel_dmi_quirks_table[] = {
40564 {
40565 - .dmi_id_list = &(const struct dmi_system_id[]) {
40566 - {
40567 - .callback = intel_dmi_reverse_brightness,
40568 - .ident = "NCR Corporation",
40569 - .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40570 - DMI_MATCH(DMI_PRODUCT_NAME, ""),
40571 - },
40572 - },
40573 - { } /* terminating entry */
40574 + .callback = intel_dmi_reverse_brightness,
40575 + .ident = "NCR Corporation",
40576 + .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40577 + DMI_MATCH(DMI_PRODUCT_NAME, ""),
40578 },
40579 + },
40580 + { } /* terminating entry */
40581 +};
40582 +
40583 +static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40584 + {
40585 + .dmi_id_list = &intel_dmi_quirks_table,
40586 .hook = quirk_invert_brightness,
40587 },
40588 };
40589 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40590 index b4a2014..219ab78 100644
40591 --- a/drivers/gpu/drm/mga/mga_drv.h
40592 +++ b/drivers/gpu/drm/mga/mga_drv.h
40593 @@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40594 u32 clear_cmd;
40595 u32 maccess;
40596
40597 - atomic_t vbl_received; /**< Number of vblanks received. */
40598 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40599 wait_queue_head_t fence_queue;
40600 - atomic_t last_fence_retired;
40601 + atomic_unchecked_t last_fence_retired;
40602 u32 next_fence_to_post;
40603
40604 unsigned int fb_cpp;
40605 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40606 index 729bfd5..ead8823 100644
40607 --- a/drivers/gpu/drm/mga/mga_ioc32.c
40608 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
40609 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40610 return 0;
40611 }
40612
40613 -drm_ioctl_compat_t *mga_compat_ioctls[] = {
40614 +drm_ioctl_compat_t mga_compat_ioctls[] = {
40615 [DRM_MGA_INIT] = compat_mga_init,
40616 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40617 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40618 @@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40619 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40620 {
40621 unsigned int nr = DRM_IOCTL_NR(cmd);
40622 - drm_ioctl_compat_t *fn = NULL;
40623 int ret;
40624
40625 if (nr < DRM_COMMAND_BASE)
40626 return drm_compat_ioctl(filp, cmd, arg);
40627
40628 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
40629 - fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40630 -
40631 - if (fn != NULL)
40632 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
40633 + drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40634 ret = (*fn) (filp, cmd, arg);
40635 - else
40636 + } else
40637 ret = drm_ioctl(filp, cmd, arg);
40638
40639 return ret;
40640 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40641 index 1b071b8..de8601a 100644
40642 --- a/drivers/gpu/drm/mga/mga_irq.c
40643 +++ b/drivers/gpu/drm/mga/mga_irq.c
40644 @@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40645 if (crtc != 0)
40646 return 0;
40647
40648 - return atomic_read(&dev_priv->vbl_received);
40649 + return atomic_read_unchecked(&dev_priv->vbl_received);
40650 }
40651
40652
40653 @@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40654 /* VBLANK interrupt */
40655 if (status & MGA_VLINEPEN) {
40656 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40657 - atomic_inc(&dev_priv->vbl_received);
40658 + atomic_inc_unchecked(&dev_priv->vbl_received);
40659 drm_handle_vblank(dev, 0);
40660 handled = 1;
40661 }
40662 @@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40663 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40664 MGA_WRITE(MGA_PRIMEND, prim_end);
40665
40666 - atomic_inc(&dev_priv->last_fence_retired);
40667 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
40668 wake_up(&dev_priv->fence_queue);
40669 handled = 1;
40670 }
40671 @@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40672 * using fences.
40673 */
40674 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40675 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40676 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40677 - *sequence) <= (1 << 23)));
40678
40679 *sequence = cur_fence;
40680 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40681 index dae2c96..324dbe4 100644
40682 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40683 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40684 @@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40685 struct bit_table {
40686 const char id;
40687 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40688 -};
40689 +} __no_const;
40690
40691 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40692
40693 diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40694 index 8ae36f2..1147a30 100644
40695 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40696 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40697 @@ -121,7 +121,6 @@ struct nouveau_drm {
40698 struct drm_global_reference mem_global_ref;
40699 struct ttm_bo_global_ref bo_global_ref;
40700 struct ttm_bo_device bdev;
40701 - atomic_t validate_sequence;
40702 int (*move)(struct nouveau_channel *,
40703 struct ttm_buffer_object *,
40704 struct ttm_mem_reg *, struct ttm_mem_reg *);
40705 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40706 index 462679a..88e32a7 100644
40707 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40708 +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40709 @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40710 unsigned long arg)
40711 {
40712 unsigned int nr = DRM_IOCTL_NR(cmd);
40713 - drm_ioctl_compat_t *fn = NULL;
40714 + drm_ioctl_compat_t fn = NULL;
40715 int ret;
40716
40717 if (nr < DRM_COMMAND_BASE)
40718 diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40719 index 753a6de..dd66b98 100644
40720 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40721 +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40722 @@ -126,11 +126,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40723 }
40724
40725 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40726 - nouveau_vram_manager_init,
40727 - nouveau_vram_manager_fini,
40728 - nouveau_vram_manager_new,
40729 - nouveau_vram_manager_del,
40730 - nouveau_vram_manager_debug
40731 + .init = nouveau_vram_manager_init,
40732 + .takedown = nouveau_vram_manager_fini,
40733 + .get_node = nouveau_vram_manager_new,
40734 + .put_node = nouveau_vram_manager_del,
40735 + .debug = nouveau_vram_manager_debug
40736 };
40737
40738 static int
40739 @@ -194,11 +194,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40740 }
40741
40742 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40743 - nouveau_gart_manager_init,
40744 - nouveau_gart_manager_fini,
40745 - nouveau_gart_manager_new,
40746 - nouveau_gart_manager_del,
40747 - nouveau_gart_manager_debug
40748 + .init = nouveau_gart_manager_init,
40749 + .takedown = nouveau_gart_manager_fini,
40750 + .get_node = nouveau_gart_manager_new,
40751 + .put_node = nouveau_gart_manager_del,
40752 + .debug = nouveau_gart_manager_debug
40753 };
40754
40755 /*XXX*/
40756 @@ -267,11 +267,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40757 }
40758
40759 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40760 - nv04_gart_manager_init,
40761 - nv04_gart_manager_fini,
40762 - nv04_gart_manager_new,
40763 - nv04_gart_manager_del,
40764 - nv04_gart_manager_debug
40765 + .init = nv04_gart_manager_init,
40766 + .takedown = nv04_gart_manager_fini,
40767 + .get_node = nv04_gart_manager_new,
40768 + .put_node = nv04_gart_manager_del,
40769 + .debug = nv04_gart_manager_debug
40770 };
40771
40772 int
40773 diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40774 index c7592ec..dd45ebc 100644
40775 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40776 +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40777 @@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40778 * locking inversion with the driver load path. And the access here is
40779 * completely racy anyway. So don't bother with locking for now.
40780 */
40781 - return dev->open_count == 0;
40782 + return local_read(&dev->open_count) == 0;
40783 }
40784
40785 static const struct vga_switcheroo_client_ops
40786 diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40787 index 9782364..89bd954 100644
40788 --- a/drivers/gpu/drm/qxl/qxl_cmd.c
40789 +++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40790 @@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40791 int ret;
40792
40793 mutex_lock(&qdev->async_io_mutex);
40794 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40795 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40796 if (qdev->last_sent_io_cmd > irq_num) {
40797 if (intr)
40798 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40799 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40800 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40801 else
40802 ret = wait_event_timeout(qdev->io_cmd_event,
40803 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40804 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40805 /* 0 is timeout, just bail the "hw" has gone away */
40806 if (ret <= 0)
40807 goto out;
40808 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40809 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40810 }
40811 outb(val, addr);
40812 qdev->last_sent_io_cmd = irq_num + 1;
40813 if (intr)
40814 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40815 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40816 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40817 else
40818 ret = wait_event_timeout(qdev->io_cmd_event,
40819 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40820 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40821 out:
40822 if (ret > 0)
40823 ret = 0;
40824 diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40825 index 6911b8c..89d6867 100644
40826 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40827 +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40828 @@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40829 struct drm_info_node *node = (struct drm_info_node *) m->private;
40830 struct qxl_device *qdev = node->minor->dev->dev_private;
40831
40832 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40833 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40834 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40835 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40836 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40837 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40838 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40839 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40840 seq_printf(m, "%d\n", qdev->irq_received_error);
40841 return 0;
40842 }
40843 diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40844 index 7c6cafe..460f542 100644
40845 --- a/drivers/gpu/drm/qxl/qxl_drv.h
40846 +++ b/drivers/gpu/drm/qxl/qxl_drv.h
40847 @@ -290,10 +290,10 @@ struct qxl_device {
40848 unsigned int last_sent_io_cmd;
40849
40850 /* interrupt handling */
40851 - atomic_t irq_received;
40852 - atomic_t irq_received_display;
40853 - atomic_t irq_received_cursor;
40854 - atomic_t irq_received_io_cmd;
40855 + atomic_unchecked_t irq_received;
40856 + atomic_unchecked_t irq_received_display;
40857 + atomic_unchecked_t irq_received_cursor;
40858 + atomic_unchecked_t irq_received_io_cmd;
40859 unsigned irq_received_error;
40860 wait_queue_head_t display_event;
40861 wait_queue_head_t cursor_event;
40862 diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40863 index b110883..dd06418 100644
40864 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40865 +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40866 @@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40867
40868 /* TODO copy slow path code from i915 */
40869 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40870 - 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);
40871 + 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);
40872
40873 {
40874 struct qxl_drawable *draw = fb_cmd;
40875 @@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40876 struct drm_qxl_reloc reloc;
40877
40878 if (copy_from_user(&reloc,
40879 - &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40880 + &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40881 sizeof(reloc))) {
40882 ret = -EFAULT;
40883 goto out_free_bos;
40884 @@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40885
40886 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40887
40888 - struct drm_qxl_command *commands =
40889 - (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40890 + struct drm_qxl_command __user *commands =
40891 + (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40892
40893 - if (copy_from_user(&user_cmd, &commands[cmd_num],
40894 + if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40895 sizeof(user_cmd)))
40896 return -EFAULT;
40897
40898 diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40899 index 0bf1e20..42a7310 100644
40900 --- a/drivers/gpu/drm/qxl/qxl_irq.c
40901 +++ b/drivers/gpu/drm/qxl/qxl_irq.c
40902 @@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40903 if (!pending)
40904 return IRQ_NONE;
40905
40906 - atomic_inc(&qdev->irq_received);
40907 + atomic_inc_unchecked(&qdev->irq_received);
40908
40909 if (pending & QXL_INTERRUPT_DISPLAY) {
40910 - atomic_inc(&qdev->irq_received_display);
40911 + atomic_inc_unchecked(&qdev->irq_received_display);
40912 wake_up_all(&qdev->display_event);
40913 qxl_queue_garbage_collect(qdev, false);
40914 }
40915 if (pending & QXL_INTERRUPT_CURSOR) {
40916 - atomic_inc(&qdev->irq_received_cursor);
40917 + atomic_inc_unchecked(&qdev->irq_received_cursor);
40918 wake_up_all(&qdev->cursor_event);
40919 }
40920 if (pending & QXL_INTERRUPT_IO_CMD) {
40921 - atomic_inc(&qdev->irq_received_io_cmd);
40922 + atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40923 wake_up_all(&qdev->io_cmd_event);
40924 }
40925 if (pending & QXL_INTERRUPT_ERROR) {
40926 @@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40927 init_waitqueue_head(&qdev->io_cmd_event);
40928 INIT_WORK(&qdev->client_monitors_config_work,
40929 qxl_client_monitors_config_work_func);
40930 - atomic_set(&qdev->irq_received, 0);
40931 - atomic_set(&qdev->irq_received_display, 0);
40932 - atomic_set(&qdev->irq_received_cursor, 0);
40933 - atomic_set(&qdev->irq_received_io_cmd, 0);
40934 + atomic_set_unchecked(&qdev->irq_received, 0);
40935 + atomic_set_unchecked(&qdev->irq_received_display, 0);
40936 + atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40937 + atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40938 qdev->irq_received_error = 0;
40939 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
40940 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40941 diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40942 index 0cbc4c9..0e46686 100644
40943 --- a/drivers/gpu/drm/qxl/qxl_ttm.c
40944 +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40945 @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40946 }
40947 }
40948
40949 -static struct vm_operations_struct qxl_ttm_vm_ops;
40950 +static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40951 static const struct vm_operations_struct *ttm_vm_ops;
40952
40953 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40954 @@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40955 return r;
40956 if (unlikely(ttm_vm_ops == NULL)) {
40957 ttm_vm_ops = vma->vm_ops;
40958 + pax_open_kernel();
40959 qxl_ttm_vm_ops = *ttm_vm_ops;
40960 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40961 + pax_close_kernel();
40962 }
40963 vma->vm_ops = &qxl_ttm_vm_ops;
40964 return 0;
40965 @@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40966 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40967 {
40968 #if defined(CONFIG_DEBUG_FS)
40969 - static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40970 - static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40971 - unsigned i;
40972 + static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40973 + {
40974 + .name = "qxl_mem_mm",
40975 + .show = &qxl_mm_dump_table,
40976 + },
40977 + {
40978 + .name = "qxl_surf_mm",
40979 + .show = &qxl_mm_dump_table,
40980 + }
40981 + };
40982
40983 - for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40984 - if (i == 0)
40985 - sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40986 - else
40987 - sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40988 - qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40989 - qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40990 - qxl_mem_types_list[i].driver_features = 0;
40991 - if (i == 0)
40992 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40993 - else
40994 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40995 + pax_open_kernel();
40996 + *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40997 + *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40998 + pax_close_kernel();
40999
41000 - }
41001 - return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41002 + return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41003 #else
41004 return 0;
41005 #endif
41006 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41007 index 2c45ac9..5d740f8 100644
41008 --- a/drivers/gpu/drm/r128/r128_cce.c
41009 +++ b/drivers/gpu/drm/r128/r128_cce.c
41010 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41011
41012 /* GH: Simple idle check.
41013 */
41014 - atomic_set(&dev_priv->idle_count, 0);
41015 + atomic_set_unchecked(&dev_priv->idle_count, 0);
41016
41017 /* We don't support anything other than bus-mastering ring mode,
41018 * but the ring can be in either AGP or PCI space for the ring
41019 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41020 index 723e5d6..102dbaf 100644
41021 --- a/drivers/gpu/drm/r128/r128_drv.h
41022 +++ b/drivers/gpu/drm/r128/r128_drv.h
41023 @@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41024 int is_pci;
41025 unsigned long cce_buffers_offset;
41026
41027 - atomic_t idle_count;
41028 + atomic_unchecked_t idle_count;
41029
41030 int page_flipping;
41031 int current_page;
41032 u32 crtc_offset;
41033 u32 crtc_offset_cntl;
41034
41035 - atomic_t vbl_received;
41036 + atomic_unchecked_t vbl_received;
41037
41038 u32 color_fmt;
41039 unsigned int front_offset;
41040 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41041 index 663f38c..c689495 100644
41042 --- a/drivers/gpu/drm/r128/r128_ioc32.c
41043 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
41044 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41045 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41046 }
41047
41048 -drm_ioctl_compat_t *r128_compat_ioctls[] = {
41049 +drm_ioctl_compat_t r128_compat_ioctls[] = {
41050 [DRM_R128_INIT] = compat_r128_init,
41051 [DRM_R128_DEPTH] = compat_r128_depth,
41052 [DRM_R128_STIPPLE] = compat_r128_stipple,
41053 @@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41054 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41055 {
41056 unsigned int nr = DRM_IOCTL_NR(cmd);
41057 - drm_ioctl_compat_t *fn = NULL;
41058 int ret;
41059
41060 if (nr < DRM_COMMAND_BASE)
41061 return drm_compat_ioctl(filp, cmd, arg);
41062
41063 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41064 - fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41065 -
41066 - if (fn != NULL)
41067 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
41068 + drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41069 ret = (*fn) (filp, cmd, arg);
41070 - else
41071 + } else
41072 ret = drm_ioctl(filp, cmd, arg);
41073
41074 return ret;
41075 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41076 index c2ae496..30b5993 100644
41077 --- a/drivers/gpu/drm/r128/r128_irq.c
41078 +++ b/drivers/gpu/drm/r128/r128_irq.c
41079 @@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41080 if (crtc != 0)
41081 return 0;
41082
41083 - return atomic_read(&dev_priv->vbl_received);
41084 + return atomic_read_unchecked(&dev_priv->vbl_received);
41085 }
41086
41087 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41088 @@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41089 /* VBLANK interrupt */
41090 if (status & R128_CRTC_VBLANK_INT) {
41091 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41092 - atomic_inc(&dev_priv->vbl_received);
41093 + atomic_inc_unchecked(&dev_priv->vbl_received);
41094 drm_handle_vblank(dev, 0);
41095 return IRQ_HANDLED;
41096 }
41097 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41098 index 575e986..66e62ca 100644
41099 --- a/drivers/gpu/drm/r128/r128_state.c
41100 +++ b/drivers/gpu/drm/r128/r128_state.c
41101 @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41102
41103 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41104 {
41105 - if (atomic_read(&dev_priv->idle_count) == 0)
41106 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41107 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41108 else
41109 - atomic_set(&dev_priv->idle_count, 0);
41110 + atomic_set_unchecked(&dev_priv->idle_count, 0);
41111 }
41112
41113 #endif
41114 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41115 index 4a85bb6..aaea819 100644
41116 --- a/drivers/gpu/drm/radeon/mkregtable.c
41117 +++ b/drivers/gpu/drm/radeon/mkregtable.c
41118 @@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41119 regex_t mask_rex;
41120 regmatch_t match[4];
41121 char buf[1024];
41122 - size_t end;
41123 + long end;
41124 int len;
41125 int done = 0;
41126 int r;
41127 unsigned o;
41128 struct offset *offset;
41129 char last_reg_s[10];
41130 - int last_reg;
41131 + unsigned long last_reg;
41132
41133 if (regcomp
41134 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41135 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41136 index 995a8b1..b7cb898 100644
41137 --- a/drivers/gpu/drm/radeon/radeon_device.c
41138 +++ b/drivers/gpu/drm/radeon/radeon_device.c
41139 @@ -1214,7 +1214,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41140 * locking inversion with the driver load path. And the access here is
41141 * completely racy anyway. So don't bother with locking for now.
41142 */
41143 - return dev->open_count == 0;
41144 + return local_read(&dev->open_count) == 0;
41145 }
41146
41147 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41148 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41149 index 46bd393..6ae4719 100644
41150 --- a/drivers/gpu/drm/radeon/radeon_drv.h
41151 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
41152 @@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41153
41154 /* SW interrupt */
41155 wait_queue_head_t swi_queue;
41156 - atomic_t swi_emitted;
41157 + atomic_unchecked_t swi_emitted;
41158 int vblank_crtc;
41159 uint32_t irq_enable_reg;
41160 uint32_t r500_disp_irq_reg;
41161 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41162 index 0b98ea1..0881827 100644
41163 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41164 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41165 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41166 request = compat_alloc_user_space(sizeof(*request));
41167 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41168 || __put_user(req32.param, &request->param)
41169 - || __put_user((void __user *)(unsigned long)req32.value,
41170 + || __put_user((unsigned long)req32.value,
41171 &request->value))
41172 return -EFAULT;
41173
41174 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41175 #define compat_radeon_cp_setparam NULL
41176 #endif /* X86_64 || IA64 */
41177
41178 -static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41179 +static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41180 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41181 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41182 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41183 @@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41184 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41185 {
41186 unsigned int nr = DRM_IOCTL_NR(cmd);
41187 - drm_ioctl_compat_t *fn = NULL;
41188 int ret;
41189
41190 if (nr < DRM_COMMAND_BASE)
41191 return drm_compat_ioctl(filp, cmd, arg);
41192
41193 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41194 - fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41195 -
41196 - if (fn != NULL)
41197 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
41198 + drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41199 ret = (*fn) (filp, cmd, arg);
41200 - else
41201 + } else
41202 ret = drm_ioctl(filp, cmd, arg);
41203
41204 return ret;
41205 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41206 index 244b19b..c19226d 100644
41207 --- a/drivers/gpu/drm/radeon/radeon_irq.c
41208 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
41209 @@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41210 unsigned int ret;
41211 RING_LOCALS;
41212
41213 - atomic_inc(&dev_priv->swi_emitted);
41214 - ret = atomic_read(&dev_priv->swi_emitted);
41215 + atomic_inc_unchecked(&dev_priv->swi_emitted);
41216 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41217
41218 BEGIN_RING(4);
41219 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41220 @@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41221 drm_radeon_private_t *dev_priv =
41222 (drm_radeon_private_t *) dev->dev_private;
41223
41224 - atomic_set(&dev_priv->swi_emitted, 0);
41225 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41226 init_waitqueue_head(&dev_priv->swi_queue);
41227
41228 dev->max_vblank_count = 0x001fffff;
41229 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41230 index 535403e..5dd655b 100644
41231 --- a/drivers/gpu/drm/radeon/radeon_state.c
41232 +++ b/drivers/gpu/drm/radeon/radeon_state.c
41233 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41234 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41235 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41236
41237 - if (copy_from_user(&depth_boxes, clear->depth_boxes,
41238 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41239 sarea_priv->nbox * sizeof(depth_boxes[0])))
41240 return -EFAULT;
41241
41242 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41243 {
41244 drm_radeon_private_t *dev_priv = dev->dev_private;
41245 drm_radeon_getparam_t *param = data;
41246 - int value;
41247 + int value = 0;
41248
41249 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41250
41251 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41252 index 8624979..65e5243 100644
41253 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
41254 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41255 @@ -936,7 +936,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41256 man->size = size >> PAGE_SHIFT;
41257 }
41258
41259 -static struct vm_operations_struct radeon_ttm_vm_ops;
41260 +static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41261 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41262
41263 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41264 @@ -977,8 +977,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41265 }
41266 if (unlikely(ttm_vm_ops == NULL)) {
41267 ttm_vm_ops = vma->vm_ops;
41268 + pax_open_kernel();
41269 radeon_ttm_vm_ops = *ttm_vm_ops;
41270 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41271 + pax_close_kernel();
41272 }
41273 vma->vm_ops = &radeon_ttm_vm_ops;
41274 return 0;
41275 diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41276 index 054a79f..30d9ac4 100644
41277 --- a/drivers/gpu/drm/tegra/dc.c
41278 +++ b/drivers/gpu/drm/tegra/dc.c
41279 @@ -1242,7 +1242,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41280 }
41281
41282 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41283 - dc->debugfs_files[i].data = dc;
41284 + *(void **)&dc->debugfs_files[i].data = dc;
41285
41286 err = drm_debugfs_create_files(dc->debugfs_files,
41287 ARRAY_SIZE(debugfs_files),
41288 diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41289 index f787445..2df2c65 100644
41290 --- a/drivers/gpu/drm/tegra/dsi.c
41291 +++ b/drivers/gpu/drm/tegra/dsi.c
41292 @@ -41,7 +41,7 @@ struct tegra_dsi {
41293 struct clk *clk_lp;
41294 struct clk *clk;
41295
41296 - struct drm_info_list *debugfs_files;
41297 + drm_info_list_no_const *debugfs_files;
41298 struct drm_minor *minor;
41299 struct dentry *debugfs;
41300
41301 diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41302 index ffe2654..03c7b1c 100644
41303 --- a/drivers/gpu/drm/tegra/hdmi.c
41304 +++ b/drivers/gpu/drm/tegra/hdmi.c
41305 @@ -60,7 +60,7 @@ struct tegra_hdmi {
41306 bool stereo;
41307 bool dvi;
41308
41309 - struct drm_info_list *debugfs_files;
41310 + drm_info_list_no_const *debugfs_files;
41311 struct drm_minor *minor;
41312 struct dentry *debugfs;
41313 };
41314 diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41315 index 964387f..4eafc00 100644
41316 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41317 +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41318 @@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41319 }
41320
41321 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41322 - ttm_bo_man_init,
41323 - ttm_bo_man_takedown,
41324 - ttm_bo_man_get_node,
41325 - ttm_bo_man_put_node,
41326 - ttm_bo_man_debug
41327 + .init = ttm_bo_man_init,
41328 + .takedown = ttm_bo_man_takedown,
41329 + .get_node = ttm_bo_man_get_node,
41330 + .put_node = ttm_bo_man_put_node,
41331 + .debug = ttm_bo_man_debug
41332 };
41333 EXPORT_SYMBOL(ttm_bo_manager_func);
41334 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41335 index a1803fb..c53f6b0 100644
41336 --- a/drivers/gpu/drm/ttm/ttm_memory.c
41337 +++ b/drivers/gpu/drm/ttm/ttm_memory.c
41338 @@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41339 zone->glob = glob;
41340 glob->zone_kernel = zone;
41341 ret = kobject_init_and_add(
41342 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41343 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41344 if (unlikely(ret != 0)) {
41345 kobject_put(&zone->kobj);
41346 return ret;
41347 @@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41348 zone->glob = glob;
41349 glob->zone_dma32 = zone;
41350 ret = kobject_init_and_add(
41351 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41352 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41353 if (unlikely(ret != 0)) {
41354 kobject_put(&zone->kobj);
41355 return ret;
41356 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41357 index 09874d6..d6da1de 100644
41358 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41359 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41360 @@ -54,7 +54,7 @@
41361
41362 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41363 #define SMALL_ALLOCATION 16
41364 -#define FREE_ALL_PAGES (~0U)
41365 +#define FREE_ALL_PAGES (~0UL)
41366 /* times are in msecs */
41367 #define PAGE_FREE_INTERVAL 1000
41368
41369 @@ -299,14 +299,13 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41370 * @free_all: If set to true will free all pages in pool
41371 * @gfp: GFP flags.
41372 **/
41373 -static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41374 +static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41375 gfp_t gfp)
41376 {
41377 unsigned long irq_flags;
41378 struct page *p;
41379 struct page **pages_to_free;
41380 - unsigned freed_pages = 0,
41381 - npages_to_free = nr_free;
41382 + unsigned long freed_pages = 0, npages_to_free = nr_free;
41383
41384 if (NUM_PAGES_TO_ALLOC < nr_free)
41385 npages_to_free = NUM_PAGES_TO_ALLOC;
41386 @@ -366,7 +365,8 @@ restart:
41387 __list_del(&p->lru, &pool->list);
41388
41389 ttm_pool_update_free_locked(pool, freed_pages);
41390 - nr_free -= freed_pages;
41391 + if (likely(nr_free != FREE_ALL_PAGES))
41392 + nr_free -= freed_pages;
41393 }
41394
41395 spin_unlock_irqrestore(&pool->lock, irq_flags);
41396 @@ -395,7 +395,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41397 unsigned i;
41398 unsigned pool_offset;
41399 struct ttm_page_pool *pool;
41400 - int shrink_pages = sc->nr_to_scan;
41401 + unsigned long shrink_pages = sc->nr_to_scan;
41402 unsigned long freed = 0;
41403
41404 if (!mutex_trylock(&lock))
41405 @@ -403,7 +403,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41406 pool_offset = ++start_pool % NUM_POOLS;
41407 /* select start pool in round robin fashion */
41408 for (i = 0; i < NUM_POOLS; ++i) {
41409 - unsigned nr_free = shrink_pages;
41410 + unsigned long nr_free = shrink_pages;
41411 if (shrink_pages == 0)
41412 break;
41413 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41414 @@ -669,7 +669,7 @@ out:
41415 }
41416
41417 /* Put all pages in pages list to correct pool to wait for reuse */
41418 -static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41419 +static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41420 enum ttm_caching_state cstate)
41421 {
41422 unsigned long irq_flags;
41423 @@ -724,7 +724,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41424 struct list_head plist;
41425 struct page *p = NULL;
41426 gfp_t gfp_flags = GFP_USER;
41427 - unsigned count;
41428 + unsigned long count;
41429 int r;
41430
41431 /* set zero flag for page allocation if required */
41432 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41433 index c96db43..c367557 100644
41434 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41435 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41436 @@ -56,7 +56,7 @@
41437
41438 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41439 #define SMALL_ALLOCATION 4
41440 -#define FREE_ALL_PAGES (~0U)
41441 +#define FREE_ALL_PAGES (~0UL)
41442 /* times are in msecs */
41443 #define IS_UNDEFINED (0)
41444 #define IS_WC (1<<1)
41445 @@ -413,15 +413,14 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41446 * @nr_free: If set to true will free all pages in pool
41447 * @gfp: GFP flags.
41448 **/
41449 -static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41450 +static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41451 gfp_t gfp)
41452 {
41453 unsigned long irq_flags;
41454 struct dma_page *dma_p, *tmp;
41455 struct page **pages_to_free;
41456 struct list_head d_pages;
41457 - unsigned freed_pages = 0,
41458 - npages_to_free = nr_free;
41459 + unsigned long freed_pages = 0, npages_to_free = nr_free;
41460
41461 if (NUM_PAGES_TO_ALLOC < nr_free)
41462 npages_to_free = NUM_PAGES_TO_ALLOC;
41463 @@ -494,7 +493,8 @@ restart:
41464 /* remove range of pages from the pool */
41465 if (freed_pages) {
41466 ttm_pool_update_free_locked(pool, freed_pages);
41467 - nr_free -= freed_pages;
41468 + if (likely(nr_free != FREE_ALL_PAGES))
41469 + nr_free -= freed_pages;
41470 }
41471
41472 spin_unlock_irqrestore(&pool->lock, irq_flags);
41473 @@ -929,7 +929,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41474 struct dma_page *d_page, *next;
41475 enum pool_type type;
41476 bool is_cached = false;
41477 - unsigned count = 0, i, npages = 0;
41478 + unsigned long count = 0, i, npages = 0;
41479 unsigned long irq_flags;
41480
41481 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41482 @@ -1007,7 +1007,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41483 static unsigned start_pool;
41484 unsigned idx = 0;
41485 unsigned pool_offset;
41486 - unsigned shrink_pages = sc->nr_to_scan;
41487 + unsigned long shrink_pages = sc->nr_to_scan;
41488 struct device_pools *p;
41489 unsigned long freed = 0;
41490
41491 @@ -1020,7 +1020,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41492 goto out;
41493 pool_offset = ++start_pool % _manager->npools;
41494 list_for_each_entry(p, &_manager->pools, pools) {
41495 - unsigned nr_free;
41496 + unsigned long nr_free;
41497
41498 if (!p->dev)
41499 continue;
41500 @@ -1034,7 +1034,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41501 sc->gfp_mask);
41502 freed += nr_free - shrink_pages;
41503
41504 - pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41505 + pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41506 p->pool->dev_name, p->pool->name, current->pid,
41507 nr_free, shrink_pages);
41508 }
41509 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41510 index 8cbcb45..a4d9cf7 100644
41511 --- a/drivers/gpu/drm/udl/udl_fb.c
41512 +++ b/drivers/gpu/drm/udl/udl_fb.c
41513 @@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41514 fb_deferred_io_cleanup(info);
41515 kfree(info->fbdefio);
41516 info->fbdefio = NULL;
41517 - info->fbops->fb_mmap = udl_fb_mmap;
41518 }
41519
41520 pr_warn("released /dev/fb%d user=%d count=%d\n",
41521 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41522 index ef8c500..01030c8 100644
41523 --- a/drivers/gpu/drm/via/via_drv.h
41524 +++ b/drivers/gpu/drm/via/via_drv.h
41525 @@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41526 typedef uint32_t maskarray_t[5];
41527
41528 typedef struct drm_via_irq {
41529 - atomic_t irq_received;
41530 + atomic_unchecked_t irq_received;
41531 uint32_t pending_mask;
41532 uint32_t enable_mask;
41533 wait_queue_head_t irq_queue;
41534 @@ -77,7 +77,7 @@ typedef struct drm_via_private {
41535 struct timeval last_vblank;
41536 int last_vblank_valid;
41537 unsigned usec_per_vblank;
41538 - atomic_t vbl_received;
41539 + atomic_unchecked_t vbl_received;
41540 drm_via_state_t hc_state;
41541 char pci_buf[VIA_PCI_BUF_SIZE];
41542 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41543 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41544 index 1319433..a993b0c 100644
41545 --- a/drivers/gpu/drm/via/via_irq.c
41546 +++ b/drivers/gpu/drm/via/via_irq.c
41547 @@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41548 if (crtc != 0)
41549 return 0;
41550
41551 - return atomic_read(&dev_priv->vbl_received);
41552 + return atomic_read_unchecked(&dev_priv->vbl_received);
41553 }
41554
41555 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41556 @@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41557
41558 status = VIA_READ(VIA_REG_INTERRUPT);
41559 if (status & VIA_IRQ_VBLANK_PENDING) {
41560 - atomic_inc(&dev_priv->vbl_received);
41561 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41562 + atomic_inc_unchecked(&dev_priv->vbl_received);
41563 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41564 do_gettimeofday(&cur_vblank);
41565 if (dev_priv->last_vblank_valid) {
41566 dev_priv->usec_per_vblank =
41567 @@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41568 dev_priv->last_vblank = cur_vblank;
41569 dev_priv->last_vblank_valid = 1;
41570 }
41571 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41572 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41573 DRM_DEBUG("US per vblank is: %u\n",
41574 dev_priv->usec_per_vblank);
41575 }
41576 @@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41577
41578 for (i = 0; i < dev_priv->num_irqs; ++i) {
41579 if (status & cur_irq->pending_mask) {
41580 - atomic_inc(&cur_irq->irq_received);
41581 + atomic_inc_unchecked(&cur_irq->irq_received);
41582 wake_up(&cur_irq->irq_queue);
41583 handled = 1;
41584 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41585 @@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41586 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41587 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41588 masks[irq][4]));
41589 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41590 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41591 } else {
41592 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41593 (((cur_irq_sequence =
41594 - atomic_read(&cur_irq->irq_received)) -
41595 + atomic_read_unchecked(&cur_irq->irq_received)) -
41596 *sequence) <= (1 << 23)));
41597 }
41598 *sequence = cur_irq_sequence;
41599 @@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41600 }
41601
41602 for (i = 0; i < dev_priv->num_irqs; ++i) {
41603 - atomic_set(&cur_irq->irq_received, 0);
41604 + atomic_set_unchecked(&cur_irq->irq_received, 0);
41605 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41606 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41607 init_waitqueue_head(&cur_irq->irq_queue);
41608 @@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41609 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41610 case VIA_IRQ_RELATIVE:
41611 irqwait->request.sequence +=
41612 - atomic_read(&cur_irq->irq_received);
41613 + atomic_read_unchecked(&cur_irq->irq_received);
41614 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41615 case VIA_IRQ_ABSOLUTE:
41616 break;
41617 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41618 index 4ee799b..69fc0d1 100644
41619 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41620 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41621 @@ -446,7 +446,7 @@ struct vmw_private {
41622 * Fencing and IRQs.
41623 */
41624
41625 - atomic_t marker_seq;
41626 + atomic_unchecked_t marker_seq;
41627 wait_queue_head_t fence_queue;
41628 wait_queue_head_t fifo_queue;
41629 int fence_queue_waiters; /* Protected by hw_mutex */
41630 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41631 index 09e10ae..cb76c60 100644
41632 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41633 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41634 @@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41635 (unsigned int) min,
41636 (unsigned int) fifo->capabilities);
41637
41638 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41639 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41640 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41641 vmw_marker_queue_init(&fifo->marker_queue);
41642 return vmw_fifo_send_fence(dev_priv, &dummy);
41643 @@ -378,7 +378,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41644 if (reserveable)
41645 iowrite32(bytes, fifo_mem +
41646 SVGA_FIFO_RESERVED);
41647 - return fifo_mem + (next_cmd >> 2);
41648 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41649 } else {
41650 need_bounce = true;
41651 }
41652 @@ -498,7 +498,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41653
41654 fm = vmw_fifo_reserve(dev_priv, bytes);
41655 if (unlikely(fm == NULL)) {
41656 - *seqno = atomic_read(&dev_priv->marker_seq);
41657 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41658 ret = -ENOMEM;
41659 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41660 false, 3*HZ);
41661 @@ -506,7 +506,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41662 }
41663
41664 do {
41665 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41666 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41667 } while (*seqno == 0);
41668
41669 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41670 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41671 index 170b61b..fec7348 100644
41672 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41673 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41674 @@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41675 }
41676
41677 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41678 - vmw_gmrid_man_init,
41679 - vmw_gmrid_man_takedown,
41680 - vmw_gmrid_man_get_node,
41681 - vmw_gmrid_man_put_node,
41682 - vmw_gmrid_man_debug
41683 + .init = vmw_gmrid_man_init,
41684 + .takedown = vmw_gmrid_man_takedown,
41685 + .get_node = vmw_gmrid_man_get_node,
41686 + .put_node = vmw_gmrid_man_put_node,
41687 + .debug = vmw_gmrid_man_debug
41688 };
41689 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41690 index 37881ec..319065d 100644
41691 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41692 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41693 @@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41694 int ret;
41695
41696 num_clips = arg->num_clips;
41697 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41698 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41699
41700 if (unlikely(num_clips == 0))
41701 return 0;
41702 @@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41703 int ret;
41704
41705 num_clips = arg->num_clips;
41706 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41707 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41708
41709 if (unlikely(num_clips == 0))
41710 return 0;
41711 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41712 index 0c42376..6febe77 100644
41713 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41714 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41715 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41716 * emitted. Then the fence is stale and signaled.
41717 */
41718
41719 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41720 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41721 > VMW_FENCE_WRAP);
41722
41723 return ret;
41724 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41725
41726 if (fifo_idle)
41727 down_read(&fifo_state->rwsem);
41728 - signal_seq = atomic_read(&dev_priv->marker_seq);
41729 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41730 ret = 0;
41731
41732 for (;;) {
41733 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41734 index efd1ffd..0ae13ca 100644
41735 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41736 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41737 @@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41738 while (!vmw_lag_lt(queue, us)) {
41739 spin_lock(&queue->lock);
41740 if (list_empty(&queue->head))
41741 - seqno = atomic_read(&dev_priv->marker_seq);
41742 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41743 else {
41744 marker = list_first_entry(&queue->head,
41745 struct vmw_marker, head);
41746 diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41747 index 37ac7b5..d52a5c9 100644
41748 --- a/drivers/gpu/vga/vga_switcheroo.c
41749 +++ b/drivers/gpu/vga/vga_switcheroo.c
41750 @@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41751
41752 /* this version is for the case where the power switch is separate
41753 to the device being powered down. */
41754 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41755 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41756 {
41757 /* copy over all the bus versions */
41758 if (dev->bus && dev->bus->pm) {
41759 @@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41760 return ret;
41761 }
41762
41763 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41764 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41765 {
41766 /* copy over all the bus versions */
41767 if (dev->bus && dev->bus->pm) {
41768 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41769 index 3402033..50b562c 100644
41770 --- a/drivers/hid/hid-core.c
41771 +++ b/drivers/hid/hid-core.c
41772 @@ -2506,7 +2506,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41773
41774 int hid_add_device(struct hid_device *hdev)
41775 {
41776 - static atomic_t id = ATOMIC_INIT(0);
41777 + static atomic_unchecked_t id = ATOMIC_INIT(0);
41778 int ret;
41779
41780 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41781 @@ -2548,7 +2548,7 @@ int hid_add_device(struct hid_device *hdev)
41782 /* XXX hack, any other cleaner solution after the driver core
41783 * is converted to allow more than 20 bytes as the device name? */
41784 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41785 - hdev->vendor, hdev->product, atomic_inc_return(&id));
41786 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41787
41788 hid_debug_register(hdev, dev_name(&hdev->dev));
41789 ret = device_add(&hdev->dev);
41790 diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
41791 index 71f5692..147d3da 100644
41792 --- a/drivers/hid/hid-logitech-dj.c
41793 +++ b/drivers/hid/hid-logitech-dj.c
41794 @@ -658,6 +658,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,
41795 * device (via hid_input_report() ) and return 1 so hid-core does not do
41796 * anything else with it.
41797 */
41798 + if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
41799 + (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
41800 + dev_err(&hdev->dev, "%s: invalid device index:%d\n",
41801 + __func__, dj_report->device_index);
41802 + return false;
41803 + }
41804
41805 /* case 1) */
41806 if (data[0] != REPORT_ID_DJ_SHORT)
41807 diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
41808 index bc4269e..b6e6102 100644
41809 --- a/drivers/hid/hid-sony.c
41810 +++ b/drivers/hid/hid-sony.c
41811 @@ -798,6 +798,12 @@ union sixaxis_output_report_01 {
41812 __u8 buf[36];
41813 };
41814
41815 +#define DS4_REPORT_0x02_SIZE 37
41816 +#define DS4_REPORT_0x05_SIZE 32
41817 +#define DS4_REPORT_0x11_SIZE 78
41818 +#define DS4_REPORT_0x81_SIZE 7
41819 +#define SIXAXIS_REPORT_0xF2_SIZE 18
41820 +
41821 static spinlock_t sony_dev_list_lock;
41822 static LIST_HEAD(sony_device_list);
41823 static DEFINE_IDA(sony_device_id_allocator);
41824 @@ -811,6 +817,7 @@ struct sony_sc {
41825 struct work_struct state_worker;
41826 struct power_supply battery;
41827 int device_id;
41828 + __u8 *output_report_dmabuf;
41829
41830 #ifdef CONFIG_SONY_FF
41831 __u8 left;
41832 @@ -1142,9 +1149,20 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
41833
41834 static int sixaxis_set_operational_bt(struct hid_device *hdev)
41835 {
41836 - unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41837 - return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
41838 + static const __u8 report[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41839 + __u8 *buf;
41840 + int ret;
41841 +
41842 + buf = kmemdup(report, sizeof(report), GFP_KERNEL);
41843 + if (!buf)
41844 + return -ENOMEM;
41845 +
41846 + ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(report),
41847 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
41848 +
41849 + kfree(buf);
41850 +
41851 + return ret;
41852 }
41853
41854 /*
41855 @@ -1153,10 +1171,19 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
41856 */
41857 static int dualshock4_set_operational_bt(struct hid_device *hdev)
41858 {
41859 - __u8 buf[37] = { 0 };
41860 + __u8 *buf;
41861 + int ret;
41862
41863 - return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
41864 + buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL);
41865 + if (!buf)
41866 + return -ENOMEM;
41867 +
41868 + ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE,
41869 HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41870 +
41871 + kfree(buf);
41872 +
41873 + return ret;
41874 }
41875
41876 static void sixaxis_set_leds_from_id(int id, __u8 values[MAX_LEDS])
41877 @@ -1471,9 +1498,7 @@ error_leds:
41878
41879 static void sixaxis_state_worker(struct work_struct *work)
41880 {
41881 - struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41882 - int n;
41883 - union sixaxis_output_report_01 report = {
41884 + static const union sixaxis_output_report_01 default_report = {
41885 .buf = {
41886 0x01,
41887 0x00, 0xff, 0x00, 0xff, 0x00,
41888 @@ -1485,20 +1510,27 @@ static void sixaxis_state_worker(struct work_struct *work)
41889 0x00, 0x00, 0x00, 0x00, 0x00
41890 }
41891 };
41892 + struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41893 + struct sixaxis_output_report *report =
41894 + (struct sixaxis_output_report *)sc->output_report_dmabuf;
41895 + int n;
41896 +
41897 + /* Initialize the report with default values */
41898 + memcpy(report, &default_report, sizeof(struct sixaxis_output_report));
41899
41900 #ifdef CONFIG_SONY_FF
41901 - report.data.rumble.right_motor_on = sc->right ? 1 : 0;
41902 - report.data.rumble.left_motor_force = sc->left;
41903 + report->rumble.right_motor_on = sc->right ? 1 : 0;
41904 + report->rumble.left_motor_force = sc->left;
41905 #endif
41906
41907 - report.data.leds_bitmap |= sc->led_state[0] << 1;
41908 - report.data.leds_bitmap |= sc->led_state[1] << 2;
41909 - report.data.leds_bitmap |= sc->led_state[2] << 3;
41910 - report.data.leds_bitmap |= sc->led_state[3] << 4;
41911 + report->leds_bitmap |= sc->led_state[0] << 1;
41912 + report->leds_bitmap |= sc->led_state[1] << 2;
41913 + report->leds_bitmap |= sc->led_state[2] << 3;
41914 + report->leds_bitmap |= sc->led_state[3] << 4;
41915
41916 /* Set flag for all leds off, required for 3rd party INTEC controller */
41917 - if ((report.data.leds_bitmap & 0x1E) == 0)
41918 - report.data.leds_bitmap |= 0x20;
41919 + if ((report->leds_bitmap & 0x1E) == 0)
41920 + report->leds_bitmap |= 0x20;
41921
41922 /*
41923 * The LEDs in the report are indexed in reverse order to their
41924 @@ -1511,28 +1543,30 @@ static void sixaxis_state_worker(struct work_struct *work)
41925 */
41926 for (n = 0; n < 4; n++) {
41927 if (sc->led_delay_on[n] || sc->led_delay_off[n]) {
41928 - report.data.led[3 - n].duty_off = sc->led_delay_off[n];
41929 - report.data.led[3 - n].duty_on = sc->led_delay_on[n];
41930 + report->led[3 - n].duty_off = sc->led_delay_off[n];
41931 + report->led[3 - n].duty_on = sc->led_delay_on[n];
41932 }
41933 }
41934
41935 - hid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,
41936 - sizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41937 + hid_hw_raw_request(sc->hdev, report->report_id, (__u8 *)report,
41938 + sizeof(struct sixaxis_output_report),
41939 + HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41940 }
41941
41942 static void dualshock4_state_worker(struct work_struct *work)
41943 {
41944 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41945 struct hid_device *hdev = sc->hdev;
41946 + __u8 *buf = sc->output_report_dmabuf;
41947 int offset;
41948
41949 - __u8 buf[78] = { 0 };
41950 -
41951 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41952 + memset(buf, 0, DS4_REPORT_0x05_SIZE);
41953 buf[0] = 0x05;
41954 buf[1] = 0xFF;
41955 offset = 4;
41956 } else {
41957 + memset(buf, 0, DS4_REPORT_0x11_SIZE);
41958 buf[0] = 0x11;
41959 buf[1] = 0xB0;
41960 buf[3] = 0x0F;
41961 @@ -1560,12 +1594,33 @@ static void dualshock4_state_worker(struct work_struct *work)
41962 buf[offset++] = sc->led_delay_off[3];
41963
41964 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41965 - hid_hw_output_report(hdev, buf, 32);
41966 + hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE);
41967 else
41968 - hid_hw_raw_request(hdev, 0x11, buf, 78,
41969 + hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE,
41970 HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41971 }
41972
41973 +static int sony_allocate_output_report(struct sony_sc *sc)
41974 +{
41975 + if (sc->quirks & SIXAXIS_CONTROLLER)
41976 + sc->output_report_dmabuf =
41977 + kmalloc(sizeof(union sixaxis_output_report_01),
41978 + GFP_KERNEL);
41979 + else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
41980 + sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE,
41981 + GFP_KERNEL);
41982 + else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41983 + sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE,
41984 + GFP_KERNEL);
41985 + else
41986 + return 0;
41987 +
41988 + if (!sc->output_report_dmabuf)
41989 + return -ENOMEM;
41990 +
41991 + return 0;
41992 +}
41993 +
41994 #ifdef CONFIG_SONY_FF
41995 static int sony_play_effect(struct input_dev *dev, void *data,
41996 struct ff_effect *effect)
41997 @@ -1754,6 +1809,7 @@ static int sony_get_bt_devaddr(struct sony_sc *sc)
41998
41999 static int sony_check_add(struct sony_sc *sc)
42000 {
42001 + __u8 *buf = NULL;
42002 int n, ret;
42003
42004 if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
42005 @@ -1769,36 +1825,44 @@ static int sony_check_add(struct sony_sc *sc)
42006 return 0;
42007 }
42008 } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
42009 - __u8 buf[7];
42010 + buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL);
42011 + if (!buf)
42012 + return -ENOMEM;
42013
42014 /*
42015 * The MAC address of a DS4 controller connected via USB can be
42016 * retrieved with feature report 0x81. The address begins at
42017 * offset 1.
42018 */
42019 - ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
42020 - HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42021 + ret = hid_hw_raw_request(sc->hdev, 0x81, buf,
42022 + DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT,
42023 + HID_REQ_GET_REPORT);
42024
42025 - if (ret != 7) {
42026 + if (ret != DS4_REPORT_0x81_SIZE) {
42027 hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
42028 - return ret < 0 ? ret : -EINVAL;
42029 + ret = ret < 0 ? ret : -EINVAL;
42030 + goto out_free;
42031 }
42032
42033 memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
42034 } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
42035 - __u8 buf[18];
42036 + buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
42037 + if (!buf)
42038 + return -ENOMEM;
42039
42040 /*
42041 * The MAC address of a Sixaxis controller connected via USB can
42042 * be retrieved with feature report 0xf2. The address begins at
42043 * offset 4.
42044 */
42045 - ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
42046 - HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42047 + ret = hid_hw_raw_request(sc->hdev, 0xf2, buf,
42048 + SIXAXIS_REPORT_0xF2_SIZE, HID_FEATURE_REPORT,
42049 + HID_REQ_GET_REPORT);
42050
42051 - if (ret != 18) {
42052 + if (ret != SIXAXIS_REPORT_0xF2_SIZE) {
42053 hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
42054 - return ret < 0 ? ret : -EINVAL;
42055 + ret = ret < 0 ? ret : -EINVAL;
42056 + goto out_free;
42057 }
42058
42059 /*
42060 @@ -1811,7 +1875,13 @@ static int sony_check_add(struct sony_sc *sc)
42061 return 0;
42062 }
42063
42064 - return sony_check_add_dev_list(sc);
42065 + ret = sony_check_add_dev_list(sc);
42066 +
42067 +out_free:
42068 +
42069 + kfree(buf);
42070 +
42071 + return ret;
42072 }
42073
42074 static int sony_set_device_id(struct sony_sc *sc)
42075 @@ -1895,6 +1965,12 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
42076 return ret;
42077 }
42078
42079 + ret = sony_allocate_output_report(sc);
42080 + if (ret < 0) {
42081 + hid_err(hdev, "failed to allocate the output report buffer\n");
42082 + goto err_stop;
42083 + }
42084 +
42085 ret = sony_set_device_id(sc);
42086 if (ret < 0) {
42087 hid_err(hdev, "failed to allocate the device id\n");
42088 @@ -1984,6 +2060,7 @@ err_stop:
42089 if (sc->quirks & SONY_BATTERY_SUPPORT)
42090 sony_battery_remove(sc);
42091 sony_cancel_work_sync(sc);
42092 + kfree(sc->output_report_dmabuf);
42093 sony_remove_dev_list(sc);
42094 sony_release_device_id(sc);
42095 hid_hw_stop(hdev);
42096 @@ -2004,6 +2081,8 @@ static void sony_remove(struct hid_device *hdev)
42097
42098 sony_cancel_work_sync(sc);
42099
42100 + kfree(sc->output_report_dmabuf);
42101 +
42102 sony_remove_dev_list(sc);
42103
42104 sony_release_device_id(sc);
42105 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42106 index c13fb5b..55a3802 100644
42107 --- a/drivers/hid/hid-wiimote-debug.c
42108 +++ b/drivers/hid/hid-wiimote-debug.c
42109 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42110 else if (size == 0)
42111 return -EIO;
42112
42113 - if (copy_to_user(u, buf, size))
42114 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
42115 return -EFAULT;
42116
42117 *off += size;
42118 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42119 index 433f72a..2926005 100644
42120 --- a/drivers/hv/channel.c
42121 +++ b/drivers/hv/channel.c
42122 @@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42123 unsigned long flags;
42124 int ret = 0;
42125
42126 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42127 - atomic_inc(&vmbus_connection.next_gpadl_handle);
42128 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42129 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42130
42131 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42132 if (ret)
42133 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42134 index 3e4235c..877d0e5 100644
42135 --- a/drivers/hv/hv.c
42136 +++ b/drivers/hv/hv.c
42137 @@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42138 u64 output_address = (output) ? virt_to_phys(output) : 0;
42139 u32 output_address_hi = output_address >> 32;
42140 u32 output_address_lo = output_address & 0xFFFFFFFF;
42141 - void *hypercall_page = hv_context.hypercall_page;
42142 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42143
42144 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42145 "=a"(hv_status_lo) : "d" (control_hi),
42146 @@ -156,7 +156,7 @@ int hv_init(void)
42147 /* See if the hypercall page is already set */
42148 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42149
42150 - virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42151 + virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42152
42153 if (!virtaddr)
42154 goto cleanup;
42155 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42156 index 5e90c5d..d8fcefb 100644
42157 --- a/drivers/hv/hv_balloon.c
42158 +++ b/drivers/hv/hv_balloon.c
42159 @@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42160
42161 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42162 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42163 -static atomic_t trans_id = ATOMIC_INIT(0);
42164 +static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42165
42166 static int dm_ring_size = (5 * PAGE_SIZE);
42167
42168 @@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42169 pr_info("Memory hot add failed\n");
42170
42171 dm->state = DM_INITIALIZED;
42172 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
42173 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42174 vmbus_sendpacket(dm->dev->channel, &resp,
42175 sizeof(struct dm_hot_add_response),
42176 (unsigned long)NULL,
42177 @@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42178 memset(&status, 0, sizeof(struct dm_status));
42179 status.hdr.type = DM_STATUS_REPORT;
42180 status.hdr.size = sizeof(struct dm_status);
42181 - status.hdr.trans_id = atomic_inc_return(&trans_id);
42182 + status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42183
42184 /*
42185 * The host expects the guest to report free memory.
42186 @@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42187 * send the status. This can happen if we were interrupted
42188 * after we picked our transaction ID.
42189 */
42190 - if (status.hdr.trans_id != atomic_read(&trans_id))
42191 + if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42192 return;
42193
42194 /*
42195 @@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
42196 */
42197
42198 do {
42199 - bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42200 + bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42201 ret = vmbus_sendpacket(dm_device.dev->channel,
42202 bl_resp,
42203 bl_resp->hdr.size,
42204 @@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42205
42206 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42207 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42208 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
42209 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42210 resp.hdr.size = sizeof(struct dm_unballoon_response);
42211
42212 vmbus_sendpacket(dm_device.dev->channel, &resp,
42213 @@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42214 memset(&version_req, 0, sizeof(struct dm_version_request));
42215 version_req.hdr.type = DM_VERSION_REQUEST;
42216 version_req.hdr.size = sizeof(struct dm_version_request);
42217 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42218 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42219 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42220 version_req.is_last_attempt = 1;
42221
42222 @@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
42223 memset(&version_req, 0, sizeof(struct dm_version_request));
42224 version_req.hdr.type = DM_VERSION_REQUEST;
42225 version_req.hdr.size = sizeof(struct dm_version_request);
42226 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42227 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42228 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42229 version_req.is_last_attempt = 0;
42230
42231 @@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
42232 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42233 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42234 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42235 - cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42236 + cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42237
42238 cap_msg.caps.cap_bits.balloon = 1;
42239 cap_msg.caps.cap_bits.hot_add = 1;
42240 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42241 index c386d8d..d6004c4 100644
42242 --- a/drivers/hv/hyperv_vmbus.h
42243 +++ b/drivers/hv/hyperv_vmbus.h
42244 @@ -611,7 +611,7 @@ enum vmbus_connect_state {
42245 struct vmbus_connection {
42246 enum vmbus_connect_state conn_state;
42247
42248 - atomic_t next_gpadl_handle;
42249 + atomic_unchecked_t next_gpadl_handle;
42250
42251 /*
42252 * Represents channel interrupts. Each bit position represents a
42253 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42254 index 4d6b269..2e23b86 100644
42255 --- a/drivers/hv/vmbus_drv.c
42256 +++ b/drivers/hv/vmbus_drv.c
42257 @@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42258 {
42259 int ret = 0;
42260
42261 - static atomic_t device_num = ATOMIC_INIT(0);
42262 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42263
42264 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42265 - atomic_inc_return(&device_num));
42266 + atomic_inc_return_unchecked(&device_num));
42267
42268 child_device_obj->device.bus = &hv_bus;
42269 child_device_obj->device.parent = &hv_acpi_dev->dev;
42270 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42271 index 579bdf9..75118b5 100644
42272 --- a/drivers/hwmon/acpi_power_meter.c
42273 +++ b/drivers/hwmon/acpi_power_meter.c
42274 @@ -116,7 +116,7 @@ struct sensor_template {
42275 struct device_attribute *devattr,
42276 const char *buf, size_t count);
42277 int index;
42278 -};
42279 +} __do_const;
42280
42281 /* Averaging interval */
42282 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42283 @@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42284 struct sensor_template *attrs)
42285 {
42286 struct device *dev = &resource->acpi_dev->dev;
42287 - struct sensor_device_attribute *sensors =
42288 + sensor_device_attribute_no_const *sensors =
42289 &resource->sensors[resource->num_sensors];
42290 int res = 0;
42291
42292 diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42293 index 3288f13..71cfb4e 100644
42294 --- a/drivers/hwmon/applesmc.c
42295 +++ b/drivers/hwmon/applesmc.c
42296 @@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42297 {
42298 struct applesmc_node_group *grp;
42299 struct applesmc_dev_attr *node;
42300 - struct attribute *attr;
42301 + attribute_no_const *attr;
42302 int ret, i;
42303
42304 for (grp = groups; grp->format; grp++) {
42305 diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42306 index cccef87..06ce8ec 100644
42307 --- a/drivers/hwmon/asus_atk0110.c
42308 +++ b/drivers/hwmon/asus_atk0110.c
42309 @@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42310 struct atk_sensor_data {
42311 struct list_head list;
42312 struct atk_data *data;
42313 - struct device_attribute label_attr;
42314 - struct device_attribute input_attr;
42315 - struct device_attribute limit1_attr;
42316 - struct device_attribute limit2_attr;
42317 + device_attribute_no_const label_attr;
42318 + device_attribute_no_const input_attr;
42319 + device_attribute_no_const limit1_attr;
42320 + device_attribute_no_const limit2_attr;
42321 char label_attr_name[ATTR_NAME_SIZE];
42322 char input_attr_name[ATTR_NAME_SIZE];
42323 char limit1_attr_name[ATTR_NAME_SIZE];
42324 @@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42325 static struct device_attribute atk_name_attr =
42326 __ATTR(name, 0444, atk_name_show, NULL);
42327
42328 -static void atk_init_attribute(struct device_attribute *attr, char *name,
42329 +static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42330 sysfs_show_func show)
42331 {
42332 sysfs_attr_init(&attr->attr);
42333 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42334 index d76f0b7..55ae976 100644
42335 --- a/drivers/hwmon/coretemp.c
42336 +++ b/drivers/hwmon/coretemp.c
42337 @@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42338 return NOTIFY_OK;
42339 }
42340
42341 -static struct notifier_block coretemp_cpu_notifier __refdata = {
42342 +static struct notifier_block coretemp_cpu_notifier = {
42343 .notifier_call = coretemp_cpu_callback,
42344 };
42345
42346 diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42347 index 7a8a6fb..015c1fd 100644
42348 --- a/drivers/hwmon/ibmaem.c
42349 +++ b/drivers/hwmon/ibmaem.c
42350 @@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42351 struct aem_rw_sensor_template *rw)
42352 {
42353 struct device *dev = &data->pdev->dev;
42354 - struct sensor_device_attribute *sensors = data->sensors;
42355 + sensor_device_attribute_no_const *sensors = data->sensors;
42356 int err;
42357
42358 /* Set up read-only sensors */
42359 diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42360 index 14c82da..09b25d7 100644
42361 --- a/drivers/hwmon/iio_hwmon.c
42362 +++ b/drivers/hwmon/iio_hwmon.c
42363 @@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42364 {
42365 struct device *dev = &pdev->dev;
42366 struct iio_hwmon_state *st;
42367 - struct sensor_device_attribute *a;
42368 + sensor_device_attribute_no_const *a;
42369 int ret, i;
42370 int in_i = 1, temp_i = 1, curr_i = 1;
42371 enum iio_chan_type type;
42372 diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42373 index 7710f46..427a28d 100644
42374 --- a/drivers/hwmon/nct6683.c
42375 +++ b/drivers/hwmon/nct6683.c
42376 @@ -397,11 +397,11 @@ static struct attribute_group *
42377 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42378 int repeat)
42379 {
42380 - struct sensor_device_attribute_2 *a2;
42381 - struct sensor_device_attribute *a;
42382 + sensor_device_attribute_2_no_const *a2;
42383 + sensor_device_attribute_no_const *a;
42384 struct sensor_device_template **t;
42385 struct sensor_device_attr_u *su;
42386 - struct attribute_group *group;
42387 + attribute_group_no_const *group;
42388 struct attribute **attrs;
42389 int i, j, count;
42390
42391 diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42392 index 504cbdd..35d6f25 100644
42393 --- a/drivers/hwmon/nct6775.c
42394 +++ b/drivers/hwmon/nct6775.c
42395 @@ -943,10 +943,10 @@ static struct attribute_group *
42396 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42397 int repeat)
42398 {
42399 - struct attribute_group *group;
42400 + attribute_group_no_const *group;
42401 struct sensor_device_attr_u *su;
42402 - struct sensor_device_attribute *a;
42403 - struct sensor_device_attribute_2 *a2;
42404 + sensor_device_attribute_no_const *a;
42405 + sensor_device_attribute_2_no_const *a2;
42406 struct attribute **attrs;
42407 struct sensor_device_template **t;
42408 int i, count;
42409 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42410 index 291d11f..3f0dbbd 100644
42411 --- a/drivers/hwmon/pmbus/pmbus_core.c
42412 +++ b/drivers/hwmon/pmbus/pmbus_core.c
42413 @@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42414 return 0;
42415 }
42416
42417 -static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42418 +static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42419 const char *name,
42420 umode_t mode,
42421 ssize_t (*show)(struct device *dev,
42422 @@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42423 dev_attr->store = store;
42424 }
42425
42426 -static void pmbus_attr_init(struct sensor_device_attribute *a,
42427 +static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42428 const char *name,
42429 umode_t mode,
42430 ssize_t (*show)(struct device *dev,
42431 @@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42432 u16 reg, u8 mask)
42433 {
42434 struct pmbus_boolean *boolean;
42435 - struct sensor_device_attribute *a;
42436 + sensor_device_attribute_no_const *a;
42437
42438 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42439 if (!boolean)
42440 @@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42441 bool update, bool readonly)
42442 {
42443 struct pmbus_sensor *sensor;
42444 - struct device_attribute *a;
42445 + device_attribute_no_const *a;
42446
42447 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42448 if (!sensor)
42449 @@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42450 const char *lstring, int index)
42451 {
42452 struct pmbus_label *label;
42453 - struct device_attribute *a;
42454 + device_attribute_no_const *a;
42455
42456 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42457 if (!label)
42458 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42459 index 97cd45a..ac54d8b 100644
42460 --- a/drivers/hwmon/sht15.c
42461 +++ b/drivers/hwmon/sht15.c
42462 @@ -169,7 +169,7 @@ struct sht15_data {
42463 int supply_uv;
42464 bool supply_uv_valid;
42465 struct work_struct update_supply_work;
42466 - atomic_t interrupt_handled;
42467 + atomic_unchecked_t interrupt_handled;
42468 };
42469
42470 /**
42471 @@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42472 ret = gpio_direction_input(data->pdata->gpio_data);
42473 if (ret)
42474 return ret;
42475 - atomic_set(&data->interrupt_handled, 0);
42476 + atomic_set_unchecked(&data->interrupt_handled, 0);
42477
42478 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42479 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42480 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42481 /* Only relevant if the interrupt hasn't occurred. */
42482 - if (!atomic_read(&data->interrupt_handled))
42483 + if (!atomic_read_unchecked(&data->interrupt_handled))
42484 schedule_work(&data->read_work);
42485 }
42486 ret = wait_event_timeout(data->wait_queue,
42487 @@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42488
42489 /* First disable the interrupt */
42490 disable_irq_nosync(irq);
42491 - atomic_inc(&data->interrupt_handled);
42492 + atomic_inc_unchecked(&data->interrupt_handled);
42493 /* Then schedule a reading work struct */
42494 if (data->state != SHT15_READING_NOTHING)
42495 schedule_work(&data->read_work);
42496 @@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42497 * If not, then start the interrupt again - care here as could
42498 * have gone low in meantime so verify it hasn't!
42499 */
42500 - atomic_set(&data->interrupt_handled, 0);
42501 + atomic_set_unchecked(&data->interrupt_handled, 0);
42502 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42503 /* If still not occurred or another handler was scheduled */
42504 if (gpio_get_value(data->pdata->gpio_data)
42505 - || atomic_read(&data->interrupt_handled))
42506 + || atomic_read_unchecked(&data->interrupt_handled))
42507 return;
42508 }
42509
42510 diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42511 index 8df43c5..b07b91d 100644
42512 --- a/drivers/hwmon/via-cputemp.c
42513 +++ b/drivers/hwmon/via-cputemp.c
42514 @@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42515 return NOTIFY_OK;
42516 }
42517
42518 -static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42519 +static struct notifier_block via_cputemp_cpu_notifier = {
42520 .notifier_call = via_cputemp_cpu_callback,
42521 };
42522
42523 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42524 index 65e3240..e6c511d 100644
42525 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
42526 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42527 @@ -39,7 +39,7 @@
42528 extern struct i2c_adapter amd756_smbus;
42529
42530 static struct i2c_adapter *s4882_adapter;
42531 -static struct i2c_algorithm *s4882_algo;
42532 +static i2c_algorithm_no_const *s4882_algo;
42533
42534 /* Wrapper access functions for multiplexed SMBus */
42535 static DEFINE_MUTEX(amd756_lock);
42536 diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42537 index b19a310..d6eece0 100644
42538 --- a/drivers/i2c/busses/i2c-diolan-u2c.c
42539 +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42540 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42541 /* usb layer */
42542
42543 /* Send command to device, and get response. */
42544 -static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42545 +static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42546 {
42547 int ret = 0;
42548 int actual;
42549 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42550 index 88eda09..cf40434 100644
42551 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42552 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42553 @@ -37,7 +37,7 @@
42554 extern struct i2c_adapter *nforce2_smbus;
42555
42556 static struct i2c_adapter *s4985_adapter;
42557 -static struct i2c_algorithm *s4985_algo;
42558 +static i2c_algorithm_no_const *s4985_algo;
42559
42560 /* Wrapper access functions for multiplexed SMBus */
42561 static DEFINE_MUTEX(nforce2_lock);
42562 diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42563 index 71c7a39..71dd3e0 100644
42564 --- a/drivers/i2c/i2c-dev.c
42565 +++ b/drivers/i2c/i2c-dev.c
42566 @@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42567 break;
42568 }
42569
42570 - data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42571 + data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42572 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42573 if (IS_ERR(rdwr_pa[i].buf)) {
42574 res = PTR_ERR(rdwr_pa[i].buf);
42575 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42576 index 0b510ba..4fbb5085 100644
42577 --- a/drivers/ide/ide-cd.c
42578 +++ b/drivers/ide/ide-cd.c
42579 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42580 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42581 if ((unsigned long)buf & alignment
42582 || blk_rq_bytes(rq) & q->dma_pad_mask
42583 - || object_is_on_stack(buf))
42584 + || object_starts_on_stack(buf))
42585 drive->dma = 0;
42586 }
42587 }
42588 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42589 index af3e76d..96dfe5e 100644
42590 --- a/drivers/iio/industrialio-core.c
42591 +++ b/drivers/iio/industrialio-core.c
42592 @@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42593 }
42594
42595 static
42596 -int __iio_device_attr_init(struct device_attribute *dev_attr,
42597 +int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42598 const char *postfix,
42599 struct iio_chan_spec const *chan,
42600 ssize_t (*readfunc)(struct device *dev,
42601 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42602 index e28a494..f7c2671 100644
42603 --- a/drivers/infiniband/core/cm.c
42604 +++ b/drivers/infiniband/core/cm.c
42605 @@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42606
42607 struct cm_counter_group {
42608 struct kobject obj;
42609 - atomic_long_t counter[CM_ATTR_COUNT];
42610 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42611 };
42612
42613 struct cm_counter_attribute {
42614 @@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42615 struct ib_mad_send_buf *msg = NULL;
42616 int ret;
42617
42618 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42619 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42620 counter[CM_REQ_COUNTER]);
42621
42622 /* Quick state check to discard duplicate REQs. */
42623 @@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42624 if (!cm_id_priv)
42625 return;
42626
42627 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42628 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42629 counter[CM_REP_COUNTER]);
42630 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42631 if (ret)
42632 @@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42633 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42634 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42635 spin_unlock_irq(&cm_id_priv->lock);
42636 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42637 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42638 counter[CM_RTU_COUNTER]);
42639 goto out;
42640 }
42641 @@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42642 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42643 dreq_msg->local_comm_id);
42644 if (!cm_id_priv) {
42645 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42646 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42647 counter[CM_DREQ_COUNTER]);
42648 cm_issue_drep(work->port, work->mad_recv_wc);
42649 return -EINVAL;
42650 @@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42651 case IB_CM_MRA_REP_RCVD:
42652 break;
42653 case IB_CM_TIMEWAIT:
42654 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42655 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42656 counter[CM_DREQ_COUNTER]);
42657 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42658 goto unlock;
42659 @@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42660 cm_free_msg(msg);
42661 goto deref;
42662 case IB_CM_DREQ_RCVD:
42663 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42664 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42665 counter[CM_DREQ_COUNTER]);
42666 goto unlock;
42667 default:
42668 @@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42669 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42670 cm_id_priv->msg, timeout)) {
42671 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42672 - atomic_long_inc(&work->port->
42673 + atomic_long_inc_unchecked(&work->port->
42674 counter_group[CM_RECV_DUPLICATES].
42675 counter[CM_MRA_COUNTER]);
42676 goto out;
42677 @@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42678 break;
42679 case IB_CM_MRA_REQ_RCVD:
42680 case IB_CM_MRA_REP_RCVD:
42681 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42682 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42683 counter[CM_MRA_COUNTER]);
42684 /* fall through */
42685 default:
42686 @@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42687 case IB_CM_LAP_IDLE:
42688 break;
42689 case IB_CM_MRA_LAP_SENT:
42690 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42691 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42692 counter[CM_LAP_COUNTER]);
42693 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42694 goto unlock;
42695 @@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42696 cm_free_msg(msg);
42697 goto deref;
42698 case IB_CM_LAP_RCVD:
42699 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42700 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42701 counter[CM_LAP_COUNTER]);
42702 goto unlock;
42703 default:
42704 @@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42705 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42706 if (cur_cm_id_priv) {
42707 spin_unlock_irq(&cm.lock);
42708 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42709 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42710 counter[CM_SIDR_REQ_COUNTER]);
42711 goto out; /* Duplicate message. */
42712 }
42713 @@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42714 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42715 msg->retries = 1;
42716
42717 - atomic_long_add(1 + msg->retries,
42718 + atomic_long_add_unchecked(1 + msg->retries,
42719 &port->counter_group[CM_XMIT].counter[attr_index]);
42720 if (msg->retries)
42721 - atomic_long_add(msg->retries,
42722 + atomic_long_add_unchecked(msg->retries,
42723 &port->counter_group[CM_XMIT_RETRIES].
42724 counter[attr_index]);
42725
42726 @@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42727 }
42728
42729 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42730 - atomic_long_inc(&port->counter_group[CM_RECV].
42731 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42732 counter[attr_id - CM_ATTR_ID_OFFSET]);
42733
42734 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42735 @@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42736 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42737
42738 return sprintf(buf, "%ld\n",
42739 - atomic_long_read(&group->counter[cm_attr->index]));
42740 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42741 }
42742
42743 static const struct sysfs_ops cm_counter_ops = {
42744 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42745 index 9f5ad7c..588cd84 100644
42746 --- a/drivers/infiniband/core/fmr_pool.c
42747 +++ b/drivers/infiniband/core/fmr_pool.c
42748 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
42749
42750 struct task_struct *thread;
42751
42752 - atomic_t req_ser;
42753 - atomic_t flush_ser;
42754 + atomic_unchecked_t req_ser;
42755 + atomic_unchecked_t flush_ser;
42756
42757 wait_queue_head_t force_wait;
42758 };
42759 @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42760 struct ib_fmr_pool *pool = pool_ptr;
42761
42762 do {
42763 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42764 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42765 ib_fmr_batch_release(pool);
42766
42767 - atomic_inc(&pool->flush_ser);
42768 + atomic_inc_unchecked(&pool->flush_ser);
42769 wake_up_interruptible(&pool->force_wait);
42770
42771 if (pool->flush_function)
42772 @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42773 }
42774
42775 set_current_state(TASK_INTERRUPTIBLE);
42776 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42777 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42778 !kthread_should_stop())
42779 schedule();
42780 __set_current_state(TASK_RUNNING);
42781 @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42782 pool->dirty_watermark = params->dirty_watermark;
42783 pool->dirty_len = 0;
42784 spin_lock_init(&pool->pool_lock);
42785 - atomic_set(&pool->req_ser, 0);
42786 - atomic_set(&pool->flush_ser, 0);
42787 + atomic_set_unchecked(&pool->req_ser, 0);
42788 + atomic_set_unchecked(&pool->flush_ser, 0);
42789 init_waitqueue_head(&pool->force_wait);
42790
42791 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42792 @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42793 }
42794 spin_unlock_irq(&pool->pool_lock);
42795
42796 - serial = atomic_inc_return(&pool->req_ser);
42797 + serial = atomic_inc_return_unchecked(&pool->req_ser);
42798 wake_up_process(pool->thread);
42799
42800 if (wait_event_interruptible(pool->force_wait,
42801 - atomic_read(&pool->flush_ser) - serial >= 0))
42802 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42803 return -EINTR;
42804
42805 return 0;
42806 @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42807 } else {
42808 list_add_tail(&fmr->list, &pool->dirty_list);
42809 if (++pool->dirty_len >= pool->dirty_watermark) {
42810 - atomic_inc(&pool->req_ser);
42811 + atomic_inc_unchecked(&pool->req_ser);
42812 wake_up_process(pool->thread);
42813 }
42814 }
42815 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42816 index ec7a298..8742e59 100644
42817 --- a/drivers/infiniband/hw/cxgb4/mem.c
42818 +++ b/drivers/infiniband/hw/cxgb4/mem.c
42819 @@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42820 int err;
42821 struct fw_ri_tpte tpt;
42822 u32 stag_idx;
42823 - static atomic_t key;
42824 + static atomic_unchecked_t key;
42825
42826 if (c4iw_fatal_error(rdev))
42827 return -EIO;
42828 @@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42829 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42830 rdev->stats.stag.max = rdev->stats.stag.cur;
42831 mutex_unlock(&rdev->stats.lock);
42832 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42833 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42834 }
42835 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42836 __func__, stag_state, type, pdid, stag_idx);
42837 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42838 index 79b3dbc..96e5fcc 100644
42839 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
42840 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42841 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42842 struct ib_atomic_eth *ateth;
42843 struct ipath_ack_entry *e;
42844 u64 vaddr;
42845 - atomic64_t *maddr;
42846 + atomic64_unchecked_t *maddr;
42847 u64 sdata;
42848 u32 rkey;
42849 u8 next;
42850 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42851 IB_ACCESS_REMOTE_ATOMIC)))
42852 goto nack_acc_unlck;
42853 /* Perform atomic OP and save result. */
42854 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42855 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42856 sdata = be64_to_cpu(ateth->swap_data);
42857 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42858 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42859 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42860 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42861 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42862 be64_to_cpu(ateth->compare_data),
42863 sdata);
42864 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42865 index 1f95bba..9530f87 100644
42866 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42867 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42868 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42869 unsigned long flags;
42870 struct ib_wc wc;
42871 u64 sdata;
42872 - atomic64_t *maddr;
42873 + atomic64_unchecked_t *maddr;
42874 enum ib_wc_status send_status;
42875
42876 /*
42877 @@ -382,11 +382,11 @@ again:
42878 IB_ACCESS_REMOTE_ATOMIC)))
42879 goto acc_err;
42880 /* Perform atomic OP and save result. */
42881 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42882 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42883 sdata = wqe->wr.wr.atomic.compare_add;
42884 *(u64 *) sqp->s_sge.sge.vaddr =
42885 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42886 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42887 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42888 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42889 sdata, wqe->wr.wr.atomic.swap);
42890 goto send_comp;
42891 diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42892 index 82a7dd8..8fb6ba6 100644
42893 --- a/drivers/infiniband/hw/mlx4/mad.c
42894 +++ b/drivers/infiniband/hw/mlx4/mad.c
42895 @@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42896
42897 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42898 {
42899 - return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42900 + return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42901 cpu_to_be64(0xff00000000000000LL);
42902 }
42903
42904 diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42905 index ed327e6..ca1739e0 100644
42906 --- a/drivers/infiniband/hw/mlx4/mcg.c
42907 +++ b/drivers/infiniband/hw/mlx4/mcg.c
42908 @@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42909 {
42910 char name[20];
42911
42912 - atomic_set(&ctx->tid, 0);
42913 + atomic_set_unchecked(&ctx->tid, 0);
42914 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42915 ctx->mcg_wq = create_singlethread_workqueue(name);
42916 if (!ctx->mcg_wq)
42917 diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42918 index 6eb743f..a7b0f6d 100644
42919 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42920 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42921 @@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
42922 struct list_head mcg_mgid0_list;
42923 struct workqueue_struct *mcg_wq;
42924 struct mlx4_ib_demux_pv_ctx **tun;
42925 - atomic_t tid;
42926 + atomic_unchecked_t tid;
42927 int flushing; /* flushing the work queue */
42928 };
42929
42930 diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42931 index 9d3e5c1..6f166df 100644
42932 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42933 +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42934 @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42935 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42936 }
42937
42938 -int mthca_QUERY_FW(struct mthca_dev *dev)
42939 +int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42940 {
42941 struct mthca_mailbox *mailbox;
42942 u32 *outbox;
42943 @@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42944 CMD_TIME_CLASS_B);
42945 }
42946
42947 -int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42948 +int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42949 int num_mtt)
42950 {
42951 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42952 @@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42953 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42954 }
42955
42956 -int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42957 +int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42958 int eq_num)
42959 {
42960 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42961 @@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42962 CMD_TIME_CLASS_B);
42963 }
42964
42965 -int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42966 +int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42967 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42968 void *in_mad, void *response_mad)
42969 {
42970 diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42971 index ded76c1..0cf0a08 100644
42972 --- a/drivers/infiniband/hw/mthca/mthca_main.c
42973 +++ b/drivers/infiniband/hw/mthca/mthca_main.c
42974 @@ -692,7 +692,7 @@ err_close:
42975 return err;
42976 }
42977
42978 -static int mthca_setup_hca(struct mthca_dev *dev)
42979 +static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42980 {
42981 int err;
42982
42983 diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42984 index ed9a989..6aa5dc2 100644
42985 --- a/drivers/infiniband/hw/mthca/mthca_mr.c
42986 +++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42987 @@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42988 * through the bitmaps)
42989 */
42990
42991 -static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42992 +static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42993 {
42994 int o;
42995 int m;
42996 @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42997 return key;
42998 }
42999
43000 -int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43001 +int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43002 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43003 {
43004 struct mthca_mailbox *mailbox;
43005 @@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43006 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43007 }
43008
43009 -int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43010 +int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43011 u64 *buffer_list, int buffer_size_shift,
43012 int list_len, u64 iova, u64 total_size,
43013 u32 access, struct mthca_mr *mr)
43014 diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43015 index 415f8e1..e34214e 100644
43016 --- a/drivers/infiniband/hw/mthca/mthca_provider.c
43017 +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43018 @@ -764,7 +764,7 @@ unlock:
43019 return 0;
43020 }
43021
43022 -static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43023 +static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43024 {
43025 struct mthca_dev *dev = to_mdev(ibcq->device);
43026 struct mthca_cq *cq = to_mcq(ibcq);
43027 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43028 index 3b2a6dc..bce26ff 100644
43029 --- a/drivers/infiniband/hw/nes/nes.c
43030 +++ b/drivers/infiniband/hw/nes/nes.c
43031 @@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43032 LIST_HEAD(nes_adapter_list);
43033 static LIST_HEAD(nes_dev_list);
43034
43035 -atomic_t qps_destroyed;
43036 +atomic_unchecked_t qps_destroyed;
43037
43038 static unsigned int ee_flsh_adapter;
43039 static unsigned int sysfs_nonidx_addr;
43040 @@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43041 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43042 struct nes_adapter *nesadapter = nesdev->nesadapter;
43043
43044 - atomic_inc(&qps_destroyed);
43045 + atomic_inc_unchecked(&qps_destroyed);
43046
43047 /* Free the control structures */
43048
43049 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43050 index bd9d132..70d84f4 100644
43051 --- a/drivers/infiniband/hw/nes/nes.h
43052 +++ b/drivers/infiniband/hw/nes/nes.h
43053 @@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43054 extern unsigned int wqm_quanta;
43055 extern struct list_head nes_adapter_list;
43056
43057 -extern atomic_t cm_connects;
43058 -extern atomic_t cm_accepts;
43059 -extern atomic_t cm_disconnects;
43060 -extern atomic_t cm_closes;
43061 -extern atomic_t cm_connecteds;
43062 -extern atomic_t cm_connect_reqs;
43063 -extern atomic_t cm_rejects;
43064 -extern atomic_t mod_qp_timouts;
43065 -extern atomic_t qps_created;
43066 -extern atomic_t qps_destroyed;
43067 -extern atomic_t sw_qps_destroyed;
43068 +extern atomic_unchecked_t cm_connects;
43069 +extern atomic_unchecked_t cm_accepts;
43070 +extern atomic_unchecked_t cm_disconnects;
43071 +extern atomic_unchecked_t cm_closes;
43072 +extern atomic_unchecked_t cm_connecteds;
43073 +extern atomic_unchecked_t cm_connect_reqs;
43074 +extern atomic_unchecked_t cm_rejects;
43075 +extern atomic_unchecked_t mod_qp_timouts;
43076 +extern atomic_unchecked_t qps_created;
43077 +extern atomic_unchecked_t qps_destroyed;
43078 +extern atomic_unchecked_t sw_qps_destroyed;
43079 extern u32 mh_detected;
43080 extern u32 mh_pauses_sent;
43081 extern u32 cm_packets_sent;
43082 @@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43083 extern u32 cm_packets_received;
43084 extern u32 cm_packets_dropped;
43085 extern u32 cm_packets_retrans;
43086 -extern atomic_t cm_listens_created;
43087 -extern atomic_t cm_listens_destroyed;
43088 +extern atomic_unchecked_t cm_listens_created;
43089 +extern atomic_unchecked_t cm_listens_destroyed;
43090 extern u32 cm_backlog_drops;
43091 -extern atomic_t cm_loopbacks;
43092 -extern atomic_t cm_nodes_created;
43093 -extern atomic_t cm_nodes_destroyed;
43094 -extern atomic_t cm_accel_dropped_pkts;
43095 -extern atomic_t cm_resets_recvd;
43096 -extern atomic_t pau_qps_created;
43097 -extern atomic_t pau_qps_destroyed;
43098 +extern atomic_unchecked_t cm_loopbacks;
43099 +extern atomic_unchecked_t cm_nodes_created;
43100 +extern atomic_unchecked_t cm_nodes_destroyed;
43101 +extern atomic_unchecked_t cm_accel_dropped_pkts;
43102 +extern atomic_unchecked_t cm_resets_recvd;
43103 +extern atomic_unchecked_t pau_qps_created;
43104 +extern atomic_unchecked_t pau_qps_destroyed;
43105
43106 extern u32 int_mod_timer_init;
43107 extern u32 int_mod_cq_depth_256;
43108 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43109 index 6f09a72..cf4399d 100644
43110 --- a/drivers/infiniband/hw/nes/nes_cm.c
43111 +++ b/drivers/infiniband/hw/nes/nes_cm.c
43112 @@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43113 u32 cm_packets_retrans;
43114 u32 cm_packets_created;
43115 u32 cm_packets_received;
43116 -atomic_t cm_listens_created;
43117 -atomic_t cm_listens_destroyed;
43118 +atomic_unchecked_t cm_listens_created;
43119 +atomic_unchecked_t cm_listens_destroyed;
43120 u32 cm_backlog_drops;
43121 -atomic_t cm_loopbacks;
43122 -atomic_t cm_nodes_created;
43123 -atomic_t cm_nodes_destroyed;
43124 -atomic_t cm_accel_dropped_pkts;
43125 -atomic_t cm_resets_recvd;
43126 +atomic_unchecked_t cm_loopbacks;
43127 +atomic_unchecked_t cm_nodes_created;
43128 +atomic_unchecked_t cm_nodes_destroyed;
43129 +atomic_unchecked_t cm_accel_dropped_pkts;
43130 +atomic_unchecked_t cm_resets_recvd;
43131
43132 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43133 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43134 @@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43135 /* instance of function pointers for client API */
43136 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43137 static struct nes_cm_ops nes_cm_api = {
43138 - mini_cm_accelerated,
43139 - mini_cm_listen,
43140 - mini_cm_del_listen,
43141 - mini_cm_connect,
43142 - mini_cm_close,
43143 - mini_cm_accept,
43144 - mini_cm_reject,
43145 - mini_cm_recv_pkt,
43146 - mini_cm_dealloc_core,
43147 - mini_cm_get,
43148 - mini_cm_set
43149 + .accelerated = mini_cm_accelerated,
43150 + .listen = mini_cm_listen,
43151 + .stop_listener = mini_cm_del_listen,
43152 + .connect = mini_cm_connect,
43153 + .close = mini_cm_close,
43154 + .accept = mini_cm_accept,
43155 + .reject = mini_cm_reject,
43156 + .recv_pkt = mini_cm_recv_pkt,
43157 + .destroy_cm_core = mini_cm_dealloc_core,
43158 + .get = mini_cm_get,
43159 + .set = mini_cm_set
43160 };
43161
43162 static struct nes_cm_core *g_cm_core;
43163
43164 -atomic_t cm_connects;
43165 -atomic_t cm_accepts;
43166 -atomic_t cm_disconnects;
43167 -atomic_t cm_closes;
43168 -atomic_t cm_connecteds;
43169 -atomic_t cm_connect_reqs;
43170 -atomic_t cm_rejects;
43171 +atomic_unchecked_t cm_connects;
43172 +atomic_unchecked_t cm_accepts;
43173 +atomic_unchecked_t cm_disconnects;
43174 +atomic_unchecked_t cm_closes;
43175 +atomic_unchecked_t cm_connecteds;
43176 +atomic_unchecked_t cm_connect_reqs;
43177 +atomic_unchecked_t cm_rejects;
43178
43179 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43180 {
43181 @@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43182 kfree(listener);
43183 listener = NULL;
43184 ret = 0;
43185 - atomic_inc(&cm_listens_destroyed);
43186 + atomic_inc_unchecked(&cm_listens_destroyed);
43187 } else {
43188 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43189 }
43190 @@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43191 cm_node->rem_mac);
43192
43193 add_hte_node(cm_core, cm_node);
43194 - atomic_inc(&cm_nodes_created);
43195 + atomic_inc_unchecked(&cm_nodes_created);
43196
43197 return cm_node;
43198 }
43199 @@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43200 }
43201
43202 atomic_dec(&cm_core->node_cnt);
43203 - atomic_inc(&cm_nodes_destroyed);
43204 + atomic_inc_unchecked(&cm_nodes_destroyed);
43205 nesqp = cm_node->nesqp;
43206 if (nesqp) {
43207 nesqp->cm_node = NULL;
43208 @@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43209
43210 static void drop_packet(struct sk_buff *skb)
43211 {
43212 - atomic_inc(&cm_accel_dropped_pkts);
43213 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
43214 dev_kfree_skb_any(skb);
43215 }
43216
43217 @@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43218 {
43219
43220 int reset = 0; /* whether to send reset in case of err.. */
43221 - atomic_inc(&cm_resets_recvd);
43222 + atomic_inc_unchecked(&cm_resets_recvd);
43223 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43224 " refcnt=%d\n", cm_node, cm_node->state,
43225 atomic_read(&cm_node->ref_count));
43226 @@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43227 rem_ref_cm_node(cm_node->cm_core, cm_node);
43228 return NULL;
43229 }
43230 - atomic_inc(&cm_loopbacks);
43231 + atomic_inc_unchecked(&cm_loopbacks);
43232 loopbackremotenode->loopbackpartner = cm_node;
43233 loopbackremotenode->tcp_cntxt.rcv_wscale =
43234 NES_CM_DEFAULT_RCV_WND_SCALE;
43235 @@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43236 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43237 else {
43238 rem_ref_cm_node(cm_core, cm_node);
43239 - atomic_inc(&cm_accel_dropped_pkts);
43240 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
43241 dev_kfree_skb_any(skb);
43242 }
43243 break;
43244 @@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43245
43246 if ((cm_id) && (cm_id->event_handler)) {
43247 if (issue_disconn) {
43248 - atomic_inc(&cm_disconnects);
43249 + atomic_inc_unchecked(&cm_disconnects);
43250 cm_event.event = IW_CM_EVENT_DISCONNECT;
43251 cm_event.status = disconn_status;
43252 cm_event.local_addr = cm_id->local_addr;
43253 @@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43254 }
43255
43256 if (issue_close) {
43257 - atomic_inc(&cm_closes);
43258 + atomic_inc_unchecked(&cm_closes);
43259 nes_disconnect(nesqp, 1);
43260
43261 cm_id->provider_data = nesqp;
43262 @@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43263
43264 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43265 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43266 - atomic_inc(&cm_accepts);
43267 + atomic_inc_unchecked(&cm_accepts);
43268
43269 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43270 netdev_refcnt_read(nesvnic->netdev));
43271 @@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43272 struct nes_cm_core *cm_core;
43273 u8 *start_buff;
43274
43275 - atomic_inc(&cm_rejects);
43276 + atomic_inc_unchecked(&cm_rejects);
43277 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43278 loopback = cm_node->loopbackpartner;
43279 cm_core = cm_node->cm_core;
43280 @@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43281 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43282 ntohs(laddr->sin_port));
43283
43284 - atomic_inc(&cm_connects);
43285 + atomic_inc_unchecked(&cm_connects);
43286 nesqp->active_conn = 1;
43287
43288 /* cache the cm_id in the qp */
43289 @@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43290 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43291 return err;
43292 }
43293 - atomic_inc(&cm_listens_created);
43294 + atomic_inc_unchecked(&cm_listens_created);
43295 }
43296
43297 cm_id->add_ref(cm_id);
43298 @@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43299
43300 if (nesqp->destroyed)
43301 return;
43302 - atomic_inc(&cm_connecteds);
43303 + atomic_inc_unchecked(&cm_connecteds);
43304 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43305 " local port 0x%04X. jiffies = %lu.\n",
43306 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43307 @@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43308
43309 cm_id->add_ref(cm_id);
43310 ret = cm_id->event_handler(cm_id, &cm_event);
43311 - atomic_inc(&cm_closes);
43312 + atomic_inc_unchecked(&cm_closes);
43313 cm_event.event = IW_CM_EVENT_CLOSE;
43314 cm_event.status = 0;
43315 cm_event.provider_data = cm_id->provider_data;
43316 @@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43317 return;
43318 cm_id = cm_node->cm_id;
43319
43320 - atomic_inc(&cm_connect_reqs);
43321 + atomic_inc_unchecked(&cm_connect_reqs);
43322 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43323 cm_node, cm_id, jiffies);
43324
43325 @@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43326 return;
43327 cm_id = cm_node->cm_id;
43328
43329 - atomic_inc(&cm_connect_reqs);
43330 + atomic_inc_unchecked(&cm_connect_reqs);
43331 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43332 cm_node, cm_id, jiffies);
43333
43334 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43335 index 4166452..fc952c3 100644
43336 --- a/drivers/infiniband/hw/nes/nes_mgt.c
43337 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
43338 @@ -40,8 +40,8 @@
43339 #include "nes.h"
43340 #include "nes_mgt.h"
43341
43342 -atomic_t pau_qps_created;
43343 -atomic_t pau_qps_destroyed;
43344 +atomic_unchecked_t pau_qps_created;
43345 +atomic_unchecked_t pau_qps_destroyed;
43346
43347 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43348 {
43349 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43350 {
43351 struct sk_buff *skb;
43352 unsigned long flags;
43353 - atomic_inc(&pau_qps_destroyed);
43354 + atomic_inc_unchecked(&pau_qps_destroyed);
43355
43356 /* Free packets that have not yet been forwarded */
43357 /* Lock is acquired by skb_dequeue when removing the skb */
43358 @@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43359 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43360 skb_queue_head_init(&nesqp->pau_list);
43361 spin_lock_init(&nesqp->pau_lock);
43362 - atomic_inc(&pau_qps_created);
43363 + atomic_inc_unchecked(&pau_qps_created);
43364 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43365 }
43366
43367 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43368 index 49eb511..a774366 100644
43369 --- a/drivers/infiniband/hw/nes/nes_nic.c
43370 +++ b/drivers/infiniband/hw/nes/nes_nic.c
43371 @@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43372 target_stat_values[++index] = mh_detected;
43373 target_stat_values[++index] = mh_pauses_sent;
43374 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43375 - target_stat_values[++index] = atomic_read(&cm_connects);
43376 - target_stat_values[++index] = atomic_read(&cm_accepts);
43377 - target_stat_values[++index] = atomic_read(&cm_disconnects);
43378 - target_stat_values[++index] = atomic_read(&cm_connecteds);
43379 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43380 - target_stat_values[++index] = atomic_read(&cm_rejects);
43381 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43382 - target_stat_values[++index] = atomic_read(&qps_created);
43383 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43384 - target_stat_values[++index] = atomic_read(&qps_destroyed);
43385 - target_stat_values[++index] = atomic_read(&cm_closes);
43386 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43387 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43388 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43389 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43390 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43391 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43392 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43393 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43394 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43395 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43396 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43397 target_stat_values[++index] = cm_packets_sent;
43398 target_stat_values[++index] = cm_packets_bounced;
43399 target_stat_values[++index] = cm_packets_created;
43400 target_stat_values[++index] = cm_packets_received;
43401 target_stat_values[++index] = cm_packets_dropped;
43402 target_stat_values[++index] = cm_packets_retrans;
43403 - target_stat_values[++index] = atomic_read(&cm_listens_created);
43404 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43405 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43406 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43407 target_stat_values[++index] = cm_backlog_drops;
43408 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
43409 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
43410 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43411 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43412 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43413 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43414 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43415 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43416 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43417 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43418 target_stat_values[++index] = nesadapter->free_4kpbl;
43419 target_stat_values[++index] = nesadapter->free_256pbl;
43420 target_stat_values[++index] = int_mod_timer_init;
43421 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43422 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43423 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43424 - target_stat_values[++index] = atomic_read(&pau_qps_created);
43425 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43426 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43427 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43428 }
43429
43430 /**
43431 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43432 index fef067c..6a25ccd 100644
43433 --- a/drivers/infiniband/hw/nes/nes_verbs.c
43434 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
43435 @@ -46,9 +46,9 @@
43436
43437 #include <rdma/ib_umem.h>
43438
43439 -atomic_t mod_qp_timouts;
43440 -atomic_t qps_created;
43441 -atomic_t sw_qps_destroyed;
43442 +atomic_unchecked_t mod_qp_timouts;
43443 +atomic_unchecked_t qps_created;
43444 +atomic_unchecked_t sw_qps_destroyed;
43445
43446 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43447
43448 @@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43449 if (init_attr->create_flags)
43450 return ERR_PTR(-EINVAL);
43451
43452 - atomic_inc(&qps_created);
43453 + atomic_inc_unchecked(&qps_created);
43454 switch (init_attr->qp_type) {
43455 case IB_QPT_RC:
43456 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43457 @@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43458 struct iw_cm_event cm_event;
43459 int ret = 0;
43460
43461 - atomic_inc(&sw_qps_destroyed);
43462 + atomic_inc_unchecked(&sw_qps_destroyed);
43463 nesqp->destroyed = 1;
43464
43465 /* Blow away the connection if it exists. */
43466 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43467 index c00ae09..04e91be 100644
43468 --- a/drivers/infiniband/hw/qib/qib.h
43469 +++ b/drivers/infiniband/hw/qib/qib.h
43470 @@ -52,6 +52,7 @@
43471 #include <linux/kref.h>
43472 #include <linux/sched.h>
43473 #include <linux/kthread.h>
43474 +#include <linux/slab.h>
43475
43476 #include "qib_common.h"
43477 #include "qib_verbs.h"
43478 diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43479 index cdc7df4..a2fdfdb 100644
43480 --- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43481 +++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43482 @@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43483 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43484 }
43485
43486 -static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43487 +static struct rtnl_link_ops ipoib_link_ops = {
43488 .kind = "ipoib",
43489 .maxtype = IFLA_IPOIB_MAX,
43490 .policy = ipoib_policy,
43491 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43492 index e29c04e..adbf68c 100644
43493 --- a/drivers/input/gameport/gameport.c
43494 +++ b/drivers/input/gameport/gameport.c
43495 @@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43496 */
43497 static void gameport_init_port(struct gameport *gameport)
43498 {
43499 - static atomic_t gameport_no = ATOMIC_INIT(0);
43500 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
43501
43502 __module_get(THIS_MODULE);
43503
43504 mutex_init(&gameport->drv_mutex);
43505 device_initialize(&gameport->dev);
43506 dev_set_name(&gameport->dev, "gameport%lu",
43507 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
43508 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
43509 gameport->dev.bus = &gameport_bus;
43510 gameport->dev.release = gameport_release_port;
43511 if (gameport->parent)
43512 diff --git a/drivers/input/input.c b/drivers/input/input.c
43513 index 0f175f5..4c481c0 100644
43514 --- a/drivers/input/input.c
43515 +++ b/drivers/input/input.c
43516 @@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43517 */
43518 struct input_dev *input_allocate_device(void)
43519 {
43520 - static atomic_t input_no = ATOMIC_INIT(0);
43521 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
43522 struct input_dev *dev;
43523
43524 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43525 @@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43526 INIT_LIST_HEAD(&dev->node);
43527
43528 dev_set_name(&dev->dev, "input%lu",
43529 - (unsigned long) atomic_inc_return(&input_no) - 1);
43530 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
43531
43532 __module_get(THIS_MODULE);
43533 }
43534 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43535 index 4a95b22..874c182 100644
43536 --- a/drivers/input/joystick/sidewinder.c
43537 +++ b/drivers/input/joystick/sidewinder.c
43538 @@ -30,6 +30,7 @@
43539 #include <linux/kernel.h>
43540 #include <linux/module.h>
43541 #include <linux/slab.h>
43542 +#include <linux/sched.h>
43543 #include <linux/input.h>
43544 #include <linux/gameport.h>
43545 #include <linux/jiffies.h>
43546 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43547 index fc55f0d..11e2aa6 100644
43548 --- a/drivers/input/joystick/xpad.c
43549 +++ b/drivers/input/joystick/xpad.c
43550 @@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43551
43552 static int xpad_led_probe(struct usb_xpad *xpad)
43553 {
43554 - static atomic_t led_seq = ATOMIC_INIT(0);
43555 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
43556 long led_no;
43557 struct xpad_led *led;
43558 struct led_classdev *led_cdev;
43559 @@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43560 if (!led)
43561 return -ENOMEM;
43562
43563 - led_no = (long)atomic_inc_return(&led_seq) - 1;
43564 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
43565
43566 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
43567 led->xpad = xpad;
43568 diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43569 index afed8e2..3aa8a18 100644
43570 --- a/drivers/input/misc/ims-pcu.c
43571 +++ b/drivers/input/misc/ims-pcu.c
43572 @@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43573
43574 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43575 {
43576 - static atomic_t device_no = ATOMIC_INIT(0);
43577 + static atomic_unchecked_t device_no = ATOMIC_INIT(0);
43578
43579 const struct ims_pcu_device_info *info;
43580 int error;
43581 @@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43582 }
43583
43584 /* Device appears to be operable, complete initialization */
43585 - pcu->device_no = atomic_inc_return(&device_no) - 1;
43586 + pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
43587
43588 /*
43589 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43590 diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43591 index f4cf664..3204fda 100644
43592 --- a/drivers/input/mouse/psmouse.h
43593 +++ b/drivers/input/mouse/psmouse.h
43594 @@ -117,7 +117,7 @@ struct psmouse_attribute {
43595 ssize_t (*set)(struct psmouse *psmouse, void *data,
43596 const char *buf, size_t count);
43597 bool protect;
43598 -};
43599 +} __do_const;
43600 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43601
43602 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43603 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43604 index b604564..3f14ae4 100644
43605 --- a/drivers/input/mousedev.c
43606 +++ b/drivers/input/mousedev.c
43607 @@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43608
43609 spin_unlock_irq(&client->packet_lock);
43610
43611 - if (copy_to_user(buffer, data, count))
43612 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
43613 return -EFAULT;
43614
43615 return count;
43616 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43617 index d399b8b..4913ede 100644
43618 --- a/drivers/input/serio/serio.c
43619 +++ b/drivers/input/serio/serio.c
43620 @@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43621 */
43622 static void serio_init_port(struct serio *serio)
43623 {
43624 - static atomic_t serio_no = ATOMIC_INIT(0);
43625 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
43626
43627 __module_get(THIS_MODULE);
43628
43629 @@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43630 mutex_init(&serio->drv_mutex);
43631 device_initialize(&serio->dev);
43632 dev_set_name(&serio->dev, "serio%lu",
43633 - (unsigned long)atomic_inc_return(&serio_no) - 1);
43634 + (unsigned long)atomic_inc_return_unchecked(&serio_no) - 1);
43635 serio->dev.bus = &serio_bus;
43636 serio->dev.release = serio_release_port;
43637 serio->dev.groups = serio_device_attr_groups;
43638 diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43639 index c9a02fe..0debc75 100644
43640 --- a/drivers/input/serio/serio_raw.c
43641 +++ b/drivers/input/serio/serio_raw.c
43642 @@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43643
43644 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43645 {
43646 - static atomic_t serio_raw_no = ATOMIC_INIT(0);
43647 + static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43648 struct serio_raw *serio_raw;
43649 int err;
43650
43651 @@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43652 }
43653
43654 snprintf(serio_raw->name, sizeof(serio_raw->name),
43655 - "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43656 + "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43657 kref_init(&serio_raw->kref);
43658 INIT_LIST_HEAD(&serio_raw->client_list);
43659 init_waitqueue_head(&serio_raw->wait);
43660 diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43661 index 505a9ad..f0b1b6e 100644
43662 --- a/drivers/iommu/amd_iommu.c
43663 +++ b/drivers/iommu/amd_iommu.c
43664 @@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43665
43666 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43667 {
43668 + phys_addr_t physaddr;
43669 WARN_ON(address & 0x7ULL);
43670
43671 memset(cmd, 0, sizeof(*cmd));
43672 - cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43673 - cmd->data[1] = upper_32_bits(__pa(address));
43674 +
43675 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43676 + if (object_starts_on_stack(address)) {
43677 + void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43678 + physaddr = __pa((u64)adjbuf);
43679 + } else
43680 +#endif
43681 + physaddr = __pa(address);
43682 +
43683 + cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43684 + cmd->data[1] = upper_32_bits(physaddr);
43685 cmd->data[2] = 1;
43686 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43687 }
43688 diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43689 index 60558f7..5a02369 100644
43690 --- a/drivers/iommu/arm-smmu.c
43691 +++ b/drivers/iommu/arm-smmu.c
43692 @@ -934,7 +934,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43693 cfg->irptndx = cfg->cbndx;
43694 }
43695
43696 - ACCESS_ONCE(smmu_domain->smmu) = smmu;
43697 + ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43698 arm_smmu_init_context_bank(smmu_domain);
43699 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43700
43701 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43702 index ed8b048..7fbcc01 100644
43703 --- a/drivers/iommu/iommu.c
43704 +++ b/drivers/iommu/iommu.c
43705 @@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43706 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43707 {
43708 int err;
43709 - struct notifier_block *nb;
43710 + notifier_block_no_const *nb;
43711 struct iommu_callback_data cb = {
43712 .ops = ops,
43713 };
43714 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43715 index 74a1767..5a359e8 100644
43716 --- a/drivers/iommu/irq_remapping.c
43717 +++ b/drivers/iommu/irq_remapping.c
43718 @@ -361,7 +361,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43719 void panic_if_irq_remap(const char *msg)
43720 {
43721 if (irq_remapping_enabled)
43722 - panic(msg);
43723 + panic("%s", msg);
43724 }
43725
43726 static void ir_ack_apic_edge(struct irq_data *data)
43727 @@ -382,10 +382,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43728
43729 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43730 {
43731 - chip->irq_print_chip = ir_print_prefix;
43732 - chip->irq_ack = ir_ack_apic_edge;
43733 - chip->irq_eoi = ir_ack_apic_level;
43734 - chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43735 + pax_open_kernel();
43736 + *(void **)&chip->irq_print_chip = ir_print_prefix;
43737 + *(void **)&chip->irq_ack = ir_ack_apic_edge;
43738 + *(void **)&chip->irq_eoi = ir_ack_apic_level;
43739 + *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43740 + pax_close_kernel();
43741 }
43742
43743 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43744 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43745 index 38493ff..001538b 100644
43746 --- a/drivers/irqchip/irq-gic.c
43747 +++ b/drivers/irqchip/irq-gic.c
43748 @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43749 * Supported arch specific GIC irq extension.
43750 * Default make them NULL.
43751 */
43752 -struct irq_chip gic_arch_extn = {
43753 +irq_chip_no_const gic_arch_extn = {
43754 .irq_eoi = NULL,
43755 .irq_mask = NULL,
43756 .irq_unmask = NULL,
43757 @@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43758 chained_irq_exit(chip, desc);
43759 }
43760
43761 -static struct irq_chip gic_chip = {
43762 +static irq_chip_no_const gic_chip __read_only = {
43763 .name = "GIC",
43764 .irq_mask = gic_mask_irq,
43765 .irq_unmask = gic_unmask_irq,
43766 diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43767 index 8777065..a4a9967 100644
43768 --- a/drivers/irqchip/irq-renesas-irqc.c
43769 +++ b/drivers/irqchip/irq-renesas-irqc.c
43770 @@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43771 struct irqc_priv *p;
43772 struct resource *io;
43773 struct resource *irq;
43774 - struct irq_chip *irq_chip;
43775 + irq_chip_no_const *irq_chip;
43776 const char *name = dev_name(&pdev->dev);
43777 int ret;
43778 int k;
43779 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43780 index 6a2df32..dc962f1 100644
43781 --- a/drivers/isdn/capi/capi.c
43782 +++ b/drivers/isdn/capi/capi.c
43783 @@ -81,8 +81,8 @@ struct capiminor {
43784
43785 struct capi20_appl *ap;
43786 u32 ncci;
43787 - atomic_t datahandle;
43788 - atomic_t msgid;
43789 + atomic_unchecked_t datahandle;
43790 + atomic_unchecked_t msgid;
43791
43792 struct tty_port port;
43793 int ttyinstop;
43794 @@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43795 capimsg_setu16(s, 2, mp->ap->applid);
43796 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43797 capimsg_setu8 (s, 5, CAPI_RESP);
43798 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43799 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43800 capimsg_setu32(s, 8, mp->ncci);
43801 capimsg_setu16(s, 12, datahandle);
43802 }
43803 @@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43804 mp->outbytes -= len;
43805 spin_unlock_bh(&mp->outlock);
43806
43807 - datahandle = atomic_inc_return(&mp->datahandle);
43808 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43809 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43810 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43811 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43812 capimsg_setu16(skb->data, 2, mp->ap->applid);
43813 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43814 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43815 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43816 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43817 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43818 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43819 capimsg_setu16(skb->data, 16, len); /* Data length */
43820 diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43821 index aecec6d..11e13c5 100644
43822 --- a/drivers/isdn/gigaset/bas-gigaset.c
43823 +++ b/drivers/isdn/gigaset/bas-gigaset.c
43824 @@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43825
43826
43827 static const struct gigaset_ops gigops = {
43828 - gigaset_write_cmd,
43829 - gigaset_write_room,
43830 - gigaset_chars_in_buffer,
43831 - gigaset_brkchars,
43832 - gigaset_init_bchannel,
43833 - gigaset_close_bchannel,
43834 - gigaset_initbcshw,
43835 - gigaset_freebcshw,
43836 - gigaset_reinitbcshw,
43837 - gigaset_initcshw,
43838 - gigaset_freecshw,
43839 - gigaset_set_modem_ctrl,
43840 - gigaset_baud_rate,
43841 - gigaset_set_line_ctrl,
43842 - gigaset_isoc_send_skb,
43843 - gigaset_isoc_input,
43844 + .write_cmd = gigaset_write_cmd,
43845 + .write_room = gigaset_write_room,
43846 + .chars_in_buffer = gigaset_chars_in_buffer,
43847 + .brkchars = gigaset_brkchars,
43848 + .init_bchannel = gigaset_init_bchannel,
43849 + .close_bchannel = gigaset_close_bchannel,
43850 + .initbcshw = gigaset_initbcshw,
43851 + .freebcshw = gigaset_freebcshw,
43852 + .reinitbcshw = gigaset_reinitbcshw,
43853 + .initcshw = gigaset_initcshw,
43854 + .freecshw = gigaset_freecshw,
43855 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43856 + .baud_rate = gigaset_baud_rate,
43857 + .set_line_ctrl = gigaset_set_line_ctrl,
43858 + .send_skb = gigaset_isoc_send_skb,
43859 + .handle_input = gigaset_isoc_input,
43860 };
43861
43862 /* bas_gigaset_init
43863 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43864 index 600c79b..3752bab 100644
43865 --- a/drivers/isdn/gigaset/interface.c
43866 +++ b/drivers/isdn/gigaset/interface.c
43867 @@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43868 }
43869 tty->driver_data = cs;
43870
43871 - ++cs->port.count;
43872 + atomic_inc(&cs->port.count);
43873
43874 - if (cs->port.count == 1) {
43875 + if (atomic_read(&cs->port.count) == 1) {
43876 tty_port_tty_set(&cs->port, tty);
43877 cs->port.low_latency = 1;
43878 }
43879 @@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43880
43881 if (!cs->connected)
43882 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43883 - else if (!cs->port.count)
43884 + else if (!atomic_read(&cs->port.count))
43885 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43886 - else if (!--cs->port.count)
43887 + else if (!atomic_dec_return(&cs->port.count))
43888 tty_port_tty_set(&cs->port, NULL);
43889
43890 mutex_unlock(&cs->mutex);
43891 diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43892 index 8c91fd5..14f13ce 100644
43893 --- a/drivers/isdn/gigaset/ser-gigaset.c
43894 +++ b/drivers/isdn/gigaset/ser-gigaset.c
43895 @@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43896 }
43897
43898 static const struct gigaset_ops ops = {
43899 - gigaset_write_cmd,
43900 - gigaset_write_room,
43901 - gigaset_chars_in_buffer,
43902 - gigaset_brkchars,
43903 - gigaset_init_bchannel,
43904 - gigaset_close_bchannel,
43905 - gigaset_initbcshw,
43906 - gigaset_freebcshw,
43907 - gigaset_reinitbcshw,
43908 - gigaset_initcshw,
43909 - gigaset_freecshw,
43910 - gigaset_set_modem_ctrl,
43911 - gigaset_baud_rate,
43912 - gigaset_set_line_ctrl,
43913 - gigaset_m10x_send_skb, /* asyncdata.c */
43914 - gigaset_m10x_input, /* asyncdata.c */
43915 + .write_cmd = gigaset_write_cmd,
43916 + .write_room = gigaset_write_room,
43917 + .chars_in_buffer = gigaset_chars_in_buffer,
43918 + .brkchars = gigaset_brkchars,
43919 + .init_bchannel = gigaset_init_bchannel,
43920 + .close_bchannel = gigaset_close_bchannel,
43921 + .initbcshw = gigaset_initbcshw,
43922 + .freebcshw = gigaset_freebcshw,
43923 + .reinitbcshw = gigaset_reinitbcshw,
43924 + .initcshw = gigaset_initcshw,
43925 + .freecshw = gigaset_freecshw,
43926 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43927 + .baud_rate = gigaset_baud_rate,
43928 + .set_line_ctrl = gigaset_set_line_ctrl,
43929 + .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43930 + .handle_input = gigaset_m10x_input, /* asyncdata.c */
43931 };
43932
43933
43934 diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43935 index a8e652d..edadaa4 100644
43936 --- a/drivers/isdn/gigaset/usb-gigaset.c
43937 +++ b/drivers/isdn/gigaset/usb-gigaset.c
43938 @@ -548,7 +548,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43939 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43940 memcpy(cs->hw.usb->bchars, buf, 6);
43941 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43942 - 0, 0, &buf, 6, 2000);
43943 + 0, 0, buf, 6, 2000);
43944 }
43945
43946 static void gigaset_freebcshw(struct bc_state *bcs)
43947 @@ -867,22 +867,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43948 }
43949
43950 static const struct gigaset_ops ops = {
43951 - gigaset_write_cmd,
43952 - gigaset_write_room,
43953 - gigaset_chars_in_buffer,
43954 - gigaset_brkchars,
43955 - gigaset_init_bchannel,
43956 - gigaset_close_bchannel,
43957 - gigaset_initbcshw,
43958 - gigaset_freebcshw,
43959 - gigaset_reinitbcshw,
43960 - gigaset_initcshw,
43961 - gigaset_freecshw,
43962 - gigaset_set_modem_ctrl,
43963 - gigaset_baud_rate,
43964 - gigaset_set_line_ctrl,
43965 - gigaset_m10x_send_skb,
43966 - gigaset_m10x_input,
43967 + .write_cmd = gigaset_write_cmd,
43968 + .write_room = gigaset_write_room,
43969 + .chars_in_buffer = gigaset_chars_in_buffer,
43970 + .brkchars = gigaset_brkchars,
43971 + .init_bchannel = gigaset_init_bchannel,
43972 + .close_bchannel = gigaset_close_bchannel,
43973 + .initbcshw = gigaset_initbcshw,
43974 + .freebcshw = gigaset_freebcshw,
43975 + .reinitbcshw = gigaset_reinitbcshw,
43976 + .initcshw = gigaset_initcshw,
43977 + .freecshw = gigaset_freecshw,
43978 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43979 + .baud_rate = gigaset_baud_rate,
43980 + .set_line_ctrl = gigaset_set_line_ctrl,
43981 + .send_skb = gigaset_m10x_send_skb,
43982 + .handle_input = gigaset_m10x_input,
43983 };
43984
43985 /*
43986 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43987 index 4d9b195..455075c 100644
43988 --- a/drivers/isdn/hardware/avm/b1.c
43989 +++ b/drivers/isdn/hardware/avm/b1.c
43990 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43991 }
43992 if (left) {
43993 if (t4file->user) {
43994 - if (copy_from_user(buf, dp, left))
43995 + if (left > sizeof buf || copy_from_user(buf, dp, left))
43996 return -EFAULT;
43997 } else {
43998 memcpy(buf, dp, left);
43999 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44000 }
44001 if (left) {
44002 if (config->user) {
44003 - if (copy_from_user(buf, dp, left))
44004 + if (left > sizeof buf || copy_from_user(buf, dp, left))
44005 return -EFAULT;
44006 } else {
44007 memcpy(buf, dp, left);
44008 diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44009 index 9b856e1..fa03c92 100644
44010 --- a/drivers/isdn/i4l/isdn_common.c
44011 +++ b/drivers/isdn/i4l/isdn_common.c
44012 @@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44013 } else
44014 return -EINVAL;
44015 case IIOCDBGVAR:
44016 + if (!capable(CAP_SYS_RAWIO))
44017 + return -EPERM;
44018 if (arg) {
44019 if (copy_to_user(argp, &dev, sizeof(ulong)))
44020 return -EFAULT;
44021 diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44022 index 91d5730..336523e 100644
44023 --- a/drivers/isdn/i4l/isdn_concap.c
44024 +++ b/drivers/isdn/i4l/isdn_concap.c
44025 @@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44026 }
44027
44028 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44029 - &isdn_concap_dl_data_req,
44030 - &isdn_concap_dl_connect_req,
44031 - &isdn_concap_dl_disconn_req
44032 + .data_req = &isdn_concap_dl_data_req,
44033 + .connect_req = &isdn_concap_dl_connect_req,
44034 + .disconn_req = &isdn_concap_dl_disconn_req
44035 };
44036
44037 /* The following should better go into a dedicated source file such that
44038 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44039 index bc91261..2ef7e36 100644
44040 --- a/drivers/isdn/i4l/isdn_tty.c
44041 +++ b/drivers/isdn/i4l/isdn_tty.c
44042 @@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44043
44044 #ifdef ISDN_DEBUG_MODEM_OPEN
44045 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44046 - port->count);
44047 + atomic_read(&port->count));
44048 #endif
44049 - port->count++;
44050 + atomic_inc(&port->count);
44051 port->tty = tty;
44052 /*
44053 * Start up serial port
44054 @@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44055 #endif
44056 return;
44057 }
44058 - if ((tty->count == 1) && (port->count != 1)) {
44059 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44060 /*
44061 * Uh, oh. tty->count is 1, which means that the tty
44062 * structure will be freed. Info->count should always
44063 @@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44064 * serial port won't be shutdown.
44065 */
44066 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44067 - "info->count is %d\n", port->count);
44068 - port->count = 1;
44069 + "info->count is %d\n", atomic_read(&port->count));
44070 + atomic_set(&port->count, 1);
44071 }
44072 - if (--port->count < 0) {
44073 + if (atomic_dec_return(&port->count) < 0) {
44074 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44075 - info->line, port->count);
44076 - port->count = 0;
44077 + info->line, atomic_read(&port->count));
44078 + atomic_set(&port->count, 0);
44079 }
44080 - if (port->count) {
44081 + if (atomic_read(&port->count)) {
44082 #ifdef ISDN_DEBUG_MODEM_OPEN
44083 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44084 #endif
44085 @@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44086 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44087 return;
44088 isdn_tty_shutdown(info);
44089 - port->count = 0;
44090 + atomic_set(&port->count, 0);
44091 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44092 port->tty = NULL;
44093 wake_up_interruptible(&port->open_wait);
44094 @@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44095 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44096 modem_info *info = &dev->mdm.info[i];
44097
44098 - if (info->port.count == 0)
44099 + if (atomic_read(&info->port.count) == 0)
44100 continue;
44101 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44102 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44103 diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44104 index e2d4e58..40cd045 100644
44105 --- a/drivers/isdn/i4l/isdn_x25iface.c
44106 +++ b/drivers/isdn/i4l/isdn_x25iface.c
44107 @@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44108
44109
44110 static struct concap_proto_ops ix25_pops = {
44111 - &isdn_x25iface_proto_new,
44112 - &isdn_x25iface_proto_del,
44113 - &isdn_x25iface_proto_restart,
44114 - &isdn_x25iface_proto_close,
44115 - &isdn_x25iface_xmit,
44116 - &isdn_x25iface_receive,
44117 - &isdn_x25iface_connect_ind,
44118 - &isdn_x25iface_disconn_ind
44119 + .proto_new = &isdn_x25iface_proto_new,
44120 + .proto_del = &isdn_x25iface_proto_del,
44121 + .restart = &isdn_x25iface_proto_restart,
44122 + .close = &isdn_x25iface_proto_close,
44123 + .encap_and_xmit = &isdn_x25iface_xmit,
44124 + .data_ind = &isdn_x25iface_receive,
44125 + .connect_ind = &isdn_x25iface_connect_ind,
44126 + .disconn_ind = &isdn_x25iface_disconn_ind
44127 };
44128
44129 /* error message helper function */
44130 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44131 index 6a7447c..cae33fe 100644
44132 --- a/drivers/isdn/icn/icn.c
44133 +++ b/drivers/isdn/icn/icn.c
44134 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44135 if (count > len)
44136 count = len;
44137 if (user) {
44138 - if (copy_from_user(msg, buf, count))
44139 + if (count > sizeof msg || copy_from_user(msg, buf, count))
44140 return -EFAULT;
44141 } else
44142 memcpy(msg, buf, count);
44143 diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44144 index 87f7dff..7300125 100644
44145 --- a/drivers/isdn/mISDN/dsp_cmx.c
44146 +++ b/drivers/isdn/mISDN/dsp_cmx.c
44147 @@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44148 static u16 dsp_count; /* last sample count */
44149 static int dsp_count_valid; /* if we have last sample count */
44150
44151 -void
44152 +void __intentional_overflow(-1)
44153 dsp_cmx_send(void *arg)
44154 {
44155 struct dsp_conf *conf;
44156 diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44157 index f58a354..fbae176 100644
44158 --- a/drivers/leds/leds-clevo-mail.c
44159 +++ b/drivers/leds/leds-clevo-mail.c
44160 @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44161 * detected as working, but in reality it is not) as low as
44162 * possible.
44163 */
44164 -static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44165 +static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44166 {
44167 .callback = clevo_mail_led_dmi_callback,
44168 .ident = "Clevo D410J",
44169 diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44170 index 046cb70..6b20d39 100644
44171 --- a/drivers/leds/leds-ss4200.c
44172 +++ b/drivers/leds/leds-ss4200.c
44173 @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44174 * detected as working, but in reality it is not) as low as
44175 * possible.
44176 */
44177 -static struct dmi_system_id nas_led_whitelist[] __initdata = {
44178 +static struct dmi_system_id nas_led_whitelist[] __initconst = {
44179 {
44180 .callback = ss4200_led_dmi_callback,
44181 .ident = "Intel SS4200-E",
44182 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44183 index 6590558..a74c5dd 100644
44184 --- a/drivers/lguest/core.c
44185 +++ b/drivers/lguest/core.c
44186 @@ -96,9 +96,17 @@ static __init int map_switcher(void)
44187 * The end address needs +1 because __get_vm_area allocates an
44188 * extra guard page, so we need space for that.
44189 */
44190 +
44191 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44192 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44193 + VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44194 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44195 +#else
44196 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44197 VM_ALLOC, switcher_addr, switcher_addr
44198 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44199 +#endif
44200 +
44201 if (!switcher_vma) {
44202 err = -ENOMEM;
44203 printk("lguest: could not map switcher pages high\n");
44204 @@ -121,7 +129,7 @@ static __init int map_switcher(void)
44205 * Now the Switcher is mapped at the right address, we can't fail!
44206 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44207 */
44208 - memcpy(switcher_vma->addr, start_switcher_text,
44209 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44210 end_switcher_text - start_switcher_text);
44211
44212 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44213 diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44214 index e8b55c3..3514c37 100644
44215 --- a/drivers/lguest/page_tables.c
44216 +++ b/drivers/lguest/page_tables.c
44217 @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44218 /*:*/
44219
44220 #ifdef CONFIG_X86_PAE
44221 -static void release_pmd(pmd_t *spmd)
44222 +static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44223 {
44224 /* If the entry's not present, there's nothing to release. */
44225 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44226 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44227 index 922a1ac..9dd0c2a 100644
44228 --- a/drivers/lguest/x86/core.c
44229 +++ b/drivers/lguest/x86/core.c
44230 @@ -59,7 +59,7 @@ static struct {
44231 /* Offset from where switcher.S was compiled to where we've copied it */
44232 static unsigned long switcher_offset(void)
44233 {
44234 - return switcher_addr - (unsigned long)start_switcher_text;
44235 + return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44236 }
44237
44238 /* This cpu's struct lguest_pages (after the Switcher text page) */
44239 @@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44240 * These copies are pretty cheap, so we do them unconditionally: */
44241 /* Save the current Host top-level page directory.
44242 */
44243 +
44244 +#ifdef CONFIG_PAX_PER_CPU_PGD
44245 + pages->state.host_cr3 = read_cr3();
44246 +#else
44247 pages->state.host_cr3 = __pa(current->mm->pgd);
44248 +#endif
44249 +
44250 /*
44251 * Set up the Guest's page tables to see this CPU's pages (and no
44252 * other CPU's pages).
44253 @@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44254 * compiled-in switcher code and the high-mapped copy we just made.
44255 */
44256 for (i = 0; i < IDT_ENTRIES; i++)
44257 - default_idt_entries[i] += switcher_offset();
44258 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44259
44260 /*
44261 * Set up the Switcher's per-cpu areas.
44262 @@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44263 * it will be undisturbed when we switch. To change %cs and jump we
44264 * need this structure to feed to Intel's "lcall" instruction.
44265 */
44266 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44267 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44268 lguest_entry.segment = LGUEST_CS;
44269
44270 /*
44271 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44272 index 40634b0..4f5855e 100644
44273 --- a/drivers/lguest/x86/switcher_32.S
44274 +++ b/drivers/lguest/x86/switcher_32.S
44275 @@ -87,6 +87,7 @@
44276 #include <asm/page.h>
44277 #include <asm/segment.h>
44278 #include <asm/lguest.h>
44279 +#include <asm/processor-flags.h>
44280
44281 // We mark the start of the code to copy
44282 // It's placed in .text tho it's never run here
44283 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44284 // Changes type when we load it: damn Intel!
44285 // For after we switch over our page tables
44286 // That entry will be read-only: we'd crash.
44287 +
44288 +#ifdef CONFIG_PAX_KERNEXEC
44289 + mov %cr0, %edx
44290 + xor $X86_CR0_WP, %edx
44291 + mov %edx, %cr0
44292 +#endif
44293 +
44294 movl $(GDT_ENTRY_TSS*8), %edx
44295 ltr %dx
44296
44297 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44298 // Let's clear it again for our return.
44299 // The GDT descriptor of the Host
44300 // Points to the table after two "size" bytes
44301 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44302 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44303 // Clear "used" from type field (byte 5, bit 2)
44304 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44305 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44306 +
44307 +#ifdef CONFIG_PAX_KERNEXEC
44308 + mov %cr0, %eax
44309 + xor $X86_CR0_WP, %eax
44310 + mov %eax, %cr0
44311 +#endif
44312
44313 // Once our page table's switched, the Guest is live!
44314 // The Host fades as we run this final step.
44315 @@ -295,13 +309,12 @@ deliver_to_host:
44316 // I consulted gcc, and it gave
44317 // These instructions, which I gladly credit:
44318 leal (%edx,%ebx,8), %eax
44319 - movzwl (%eax),%edx
44320 - movl 4(%eax), %eax
44321 - xorw %ax, %ax
44322 - orl %eax, %edx
44323 + movl 4(%eax), %edx
44324 + movw (%eax), %dx
44325 // Now the address of the handler's in %edx
44326 // We call it now: its "iret" drops us home.
44327 - jmp *%edx
44328 + ljmp $__KERNEL_CS, $1f
44329 +1: jmp *%edx
44330
44331 // Every interrupt can come to us here
44332 // But we must truly tell each apart.
44333 diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44334 index a08e3ee..df8ade2 100644
44335 --- a/drivers/md/bcache/closure.h
44336 +++ b/drivers/md/bcache/closure.h
44337 @@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44338 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44339 struct workqueue_struct *wq)
44340 {
44341 - BUG_ON(object_is_on_stack(cl));
44342 + BUG_ON(object_starts_on_stack(cl));
44343 closure_set_ip(cl);
44344 cl->fn = fn;
44345 cl->wq = wq;
44346 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44347 index da3604e..7789cb4c 100644
44348 --- a/drivers/md/bitmap.c
44349 +++ b/drivers/md/bitmap.c
44350 @@ -1771,7 +1771,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44351 chunk_kb ? "KB" : "B");
44352 if (bitmap->storage.file) {
44353 seq_printf(seq, ", file: ");
44354 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44355 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44356 }
44357
44358 seq_printf(seq, "\n");
44359 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44360 index 0be9381..114262b 100644
44361 --- a/drivers/md/dm-ioctl.c
44362 +++ b/drivers/md/dm-ioctl.c
44363 @@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44364 cmd == DM_LIST_VERSIONS_CMD)
44365 return 0;
44366
44367 - if ((cmd == DM_DEV_CREATE_CMD)) {
44368 + if (cmd == DM_DEV_CREATE_CMD) {
44369 if (!*param->name) {
44370 DMWARN("name not supplied when creating device");
44371 return -EINVAL;
44372 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44373 index 7dfdb5c..4caada6 100644
44374 --- a/drivers/md/dm-raid1.c
44375 +++ b/drivers/md/dm-raid1.c
44376 @@ -40,7 +40,7 @@ enum dm_raid1_error {
44377
44378 struct mirror {
44379 struct mirror_set *ms;
44380 - atomic_t error_count;
44381 + atomic_unchecked_t error_count;
44382 unsigned long error_type;
44383 struct dm_dev *dev;
44384 sector_t offset;
44385 @@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44386 struct mirror *m;
44387
44388 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44389 - if (!atomic_read(&m->error_count))
44390 + if (!atomic_read_unchecked(&m->error_count))
44391 return m;
44392
44393 return NULL;
44394 @@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44395 * simple way to tell if a device has encountered
44396 * errors.
44397 */
44398 - atomic_inc(&m->error_count);
44399 + atomic_inc_unchecked(&m->error_count);
44400
44401 if (test_and_set_bit(error_type, &m->error_type))
44402 return;
44403 @@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44404 struct mirror *m = get_default_mirror(ms);
44405
44406 do {
44407 - if (likely(!atomic_read(&m->error_count)))
44408 + if (likely(!atomic_read_unchecked(&m->error_count)))
44409 return m;
44410
44411 if (m-- == ms->mirror)
44412 @@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44413 {
44414 struct mirror *default_mirror = get_default_mirror(m->ms);
44415
44416 - return !atomic_read(&default_mirror->error_count);
44417 + return !atomic_read_unchecked(&default_mirror->error_count);
44418 }
44419
44420 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44421 @@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44422 */
44423 if (likely(region_in_sync(ms, region, 1)))
44424 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44425 - else if (m && atomic_read(&m->error_count))
44426 + else if (m && atomic_read_unchecked(&m->error_count))
44427 m = NULL;
44428
44429 if (likely(m))
44430 @@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44431 }
44432
44433 ms->mirror[mirror].ms = ms;
44434 - atomic_set(&(ms->mirror[mirror].error_count), 0);
44435 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44436 ms->mirror[mirror].error_type = 0;
44437 ms->mirror[mirror].offset = offset;
44438
44439 @@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
44440 */
44441 static char device_status_char(struct mirror *m)
44442 {
44443 - if (!atomic_read(&(m->error_count)))
44444 + if (!atomic_read_unchecked(&(m->error_count)))
44445 return 'A';
44446
44447 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44448 diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44449 index 87f86c7..a1a4100 100644
44450 --- a/drivers/md/dm-stats.c
44451 +++ b/drivers/md/dm-stats.c
44452 @@ -382,7 +382,7 @@ do_sync_free:
44453 synchronize_rcu_expedited();
44454 dm_stat_free(&s->rcu_head);
44455 } else {
44456 - ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44457 + ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44458 call_rcu(&s->rcu_head, dm_stat_free);
44459 }
44460 return 0;
44461 @@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44462 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44463 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44464 ));
44465 - ACCESS_ONCE(last->last_sector) = end_sector;
44466 - ACCESS_ONCE(last->last_rw) = bi_rw;
44467 + ACCESS_ONCE_RW(last->last_sector) = end_sector;
44468 + ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44469 }
44470
44471 rcu_read_lock();
44472 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44473 index f8b37d4..5c5cafd 100644
44474 --- a/drivers/md/dm-stripe.c
44475 +++ b/drivers/md/dm-stripe.c
44476 @@ -21,7 +21,7 @@ struct stripe {
44477 struct dm_dev *dev;
44478 sector_t physical_start;
44479
44480 - atomic_t error_count;
44481 + atomic_unchecked_t error_count;
44482 };
44483
44484 struct stripe_c {
44485 @@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44486 kfree(sc);
44487 return r;
44488 }
44489 - atomic_set(&(sc->stripe[i].error_count), 0);
44490 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44491 }
44492
44493 ti->private = sc;
44494 @@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44495 DMEMIT("%d ", sc->stripes);
44496 for (i = 0; i < sc->stripes; i++) {
44497 DMEMIT("%s ", sc->stripe[i].dev->name);
44498 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44499 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44500 'D' : 'A';
44501 }
44502 buffer[i] = '\0';
44503 @@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44504 */
44505 for (i = 0; i < sc->stripes; i++)
44506 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44507 - atomic_inc(&(sc->stripe[i].error_count));
44508 - if (atomic_read(&(sc->stripe[i].error_count)) <
44509 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
44510 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44511 DM_IO_ERROR_THRESHOLD)
44512 schedule_work(&sc->trigger_event);
44513 }
44514 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44515 index b2bd1eb..38f7a44 100644
44516 --- a/drivers/md/dm-table.c
44517 +++ b/drivers/md/dm-table.c
44518 @@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44519 if (!dev_size)
44520 return 0;
44521
44522 - if ((start >= dev_size) || (start + len > dev_size)) {
44523 + if ((start >= dev_size) || (len > dev_size - start)) {
44524 DMWARN("%s: %s too small for target: "
44525 "start=%llu, len=%llu, dev_size=%llu",
44526 dm_device_name(ti->table->md), bdevname(bdev, b),
44527 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44528 index e9d33ad..dae9880d 100644
44529 --- a/drivers/md/dm-thin-metadata.c
44530 +++ b/drivers/md/dm-thin-metadata.c
44531 @@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44532 {
44533 pmd->info.tm = pmd->tm;
44534 pmd->info.levels = 2;
44535 - pmd->info.value_type.context = pmd->data_sm;
44536 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44537 pmd->info.value_type.size = sizeof(__le64);
44538 pmd->info.value_type.inc = data_block_inc;
44539 pmd->info.value_type.dec = data_block_dec;
44540 @@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44541
44542 pmd->bl_info.tm = pmd->tm;
44543 pmd->bl_info.levels = 1;
44544 - pmd->bl_info.value_type.context = pmd->data_sm;
44545 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44546 pmd->bl_info.value_type.size = sizeof(__le64);
44547 pmd->bl_info.value_type.inc = data_block_inc;
44548 pmd->bl_info.value_type.dec = data_block_dec;
44549 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44550 index 58f3927..bfbad3e 100644
44551 --- a/drivers/md/dm.c
44552 +++ b/drivers/md/dm.c
44553 @@ -183,9 +183,9 @@ struct mapped_device {
44554 /*
44555 * Event handling.
44556 */
44557 - atomic_t event_nr;
44558 + atomic_unchecked_t event_nr;
44559 wait_queue_head_t eventq;
44560 - atomic_t uevent_seq;
44561 + atomic_unchecked_t uevent_seq;
44562 struct list_head uevent_list;
44563 spinlock_t uevent_lock; /* Protect access to uevent_list */
44564
44565 @@ -2071,8 +2071,8 @@ static struct mapped_device *alloc_dev(int minor)
44566 spin_lock_init(&md->deferred_lock);
44567 atomic_set(&md->holders, 1);
44568 atomic_set(&md->open_count, 0);
44569 - atomic_set(&md->event_nr, 0);
44570 - atomic_set(&md->uevent_seq, 0);
44571 + atomic_set_unchecked(&md->event_nr, 0);
44572 + atomic_set_unchecked(&md->uevent_seq, 0);
44573 INIT_LIST_HEAD(&md->uevent_list);
44574 INIT_LIST_HEAD(&md->table_devices);
44575 spin_lock_init(&md->uevent_lock);
44576 @@ -2228,7 +2228,7 @@ static void event_callback(void *context)
44577
44578 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44579
44580 - atomic_inc(&md->event_nr);
44581 + atomic_inc_unchecked(&md->event_nr);
44582 wake_up(&md->eventq);
44583 }
44584
44585 @@ -2921,18 +2921,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44586
44587 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44588 {
44589 - return atomic_add_return(1, &md->uevent_seq);
44590 + return atomic_add_return_unchecked(1, &md->uevent_seq);
44591 }
44592
44593 uint32_t dm_get_event_nr(struct mapped_device *md)
44594 {
44595 - return atomic_read(&md->event_nr);
44596 + return atomic_read_unchecked(&md->event_nr);
44597 }
44598
44599 int dm_wait_event(struct mapped_device *md, int event_nr)
44600 {
44601 return wait_event_interruptible(md->eventq,
44602 - (event_nr != atomic_read(&md->event_nr)));
44603 + (event_nr != atomic_read_unchecked(&md->event_nr)));
44604 }
44605
44606 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44607 diff --git a/drivers/md/md.c b/drivers/md/md.c
44608 index 9233c71..ed5243a 100644
44609 --- a/drivers/md/md.c
44610 +++ b/drivers/md/md.c
44611 @@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44612 * start build, activate spare
44613 */
44614 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44615 -static atomic_t md_event_count;
44616 +static atomic_unchecked_t md_event_count;
44617 void md_new_event(struct mddev *mddev)
44618 {
44619 - atomic_inc(&md_event_count);
44620 + atomic_inc_unchecked(&md_event_count);
44621 wake_up(&md_event_waiters);
44622 }
44623 EXPORT_SYMBOL_GPL(md_new_event);
44624 @@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44625 */
44626 static void md_new_event_inintr(struct mddev *mddev)
44627 {
44628 - atomic_inc(&md_event_count);
44629 + atomic_inc_unchecked(&md_event_count);
44630 wake_up(&md_event_waiters);
44631 }
44632
44633 @@ -1426,7 +1426,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44634 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44635 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44636 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44637 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44638 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44639
44640 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44641 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44642 @@ -1677,7 +1677,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44643 else
44644 sb->resync_offset = cpu_to_le64(0);
44645
44646 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44647 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44648
44649 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44650 sb->size = cpu_to_le64(mddev->dev_sectors);
44651 @@ -2547,7 +2547,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44652 static ssize_t
44653 errors_show(struct md_rdev *rdev, char *page)
44654 {
44655 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44656 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44657 }
44658
44659 static ssize_t
44660 @@ -2556,7 +2556,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44661 char *e;
44662 unsigned long n = simple_strtoul(buf, &e, 10);
44663 if (*buf && (*e == 0 || *e == '\n')) {
44664 - atomic_set(&rdev->corrected_errors, n);
44665 + atomic_set_unchecked(&rdev->corrected_errors, n);
44666 return len;
44667 }
44668 return -EINVAL;
44669 @@ -3000,8 +3000,8 @@ int md_rdev_init(struct md_rdev *rdev)
44670 rdev->sb_loaded = 0;
44671 rdev->bb_page = NULL;
44672 atomic_set(&rdev->nr_pending, 0);
44673 - atomic_set(&rdev->read_errors, 0);
44674 - atomic_set(&rdev->corrected_errors, 0);
44675 + atomic_set_unchecked(&rdev->read_errors, 0);
44676 + atomic_set_unchecked(&rdev->corrected_errors, 0);
44677
44678 INIT_LIST_HEAD(&rdev->same_set);
44679 init_waitqueue_head(&rdev->blocked_wait);
44680 @@ -6855,7 +6855,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44681
44682 spin_unlock(&pers_lock);
44683 seq_printf(seq, "\n");
44684 - seq->poll_event = atomic_read(&md_event_count);
44685 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44686 return 0;
44687 }
44688 if (v == (void*)2) {
44689 @@ -6958,7 +6958,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44690 return error;
44691
44692 seq = file->private_data;
44693 - seq->poll_event = atomic_read(&md_event_count);
44694 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44695 return error;
44696 }
44697
44698 @@ -6975,7 +6975,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44699 /* always allow read */
44700 mask = POLLIN | POLLRDNORM;
44701
44702 - if (seq->poll_event != atomic_read(&md_event_count))
44703 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44704 mask |= POLLERR | POLLPRI;
44705 return mask;
44706 }
44707 @@ -7022,7 +7022,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44708 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44709 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44710 (int)part_stat_read(&disk->part0, sectors[1]) -
44711 - atomic_read(&disk->sync_io);
44712 + atomic_read_unchecked(&disk->sync_io);
44713 /* sync IO will cause sync_io to increase before the disk_stats
44714 * as sync_io is counted when a request starts, and
44715 * disk_stats is counted when it completes.
44716 diff --git a/drivers/md/md.h b/drivers/md/md.h
44717 index 03cec5b..0a658c1 100644
44718 --- a/drivers/md/md.h
44719 +++ b/drivers/md/md.h
44720 @@ -94,13 +94,13 @@ struct md_rdev {
44721 * only maintained for arrays that
44722 * support hot removal
44723 */
44724 - atomic_t read_errors; /* number of consecutive read errors that
44725 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
44726 * we have tried to ignore.
44727 */
44728 struct timespec last_read_error; /* monotonic time since our
44729 * last read error
44730 */
44731 - atomic_t corrected_errors; /* number of corrected read errors,
44732 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44733 * for reporting to userspace and storing
44734 * in superblock.
44735 */
44736 @@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44737
44738 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44739 {
44740 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44741 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44742 }
44743
44744 struct md_personality
44745 diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44746 index 786b689..ea8c956 100644
44747 --- a/drivers/md/persistent-data/dm-space-map-metadata.c
44748 +++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44749 @@ -679,7 +679,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44750 * Flick into a mode where all blocks get allocated in the new area.
44751 */
44752 smm->begin = old_len;
44753 - memcpy(sm, &bootstrap_ops, sizeof(*sm));
44754 + memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44755
44756 /*
44757 * Extend.
44758 @@ -710,7 +710,7 @@ out:
44759 /*
44760 * Switch back to normal behaviour.
44761 */
44762 - memcpy(sm, &ops, sizeof(*sm));
44763 + memcpy((void *)sm, &ops, sizeof(*sm));
44764 return r;
44765 }
44766
44767 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44768 index 3e6d115..ffecdeb 100644
44769 --- a/drivers/md/persistent-data/dm-space-map.h
44770 +++ b/drivers/md/persistent-data/dm-space-map.h
44771 @@ -71,6 +71,7 @@ struct dm_space_map {
44772 dm_sm_threshold_fn fn,
44773 void *context);
44774 };
44775 +typedef struct dm_space_map __no_const dm_space_map_no_const;
44776
44777 /*----------------------------------------------------------------*/
44778
44779 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44780 index 40b35be..a327e11 100644
44781 --- a/drivers/md/raid1.c
44782 +++ b/drivers/md/raid1.c
44783 @@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44784 if (r1_sync_page_io(rdev, sect, s,
44785 bio->bi_io_vec[idx].bv_page,
44786 READ) != 0)
44787 - atomic_add(s, &rdev->corrected_errors);
44788 + atomic_add_unchecked(s, &rdev->corrected_errors);
44789 }
44790 sectors -= s;
44791 sect += s;
44792 @@ -2164,7 +2164,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44793 !test_bit(Faulty, &rdev->flags)) {
44794 if (r1_sync_page_io(rdev, sect, s,
44795 conf->tmppage, READ)) {
44796 - atomic_add(s, &rdev->corrected_errors);
44797 + atomic_add_unchecked(s, &rdev->corrected_errors);
44798 printk(KERN_INFO
44799 "md/raid1:%s: read error corrected "
44800 "(%d sectors at %llu on %s)\n",
44801 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44802 index 32e282f..5cec803 100644
44803 --- a/drivers/md/raid10.c
44804 +++ b/drivers/md/raid10.c
44805 @@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44806 /* The write handler will notice the lack of
44807 * R10BIO_Uptodate and record any errors etc
44808 */
44809 - atomic_add(r10_bio->sectors,
44810 + atomic_add_unchecked(r10_bio->sectors,
44811 &conf->mirrors[d].rdev->corrected_errors);
44812
44813 /* for reconstruct, we always reschedule after a read.
44814 @@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44815 {
44816 struct timespec cur_time_mon;
44817 unsigned long hours_since_last;
44818 - unsigned int read_errors = atomic_read(&rdev->read_errors);
44819 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44820
44821 ktime_get_ts(&cur_time_mon);
44822
44823 @@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44824 * overflowing the shift of read_errors by hours_since_last.
44825 */
44826 if (hours_since_last >= 8 * sizeof(read_errors))
44827 - atomic_set(&rdev->read_errors, 0);
44828 + atomic_set_unchecked(&rdev->read_errors, 0);
44829 else
44830 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44831 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44832 }
44833
44834 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44835 @@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44836 return;
44837
44838 check_decay_read_errors(mddev, rdev);
44839 - atomic_inc(&rdev->read_errors);
44840 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
44841 + atomic_inc_unchecked(&rdev->read_errors);
44842 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44843 char b[BDEVNAME_SIZE];
44844 bdevname(rdev->bdev, b);
44845
44846 @@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44847 "md/raid10:%s: %s: Raid device exceeded "
44848 "read_error threshold [cur %d:max %d]\n",
44849 mdname(mddev), b,
44850 - atomic_read(&rdev->read_errors), max_read_errors);
44851 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44852 printk(KERN_NOTICE
44853 "md/raid10:%s: %s: Failing raid device\n",
44854 mdname(mddev), b);
44855 @@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44856 sect +
44857 choose_data_offset(r10_bio, rdev)),
44858 bdevname(rdev->bdev, b));
44859 - atomic_add(s, &rdev->corrected_errors);
44860 + atomic_add_unchecked(s, &rdev->corrected_errors);
44861 }
44862
44863 rdev_dec_pending(rdev, mddev);
44864 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44865 index 9c66e59..42a8eac 100644
44866 --- a/drivers/md/raid5.c
44867 +++ b/drivers/md/raid5.c
44868 @@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44869 return 1;
44870 }
44871
44872 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44873 +static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44874 +#endif
44875 +
44876 static int grow_stripes(struct r5conf *conf, int num)
44877 {
44878 struct kmem_cache *sc;
44879 @@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44880 "raid%d-%s", conf->level, mdname(conf->mddev));
44881 else
44882 sprintf(conf->cache_name[0],
44883 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44884 + "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44885 +#else
44886 "raid%d-%p", conf->level, conf->mddev);
44887 +#endif
44888 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44889
44890 conf->active_name = 0;
44891 @@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44892 mdname(conf->mddev), STRIPE_SECTORS,
44893 (unsigned long long)s,
44894 bdevname(rdev->bdev, b));
44895 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44896 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44897 clear_bit(R5_ReadError, &sh->dev[i].flags);
44898 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44899 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44900 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44901
44902 - if (atomic_read(&rdev->read_errors))
44903 - atomic_set(&rdev->read_errors, 0);
44904 + if (atomic_read_unchecked(&rdev->read_errors))
44905 + atomic_set_unchecked(&rdev->read_errors, 0);
44906 } else {
44907 const char *bdn = bdevname(rdev->bdev, b);
44908 int retry = 0;
44909 int set_bad = 0;
44910
44911 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44912 - atomic_inc(&rdev->read_errors);
44913 + atomic_inc_unchecked(&rdev->read_errors);
44914 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44915 printk_ratelimited(
44916 KERN_WARNING
44917 @@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44918 mdname(conf->mddev),
44919 (unsigned long long)s,
44920 bdn);
44921 - } else if (atomic_read(&rdev->read_errors)
44922 + } else if (atomic_read_unchecked(&rdev->read_errors)
44923 > conf->max_nr_stripes)
44924 printk(KERN_WARNING
44925 "md/raid:%s: Too many read errors, failing device %s.\n",
44926 diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44927 index 983db75..ef9248c 100644
44928 --- a/drivers/media/dvb-core/dvbdev.c
44929 +++ b/drivers/media/dvb-core/dvbdev.c
44930 @@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44931 const struct dvb_device *template, void *priv, int type)
44932 {
44933 struct dvb_device *dvbdev;
44934 - struct file_operations *dvbdevfops;
44935 + file_operations_no_const *dvbdevfops;
44936 struct device *clsdev;
44937 int minor;
44938 int id;
44939 diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44940 index 6ad22b6..6e90e2a 100644
44941 --- a/drivers/media/dvb-frontends/af9033.h
44942 +++ b/drivers/media/dvb-frontends/af9033.h
44943 @@ -96,6 +96,6 @@ struct af9033_ops {
44944 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44945 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44946 int onoff);
44947 -};
44948 +} __no_const;
44949
44950 #endif /* AF9033_H */
44951 diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44952 index 9b6c3bb..baeb5c7 100644
44953 --- a/drivers/media/dvb-frontends/dib3000.h
44954 +++ b/drivers/media/dvb-frontends/dib3000.h
44955 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44956 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44957 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44958 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44959 -};
44960 +} __no_const;
44961
44962 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44963 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44964 diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
44965 index 1fea0e9..321ce8f 100644
44966 --- a/drivers/media/dvb-frontends/dib7000p.h
44967 +++ b/drivers/media/dvb-frontends/dib7000p.h
44968 @@ -64,7 +64,7 @@ struct dib7000p_ops {
44969 int (*get_adc_power)(struct dvb_frontend *fe);
44970 int (*slave_reset)(struct dvb_frontend *fe);
44971 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
44972 -};
44973 +} __no_const;
44974
44975 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
44976 void *dib7000p_attach(struct dib7000p_ops *ops);
44977 diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
44978 index 84cc103..5780c54 100644
44979 --- a/drivers/media/dvb-frontends/dib8000.h
44980 +++ b/drivers/media/dvb-frontends/dib8000.h
44981 @@ -61,7 +61,7 @@ struct dib8000_ops {
44982 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
44983 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
44984 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
44985 -};
44986 +} __no_const;
44987
44988 #if IS_ENABLED(CONFIG_DVB_DIB8000)
44989 void *dib8000_attach(struct dib8000_ops *ops);
44990 diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44991 index ce27e6d..b70435a 100644
44992 --- a/drivers/media/pci/cx88/cx88-video.c
44993 +++ b/drivers/media/pci/cx88/cx88-video.c
44994 @@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
44995
44996 /* ------------------------------------------------------------------ */
44997
44998 -static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44999 -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45000 -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45001 +static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45002 +static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45003 +static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45004
45005 module_param_array(video_nr, int, NULL, 0444);
45006 module_param_array(vbi_nr, int, NULL, 0444);
45007 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45008 index 802642d..5534900 100644
45009 --- a/drivers/media/pci/ivtv/ivtv-driver.c
45010 +++ b/drivers/media/pci/ivtv/ivtv-driver.c
45011 @@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45012 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45013
45014 /* ivtv instance counter */
45015 -static atomic_t ivtv_instance = ATOMIC_INIT(0);
45016 +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45017
45018 /* Parameter declarations */
45019 static int cardtype[IVTV_MAX_CARDS];
45020 diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45021 index 8cbe6b4..ea3601c 100644
45022 --- a/drivers/media/pci/solo6x10/solo6x10-core.c
45023 +++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45024 @@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45025
45026 static int solo_sysfs_init(struct solo_dev *solo_dev)
45027 {
45028 - struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45029 + bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45030 struct device *dev = &solo_dev->dev;
45031 const char *driver;
45032 int i;
45033 diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45034 index c7141f2..5301fec 100644
45035 --- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45036 +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45037 @@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45038
45039 int solo_g723_init(struct solo_dev *solo_dev)
45040 {
45041 - static struct snd_device_ops ops = { NULL };
45042 + static struct snd_device_ops ops = { };
45043 struct snd_card *card;
45044 struct snd_kcontrol_new kctl;
45045 char name[32];
45046 diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45047 index 8c84846..27b4f83 100644
45048 --- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45049 +++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45050 @@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45051
45052 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45053 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45054 - p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45055 + p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45056 if (p2m_id < 0)
45057 p2m_id = -p2m_id;
45058 }
45059 diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45060 index 72017b7..dd37ae6 100644
45061 --- a/drivers/media/pci/solo6x10/solo6x10.h
45062 +++ b/drivers/media/pci/solo6x10/solo6x10.h
45063 @@ -219,7 +219,7 @@ struct solo_dev {
45064
45065 /* P2M DMA Engine */
45066 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45067 - atomic_t p2m_count;
45068 + atomic_unchecked_t p2m_count;
45069 int p2m_jiffies;
45070 unsigned int p2m_timeouts;
45071
45072 diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45073 index 63f0b64..a017c1c 100644
45074 --- a/drivers/media/pci/tw68/tw68-core.c
45075 +++ b/drivers/media/pci/tw68/tw68-core.c
45076 @@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45077 module_param_array(card, int, NULL, 0444);
45078 MODULE_PARM_DESC(card, "card type");
45079
45080 -static atomic_t tw68_instance = ATOMIC_INIT(0);
45081 +static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45082
45083 /* ------------------------------------------------------------------ */
45084
45085 diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45086 index 64ab6fb..ef4a8b9 100644
45087 --- a/drivers/media/platform/omap/omap_vout.c
45088 +++ b/drivers/media/platform/omap/omap_vout.c
45089 @@ -63,7 +63,6 @@ enum omap_vout_channels {
45090 OMAP_VIDEO2,
45091 };
45092
45093 -static struct videobuf_queue_ops video_vbq_ops;
45094 /* Variables configurable through module params*/
45095 static u32 video1_numbuffers = 3;
45096 static u32 video2_numbuffers = 3;
45097 @@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45098 {
45099 struct videobuf_queue *q;
45100 struct omap_vout_device *vout = NULL;
45101 + static struct videobuf_queue_ops video_vbq_ops = {
45102 + .buf_setup = omap_vout_buffer_setup,
45103 + .buf_prepare = omap_vout_buffer_prepare,
45104 + .buf_release = omap_vout_buffer_release,
45105 + .buf_queue = omap_vout_buffer_queue,
45106 + };
45107
45108 vout = video_drvdata(file);
45109 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45110 @@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45111 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45112
45113 q = &vout->vbq;
45114 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45115 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45116 - video_vbq_ops.buf_release = omap_vout_buffer_release;
45117 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45118 spin_lock_init(&vout->vbq_lock);
45119
45120 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45121 diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45122 index fb2acc5..a2fcbdc4 100644
45123 --- a/drivers/media/platform/s5p-tv/mixer.h
45124 +++ b/drivers/media/platform/s5p-tv/mixer.h
45125 @@ -156,7 +156,7 @@ struct mxr_layer {
45126 /** layer index (unique identifier) */
45127 int idx;
45128 /** callbacks for layer methods */
45129 - struct mxr_layer_ops ops;
45130 + struct mxr_layer_ops *ops;
45131 /** format array */
45132 const struct mxr_format **fmt_array;
45133 /** size of format array */
45134 diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45135 index 74344c7..a39e70e 100644
45136 --- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45137 +++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45138 @@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45139 {
45140 struct mxr_layer *layer;
45141 int ret;
45142 - struct mxr_layer_ops ops = {
45143 + static struct mxr_layer_ops ops = {
45144 .release = mxr_graph_layer_release,
45145 .buffer_set = mxr_graph_buffer_set,
45146 .stream_set = mxr_graph_stream_set,
45147 diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45148 index b713403..53cb5ad 100644
45149 --- a/drivers/media/platform/s5p-tv/mixer_reg.c
45150 +++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45151 @@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45152 layer->update_buf = next;
45153 }
45154
45155 - layer->ops.buffer_set(layer, layer->update_buf);
45156 + layer->ops->buffer_set(layer, layer->update_buf);
45157
45158 if (done && done != layer->shadow_buf)
45159 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45160 diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45161 index b4d2696..91df48e 100644
45162 --- a/drivers/media/platform/s5p-tv/mixer_video.c
45163 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
45164 @@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45165 layer->geo.src.height = layer->geo.src.full_height;
45166
45167 mxr_geometry_dump(mdev, &layer->geo);
45168 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45169 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45170 mxr_geometry_dump(mdev, &layer->geo);
45171 }
45172
45173 @@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45174 layer->geo.dst.full_width = mbus_fmt.width;
45175 layer->geo.dst.full_height = mbus_fmt.height;
45176 layer->geo.dst.field = mbus_fmt.field;
45177 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45178 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45179
45180 mxr_geometry_dump(mdev, &layer->geo);
45181 }
45182 @@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45183 /* set source size to highest accepted value */
45184 geo->src.full_width = max(geo->dst.full_width, pix->width);
45185 geo->src.full_height = max(geo->dst.full_height, pix->height);
45186 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45187 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45188 mxr_geometry_dump(mdev, &layer->geo);
45189 /* set cropping to total visible screen */
45190 geo->src.width = pix->width;
45191 @@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45192 geo->src.x_offset = 0;
45193 geo->src.y_offset = 0;
45194 /* assure consistency of geometry */
45195 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45196 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45197 mxr_geometry_dump(mdev, &layer->geo);
45198 /* set full size to lowest possible value */
45199 geo->src.full_width = 0;
45200 geo->src.full_height = 0;
45201 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45202 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45203 mxr_geometry_dump(mdev, &layer->geo);
45204
45205 /* returning results */
45206 @@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45207 target->width = s->r.width;
45208 target->height = s->r.height;
45209
45210 - layer->ops.fix_geometry(layer, stage, s->flags);
45211 + layer->ops->fix_geometry(layer, stage, s->flags);
45212
45213 /* retrieve update selection rectangle */
45214 res.left = target->x_offset;
45215 @@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45216 mxr_output_get(mdev);
45217
45218 mxr_layer_update_output(layer);
45219 - layer->ops.format_set(layer);
45220 + layer->ops->format_set(layer);
45221 /* enabling layer in hardware */
45222 spin_lock_irqsave(&layer->enq_slock, flags);
45223 layer->state = MXR_LAYER_STREAMING;
45224 spin_unlock_irqrestore(&layer->enq_slock, flags);
45225
45226 - layer->ops.stream_set(layer, MXR_ENABLE);
45227 + layer->ops->stream_set(layer, MXR_ENABLE);
45228 mxr_streamer_get(mdev);
45229
45230 return 0;
45231 @@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45232 spin_unlock_irqrestore(&layer->enq_slock, flags);
45233
45234 /* disabling layer in hardware */
45235 - layer->ops.stream_set(layer, MXR_DISABLE);
45236 + layer->ops->stream_set(layer, MXR_DISABLE);
45237 /* remove one streamer */
45238 mxr_streamer_put(mdev);
45239 /* allow changes in output configuration */
45240 @@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45241
45242 void mxr_layer_release(struct mxr_layer *layer)
45243 {
45244 - if (layer->ops.release)
45245 - layer->ops.release(layer);
45246 + if (layer->ops->release)
45247 + layer->ops->release(layer);
45248 }
45249
45250 void mxr_base_layer_release(struct mxr_layer *layer)
45251 @@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45252
45253 layer->mdev = mdev;
45254 layer->idx = idx;
45255 - layer->ops = *ops;
45256 + layer->ops = ops;
45257
45258 spin_lock_init(&layer->enq_slock);
45259 INIT_LIST_HEAD(&layer->enq_list);
45260 diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45261 index c9388c4..ce71ece 100644
45262 --- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45263 +++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45264 @@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45265 {
45266 struct mxr_layer *layer;
45267 int ret;
45268 - struct mxr_layer_ops ops = {
45269 + static struct mxr_layer_ops ops = {
45270 .release = mxr_vp_layer_release,
45271 .buffer_set = mxr_vp_buffer_set,
45272 .stream_set = mxr_vp_stream_set,
45273 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45274 index 82affae..42833ec 100644
45275 --- a/drivers/media/radio/radio-cadet.c
45276 +++ b/drivers/media/radio/radio-cadet.c
45277 @@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45278 unsigned char readbuf[RDS_BUFFER];
45279 int i = 0;
45280
45281 + if (count > RDS_BUFFER)
45282 + return -EFAULT;
45283 mutex_lock(&dev->lock);
45284 if (dev->rdsstat == 0)
45285 cadet_start_rds(dev);
45286 @@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45287 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45288 mutex_unlock(&dev->lock);
45289
45290 - if (i && copy_to_user(data, readbuf, i))
45291 - return -EFAULT;
45292 + if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45293 + i = -EFAULT;
45294 +
45295 return i;
45296 }
45297
45298 diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45299 index 5236035..c622c74 100644
45300 --- a/drivers/media/radio/radio-maxiradio.c
45301 +++ b/drivers/media/radio/radio-maxiradio.c
45302 @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45303 /* TEA5757 pin mappings */
45304 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45305
45306 -static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45307 +static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45308
45309 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45310 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45311 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45312 index 050b3bb..79f62b9 100644
45313 --- a/drivers/media/radio/radio-shark.c
45314 +++ b/drivers/media/radio/radio-shark.c
45315 @@ -79,7 +79,7 @@ struct shark_device {
45316 u32 last_val;
45317 };
45318
45319 -static atomic_t shark_instance = ATOMIC_INIT(0);
45320 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45321
45322 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45323 {
45324 diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45325 index 8654e0d..0608a64 100644
45326 --- a/drivers/media/radio/radio-shark2.c
45327 +++ b/drivers/media/radio/radio-shark2.c
45328 @@ -74,7 +74,7 @@ struct shark_device {
45329 u8 *transfer_buffer;
45330 };
45331
45332 -static atomic_t shark_instance = ATOMIC_INIT(0);
45333 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45334
45335 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45336 {
45337 diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45338 index 633022b..7f10754 100644
45339 --- a/drivers/media/radio/radio-si476x.c
45340 +++ b/drivers/media/radio/radio-si476x.c
45341 @@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45342 struct si476x_radio *radio;
45343 struct v4l2_ctrl *ctrl;
45344
45345 - static atomic_t instance = ATOMIC_INIT(0);
45346 + static atomic_unchecked_t instance = ATOMIC_INIT(0);
45347
45348 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45349 if (!radio)
45350 diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45351 index 9fd1527..8927230 100644
45352 --- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45353 +++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45354 @@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45355
45356 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45357 {
45358 - char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45359 - char result[64];
45360 - return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45361 - sizeof(result), 0);
45362 + char *buf;
45363 + char *result;
45364 + int retval;
45365 +
45366 + buf = kmalloc(2, GFP_KERNEL);
45367 + if (buf == NULL)
45368 + return -ENOMEM;
45369 + result = kmalloc(64, GFP_KERNEL);
45370 + if (result == NULL) {
45371 + kfree(buf);
45372 + return -ENOMEM;
45373 + }
45374 +
45375 + buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45376 + buf[1] = enable ? 1 : 0;
45377 +
45378 + retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45379 +
45380 + kfree(buf);
45381 + kfree(result);
45382 + return retval;
45383 }
45384
45385 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45386 {
45387 - char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45388 - char state[3];
45389 - return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45390 + char *buf;
45391 + char *state;
45392 + int retval;
45393 +
45394 + buf = kmalloc(2, GFP_KERNEL);
45395 + if (buf == NULL)
45396 + return -ENOMEM;
45397 + state = kmalloc(3, GFP_KERNEL);
45398 + if (state == NULL) {
45399 + kfree(buf);
45400 + return -ENOMEM;
45401 + }
45402 +
45403 + buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45404 + buf[1] = enable ? 1 : 0;
45405 +
45406 + retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45407 +
45408 + kfree(buf);
45409 + kfree(state);
45410 + return retval;
45411 }
45412
45413 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45414 {
45415 - char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45416 - char state[3];
45417 + char *query;
45418 + char *state;
45419 int ret;
45420 + query = kmalloc(1, GFP_KERNEL);
45421 + if (query == NULL)
45422 + return -ENOMEM;
45423 + state = kmalloc(3, GFP_KERNEL);
45424 + if (state == NULL) {
45425 + kfree(query);
45426 + return -ENOMEM;
45427 + }
45428 +
45429 + query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45430
45431 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45432
45433 - ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45434 - sizeof(state), 0);
45435 + ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45436 if (ret < 0) {
45437 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45438 "state info\n");
45439 @@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45440
45441 /* Copy this pointer as we are gonna need it in the release phase */
45442 cinergyt2_usb_device = adap->dev;
45443 -
45444 + kfree(query);
45445 + kfree(state);
45446 return 0;
45447 }
45448
45449 @@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45450 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45451 {
45452 struct cinergyt2_state *st = d->priv;
45453 - u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45454 + u8 *key, *cmd;
45455 int i;
45456
45457 + cmd = kmalloc(1, GFP_KERNEL);
45458 + if (cmd == NULL)
45459 + return -EINVAL;
45460 + key = kzalloc(5, GFP_KERNEL);
45461 + if (key == NULL) {
45462 + kfree(cmd);
45463 + return -EINVAL;
45464 + }
45465 +
45466 + cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45467 +
45468 *state = REMOTE_NO_KEY_PRESSED;
45469
45470 - dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45471 + dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45472 if (key[4] == 0xff) {
45473 /* key repeat */
45474 st->rc_counter++;
45475 @@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45476 *event = d->last_event;
45477 deb_rc("repeat key, event %x\n",
45478 *event);
45479 - return 0;
45480 + goto out;
45481 }
45482 }
45483 deb_rc("repeated key (non repeatable)\n");
45484 }
45485 - return 0;
45486 + goto out;
45487 }
45488
45489 /* hack to pass checksum on the custom field */
45490 @@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45491
45492 deb_rc("key: %*ph\n", 5, key);
45493 }
45494 +out:
45495 + kfree(cmd);
45496 + kfree(key);
45497 return 0;
45498 }
45499
45500 diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45501 index c890fe4..f9b2ae6 100644
45502 --- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45503 +++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45504 @@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45505 fe_status_t *status)
45506 {
45507 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45508 - struct dvbt_get_status_msg result;
45509 - u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45510 + struct dvbt_get_status_msg *result;
45511 + u8 *cmd;
45512 int ret;
45513
45514 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45515 - sizeof(result), 0);
45516 + cmd = kmalloc(1, GFP_KERNEL);
45517 + if (cmd == NULL)
45518 + return -ENOMEM;
45519 + result = kmalloc(sizeof(*result), GFP_KERNEL);
45520 + if (result == NULL) {
45521 + kfree(cmd);
45522 + return -ENOMEM;
45523 + }
45524 +
45525 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45526 +
45527 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45528 + sizeof(*result), 0);
45529 if (ret < 0)
45530 - return ret;
45531 + goto out;
45532
45533 *status = 0;
45534
45535 - if (0xffff - le16_to_cpu(result.gain) > 30)
45536 + if (0xffff - le16_to_cpu(result->gain) > 30)
45537 *status |= FE_HAS_SIGNAL;
45538 - if (result.lock_bits & (1 << 6))
45539 + if (result->lock_bits & (1 << 6))
45540 *status |= FE_HAS_LOCK;
45541 - if (result.lock_bits & (1 << 5))
45542 + if (result->lock_bits & (1 << 5))
45543 *status |= FE_HAS_SYNC;
45544 - if (result.lock_bits & (1 << 4))
45545 + if (result->lock_bits & (1 << 4))
45546 *status |= FE_HAS_CARRIER;
45547 - if (result.lock_bits & (1 << 1))
45548 + if (result->lock_bits & (1 << 1))
45549 *status |= FE_HAS_VITERBI;
45550
45551 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45552 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45553 *status &= ~FE_HAS_LOCK;
45554
45555 - return 0;
45556 +out:
45557 + kfree(cmd);
45558 + kfree(result);
45559 + return ret;
45560 }
45561
45562 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45563 {
45564 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45565 - struct dvbt_get_status_msg status;
45566 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45567 + struct dvbt_get_status_msg *status;
45568 + char *cmd;
45569 int ret;
45570
45571 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45572 - sizeof(status), 0);
45573 + cmd = kmalloc(1, GFP_KERNEL);
45574 + if (cmd == NULL)
45575 + return -ENOMEM;
45576 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45577 + if (status == NULL) {
45578 + kfree(cmd);
45579 + return -ENOMEM;
45580 + }
45581 +
45582 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45583 +
45584 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45585 + sizeof(*status), 0);
45586 if (ret < 0)
45587 - return ret;
45588 + goto out;
45589
45590 - *ber = le32_to_cpu(status.viterbi_error_rate);
45591 + *ber = le32_to_cpu(status->viterbi_error_rate);
45592 +out:
45593 + kfree(cmd);
45594 + kfree(status);
45595 return 0;
45596 }
45597
45598 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45599 {
45600 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45601 - struct dvbt_get_status_msg status;
45602 - u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45603 + struct dvbt_get_status_msg *status;
45604 + u8 *cmd;
45605 int ret;
45606
45607 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45608 - sizeof(status), 0);
45609 + cmd = kmalloc(1, GFP_KERNEL);
45610 + if (cmd == NULL)
45611 + return -ENOMEM;
45612 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45613 + if (status == NULL) {
45614 + kfree(cmd);
45615 + return -ENOMEM;
45616 + }
45617 +
45618 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45619 +
45620 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45621 + sizeof(*status), 0);
45622 if (ret < 0) {
45623 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45624 ret);
45625 - return ret;
45626 + goto out;
45627 }
45628 - *unc = le32_to_cpu(status.uncorrected_block_count);
45629 - return 0;
45630 + *unc = le32_to_cpu(status->uncorrected_block_count);
45631 +
45632 +out:
45633 + kfree(cmd);
45634 + kfree(status);
45635 + return ret;
45636 }
45637
45638 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45639 u16 *strength)
45640 {
45641 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45642 - struct dvbt_get_status_msg status;
45643 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45644 + struct dvbt_get_status_msg *status;
45645 + char *cmd;
45646 int ret;
45647
45648 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45649 - sizeof(status), 0);
45650 + cmd = kmalloc(1, GFP_KERNEL);
45651 + if (cmd == NULL)
45652 + return -ENOMEM;
45653 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45654 + if (status == NULL) {
45655 + kfree(cmd);
45656 + return -ENOMEM;
45657 + }
45658 +
45659 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45660 +
45661 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45662 + sizeof(*status), 0);
45663 if (ret < 0) {
45664 err("cinergyt2_fe_read_signal_strength() Failed!"
45665 " (Error=%d)\n", ret);
45666 - return ret;
45667 + goto out;
45668 }
45669 - *strength = (0xffff - le16_to_cpu(status.gain));
45670 + *strength = (0xffff - le16_to_cpu(status->gain));
45671 +
45672 +out:
45673 + kfree(cmd);
45674 + kfree(status);
45675 return 0;
45676 }
45677
45678 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45679 {
45680 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45681 - struct dvbt_get_status_msg status;
45682 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45683 + struct dvbt_get_status_msg *status;
45684 + char *cmd;
45685 int ret;
45686
45687 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45688 - sizeof(status), 0);
45689 + cmd = kmalloc(1, GFP_KERNEL);
45690 + if (cmd == NULL)
45691 + return -ENOMEM;
45692 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45693 + if (status == NULL) {
45694 + kfree(cmd);
45695 + return -ENOMEM;
45696 + }
45697 +
45698 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45699 +
45700 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45701 + sizeof(*status), 0);
45702 if (ret < 0) {
45703 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45704 - return ret;
45705 + goto out;
45706 }
45707 - *snr = (status.snr << 8) | status.snr;
45708 - return 0;
45709 + *snr = (status->snr << 8) | status->snr;
45710 +
45711 +out:
45712 + kfree(cmd);
45713 + kfree(status);
45714 + return ret;
45715 }
45716
45717 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45718 @@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45719 {
45720 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45721 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45722 - struct dvbt_set_parameters_msg param;
45723 - char result[2];
45724 + struct dvbt_set_parameters_msg *param;
45725 + char *result;
45726 int err;
45727
45728 - param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45729 - param.tps = cpu_to_le16(compute_tps(fep));
45730 - param.freq = cpu_to_le32(fep->frequency / 1000);
45731 - param.flags = 0;
45732 + result = kmalloc(2, GFP_KERNEL);
45733 + if (result == NULL)
45734 + return -ENOMEM;
45735 + param = kmalloc(sizeof(*param), GFP_KERNEL);
45736 + if (param == NULL) {
45737 + kfree(result);
45738 + return -ENOMEM;
45739 + }
45740 +
45741 + param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45742 + param->tps = cpu_to_le16(compute_tps(fep));
45743 + param->freq = cpu_to_le32(fep->frequency / 1000);
45744 + param->flags = 0;
45745
45746 switch (fep->bandwidth_hz) {
45747 default:
45748 case 8000000:
45749 - param.bandwidth = 8;
45750 + param->bandwidth = 8;
45751 break;
45752 case 7000000:
45753 - param.bandwidth = 7;
45754 + param->bandwidth = 7;
45755 break;
45756 case 6000000:
45757 - param.bandwidth = 6;
45758 + param->bandwidth = 6;
45759 break;
45760 }
45761
45762 err = dvb_usb_generic_rw(state->d,
45763 - (char *)&param, sizeof(param),
45764 - result, sizeof(result), 0);
45765 + (char *)param, sizeof(*param),
45766 + result, 2, 0);
45767 if (err < 0)
45768 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45769
45770 - return (err < 0) ? err : 0;
45771 + kfree(result);
45772 + kfree(param);
45773 + return err;
45774 }
45775
45776 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45777 diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45778 index 733a7ff..f8b52e3 100644
45779 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45780 +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45781 @@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45782
45783 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45784 {
45785 - struct hexline hx;
45786 - u8 reset;
45787 + struct hexline *hx;
45788 + u8 *reset;
45789 int ret,pos=0;
45790
45791 + reset = kmalloc(1, GFP_KERNEL);
45792 + if (reset == NULL)
45793 + return -ENOMEM;
45794 +
45795 + hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45796 + if (hx == NULL) {
45797 + kfree(reset);
45798 + return -ENOMEM;
45799 + }
45800 +
45801 /* stop the CPU */
45802 - reset = 1;
45803 - if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45804 + reset[0] = 1;
45805 + if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45806 err("could not stop the USB controller CPU.");
45807
45808 - while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45809 - deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45810 - ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45811 + while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45812 + deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45813 + ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45814
45815 - if (ret != hx.len) {
45816 + if (ret != hx->len) {
45817 err("error while transferring firmware "
45818 "(transferred size: %d, block size: %d)",
45819 - ret,hx.len);
45820 + ret,hx->len);
45821 ret = -EINVAL;
45822 break;
45823 }
45824 }
45825 if (ret < 0) {
45826 err("firmware download failed at %d with %d",pos,ret);
45827 + kfree(reset);
45828 + kfree(hx);
45829 return ret;
45830 }
45831
45832 if (ret == 0) {
45833 /* restart the CPU */
45834 - reset = 0;
45835 - if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
45836 + reset[0] = 0;
45837 + if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
45838 err("could not restart the USB controller CPU.");
45839 ret = -EINVAL;
45840 }
45841 } else
45842 ret = -EIO;
45843
45844 + kfree(reset);
45845 + kfree(hx);
45846 +
45847 return ret;
45848 }
45849 EXPORT_SYMBOL(usb_cypress_load_firmware);
45850 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
45851 index 1a3df10..57997a5 100644
45852 --- a/drivers/media/usb/dvb-usb/dw2102.c
45853 +++ b/drivers/media/usb/dvb-usb/dw2102.c
45854 @@ -118,7 +118,7 @@ struct su3000_state {
45855
45856 struct s6x0_state {
45857 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
45858 -};
45859 +} __no_const;
45860
45861 /* debug */
45862 static int dvb_usb_dw2102_debug;
45863 diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
45864 index 6b0b8b6b..4038398 100644
45865 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c
45866 +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
45867 @@ -87,8 +87,11 @@ struct technisat_usb2_state {
45868 static int technisat_usb2_i2c_access(struct usb_device *udev,
45869 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
45870 {
45871 - u8 b[64];
45872 - int ret, actual_length;
45873 + u8 *b = kmalloc(64, GFP_KERNEL);
45874 + int ret, actual_length, error = 0;
45875 +
45876 + if (b == NULL)
45877 + return -ENOMEM;
45878
45879 deb_i2c("i2c-access: %02x, tx: ", device_addr);
45880 debug_dump(tx, txlen, deb_i2c);
45881 @@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45882
45883 if (ret < 0) {
45884 err("i2c-error: out failed %02x = %d", device_addr, ret);
45885 - return -ENODEV;
45886 + error = -ENODEV;
45887 + goto out;
45888 }
45889
45890 ret = usb_bulk_msg(udev,
45891 @@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45892 b, 64, &actual_length, 1000);
45893 if (ret < 0) {
45894 err("i2c-error: in failed %02x = %d", device_addr, ret);
45895 - return -ENODEV;
45896 + error = -ENODEV;
45897 + goto out;
45898 }
45899
45900 if (b[0] != I2C_STATUS_OK) {
45901 @@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45902 /* handle tuner-i2c-nak */
45903 if (!(b[0] == I2C_STATUS_NAK &&
45904 device_addr == 0x60
45905 - /* && device_is_technisat_usb2 */))
45906 - return -ENODEV;
45907 + /* && device_is_technisat_usb2 */)) {
45908 + error = -ENODEV;
45909 + goto out;
45910 + }
45911 }
45912
45913 deb_i2c("status: %d, ", b[0]);
45914 @@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45915
45916 deb_i2c("\n");
45917
45918 - return 0;
45919 +out:
45920 + kfree(b);
45921 + return error;
45922 }
45923
45924 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
45925 @@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45926 {
45927 int ret;
45928
45929 - u8 led[8] = {
45930 - red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45931 - 0
45932 - };
45933 + u8 *led = kzalloc(8, GFP_KERNEL);
45934 +
45935 + if (led == NULL)
45936 + return -ENOMEM;
45937
45938 if (disable_led_control && state != TECH_LED_OFF)
45939 return 0;
45940
45941 + led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
45942 +
45943 switch (state) {
45944 case TECH_LED_ON:
45945 led[1] = 0x82;
45946 @@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45947 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45948 USB_TYPE_VENDOR | USB_DIR_OUT,
45949 0, 0,
45950 - led, sizeof(led), 500);
45951 + led, 8, 500);
45952
45953 mutex_unlock(&d->i2c_mutex);
45954 +
45955 + kfree(led);
45956 +
45957 return ret;
45958 }
45959
45960 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
45961 {
45962 int ret;
45963 - u8 b = 0;
45964 + u8 *b = kzalloc(1, GFP_KERNEL);
45965 +
45966 + if (b == NULL)
45967 + return -ENOMEM;
45968
45969 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
45970 return -EAGAIN;
45971 @@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
45972 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
45973 USB_TYPE_VENDOR | USB_DIR_OUT,
45974 (red << 8) | green, 0,
45975 - &b, 1, 500);
45976 + b, 1, 500);
45977
45978 mutex_unlock(&d->i2c_mutex);
45979
45980 + kfree(b);
45981 +
45982 return ret;
45983 }
45984
45985 @@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45986 struct dvb_usb_device_description **desc, int *cold)
45987 {
45988 int ret;
45989 - u8 version[3];
45990 + u8 *version = kmalloc(3, GFP_KERNEL);
45991
45992 /* first select the interface */
45993 if (usb_set_interface(udev, 0, 1) != 0)
45994 @@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45995
45996 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
45997
45998 + if (version == NULL)
45999 + return 0;
46000 +
46001 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46002 GET_VERSION_INFO_VENDOR_REQUEST,
46003 USB_TYPE_VENDOR | USB_DIR_IN,
46004 0, 0,
46005 - version, sizeof(version), 500);
46006 + version, 3, 500);
46007
46008 if (ret < 0)
46009 *cold = 1;
46010 @@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46011 *cold = 0;
46012 }
46013
46014 + kfree(version);
46015 +
46016 return 0;
46017 }
46018
46019 @@ -591,10 +615,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46020
46021 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46022 {
46023 - u8 buf[62], *b;
46024 + u8 *buf, *b;
46025 int ret;
46026 struct ir_raw_event ev;
46027
46028 + buf = kmalloc(62, GFP_KERNEL);
46029 +
46030 + if (buf == NULL)
46031 + return -ENOMEM;
46032 +
46033 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46034 buf[1] = 0x08;
46035 buf[2] = 0x8f;
46036 @@ -617,16 +646,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46037 GET_IR_DATA_VENDOR_REQUEST,
46038 USB_TYPE_VENDOR | USB_DIR_IN,
46039 0x8080, 0,
46040 - buf, sizeof(buf), 500);
46041 + buf, 62, 500);
46042
46043 unlock:
46044 mutex_unlock(&d->i2c_mutex);
46045
46046 - if (ret < 0)
46047 + if (ret < 0) {
46048 + kfree(buf);
46049 return ret;
46050 + }
46051
46052 - if (ret == 1)
46053 + if (ret == 1) {
46054 + kfree(buf);
46055 return 0; /* no key pressed */
46056 + }
46057
46058 /* decoding */
46059 b = buf+1;
46060 @@ -653,6 +686,8 @@ unlock:
46061
46062 ir_raw_event_handle(d->rc_dev);
46063
46064 + kfree(buf);
46065 +
46066 return 1;
46067 }
46068
46069 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46070 index e502a5f..2a27f40 100644
46071 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46072 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46073 @@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46074 * by passing a very big num_planes value */
46075 uplane = compat_alloc_user_space(num_planes *
46076 sizeof(struct v4l2_plane));
46077 - kp->m.planes = (__force struct v4l2_plane *)uplane;
46078 + kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46079
46080 while (--num_planes >= 0) {
46081 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46082 @@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46083 if (num_planes == 0)
46084 return 0;
46085
46086 - uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46087 + uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46088 if (get_user(p, &up->m.planes))
46089 return -EFAULT;
46090 uplane32 = compat_ptr(p);
46091 @@ -562,7 +562,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46092 get_user(kp->flags, &up->flags) ||
46093 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46094 return -EFAULT;
46095 - kp->base = (__force void *)compat_ptr(tmp);
46096 + kp->base = (__force_kernel void *)compat_ptr(tmp);
46097 return 0;
46098 }
46099
46100 @@ -667,7 +667,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46101 n * sizeof(struct v4l2_ext_control32)))
46102 return -EFAULT;
46103 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46104 - kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46105 + kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46106 while (--n >= 0) {
46107 u32 id;
46108
46109 @@ -694,7 +694,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46110 {
46111 struct v4l2_ext_control32 __user *ucontrols;
46112 struct v4l2_ext_control __user *kcontrols =
46113 - (__force struct v4l2_ext_control __user *)kp->controls;
46114 + (struct v4l2_ext_control __force_user *)kp->controls;
46115 int n = kp->count;
46116 compat_caddr_t p;
46117
46118 @@ -778,7 +778,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46119 get_user(tmp, &up->edid) ||
46120 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46121 return -EFAULT;
46122 - kp->edid = (__force u8 *)compat_ptr(tmp);
46123 + kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46124 return 0;
46125 }
46126
46127 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46128 index 015f92a..59e311e 100644
46129 --- a/drivers/media/v4l2-core/v4l2-device.c
46130 +++ b/drivers/media/v4l2-core/v4l2-device.c
46131 @@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46132 EXPORT_SYMBOL_GPL(v4l2_device_put);
46133
46134 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46135 - atomic_t *instance)
46136 + atomic_unchecked_t *instance)
46137 {
46138 - int num = atomic_inc_return(instance) - 1;
46139 + int num = atomic_inc_return_unchecked(instance) - 1;
46140 int len = strlen(basename);
46141
46142 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46143 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46144 index 9ccb19a..d131468 100644
46145 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
46146 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46147 @@ -2142,7 +2142,8 @@ struct v4l2_ioctl_info {
46148 struct file *file, void *fh, void *p);
46149 } u;
46150 void (*debug)(const void *arg, bool write_only);
46151 -};
46152 +} __do_const;
46153 +typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46154
46155 /* This control needs a priority check */
46156 #define INFO_FL_PRIO (1 << 0)
46157 @@ -2326,7 +2327,7 @@ static long __video_do_ioctl(struct file *file,
46158 struct video_device *vfd = video_devdata(file);
46159 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46160 bool write_only = false;
46161 - struct v4l2_ioctl_info default_info;
46162 + v4l2_ioctl_info_no_const default_info;
46163 const struct v4l2_ioctl_info *info;
46164 void *fh = file->private_data;
46165 struct v4l2_fh *vfh = NULL;
46166 @@ -2413,7 +2414,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46167 ret = -EINVAL;
46168 break;
46169 }
46170 - *user_ptr = (void __user *)buf->m.planes;
46171 + *user_ptr = (void __force_user *)buf->m.planes;
46172 *kernel_ptr = (void **)&buf->m.planes;
46173 *array_size = sizeof(struct v4l2_plane) * buf->length;
46174 ret = 1;
46175 @@ -2430,7 +2431,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46176 ret = -EINVAL;
46177 break;
46178 }
46179 - *user_ptr = (void __user *)edid->edid;
46180 + *user_ptr = (void __force_user *)edid->edid;
46181 *kernel_ptr = (void **)&edid->edid;
46182 *array_size = edid->blocks * 128;
46183 ret = 1;
46184 @@ -2448,7 +2449,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46185 ret = -EINVAL;
46186 break;
46187 }
46188 - *user_ptr = (void __user *)ctrls->controls;
46189 + *user_ptr = (void __force_user *)ctrls->controls;
46190 *kernel_ptr = (void **)&ctrls->controls;
46191 *array_size = sizeof(struct v4l2_ext_control)
46192 * ctrls->count;
46193 @@ -2549,7 +2550,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46194 }
46195
46196 if (has_array_args) {
46197 - *kernel_ptr = (void __force *)user_ptr;
46198 + *kernel_ptr = (void __force_kernel *)user_ptr;
46199 if (copy_to_user(user_ptr, mbuf, array_size))
46200 err = -EFAULT;
46201 goto out_array_args;
46202 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46203 index 187f836..679544b 100644
46204 --- a/drivers/message/fusion/mptbase.c
46205 +++ b/drivers/message/fusion/mptbase.c
46206 @@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46207 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46208 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46209
46210 +#ifdef CONFIG_GRKERNSEC_HIDESYM
46211 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46212 +#else
46213 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46214 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46215 +#endif
46216 +
46217 /*
46218 * Rounding UP to nearest 4-kB boundary here...
46219 */
46220 @@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46221 ioc->facts.GlobalCredits);
46222
46223 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46224 +#ifdef CONFIG_GRKERNSEC_HIDESYM
46225 + NULL, NULL);
46226 +#else
46227 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46228 +#endif
46229 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46230 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46231 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46232 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46233 index 0707fa2..70ca794 100644
46234 --- a/drivers/message/fusion/mptsas.c
46235 +++ b/drivers/message/fusion/mptsas.c
46236 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46237 return 0;
46238 }
46239
46240 +static inline void
46241 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46242 +{
46243 + if (phy_info->port_details) {
46244 + phy_info->port_details->rphy = rphy;
46245 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46246 + ioc->name, rphy));
46247 + }
46248 +
46249 + if (rphy) {
46250 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46251 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46252 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46253 + ioc->name, rphy, rphy->dev.release));
46254 + }
46255 +}
46256 +
46257 /* no mutex */
46258 static void
46259 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46260 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46261 return NULL;
46262 }
46263
46264 -static inline void
46265 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46266 -{
46267 - if (phy_info->port_details) {
46268 - phy_info->port_details->rphy = rphy;
46269 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46270 - ioc->name, rphy));
46271 - }
46272 -
46273 - if (rphy) {
46274 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46275 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46276 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46277 - ioc->name, rphy, rphy->dev.release));
46278 - }
46279 -}
46280 -
46281 static inline struct sas_port *
46282 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46283 {
46284 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46285 index b7d87cd..3fb36da 100644
46286 --- a/drivers/message/i2o/i2o_proc.c
46287 +++ b/drivers/message/i2o/i2o_proc.c
46288 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46289 "Array Controller Device"
46290 };
46291
46292 -static char *chtostr(char *tmp, u8 *chars, int n)
46293 -{
46294 - tmp[0] = 0;
46295 - return strncat(tmp, (char *)chars, n);
46296 -}
46297 -
46298 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46299 char *group)
46300 {
46301 @@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46302 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46303 {
46304 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46305 - static u32 work32[5];
46306 - static u8 *work8 = (u8 *) work32;
46307 - static u16 *work16 = (u16 *) work32;
46308 + u32 work32[5];
46309 + u8 *work8 = (u8 *) work32;
46310 + u16 *work16 = (u16 *) work32;
46311 int token;
46312 u32 hwcap;
46313
46314 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46315 } *result;
46316
46317 i2o_exec_execute_ddm_table ddm_table;
46318 - char tmp[28 + 1];
46319
46320 result = kmalloc(sizeof(*result), GFP_KERNEL);
46321 if (!result)
46322 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46323
46324 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46325 seq_printf(seq, "%-#8x", ddm_table.module_id);
46326 - seq_printf(seq, "%-29s",
46327 - chtostr(tmp, ddm_table.module_name_version, 28));
46328 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46329 seq_printf(seq, "%9d ", ddm_table.data_size);
46330 seq_printf(seq, "%8d", ddm_table.code_size);
46331
46332 @@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46333
46334 i2o_driver_result_table *result;
46335 i2o_driver_store_table *dst;
46336 - char tmp[28 + 1];
46337
46338 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46339 if (result == NULL)
46340 @@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46341
46342 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46343 seq_printf(seq, "%-#8x", dst->module_id);
46344 - seq_printf(seq, "%-29s",
46345 - chtostr(tmp, dst->module_name_version, 28));
46346 - seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46347 + seq_printf(seq, "%-.28s", dst->module_name_version);
46348 + seq_printf(seq, "%-.8s", dst->date);
46349 seq_printf(seq, "%8d ", dst->module_size);
46350 seq_printf(seq, "%8d ", dst->mpb_size);
46351 seq_printf(seq, "0x%04x", dst->module_flags);
46352 @@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46353 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46354 {
46355 struct i2o_device *d = (struct i2o_device *)seq->private;
46356 - static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46357 + u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46358 // == (allow) 512d bytes (max)
46359 - static u16 *work16 = (u16 *) work32;
46360 + u16 *work16 = (u16 *) work32;
46361 int token;
46362 - char tmp[16 + 1];
46363
46364 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46365
46366 @@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46367 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46368 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46369 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46370 - seq_printf(seq, "Vendor info : %s\n",
46371 - chtostr(tmp, (u8 *) (work32 + 2), 16));
46372 - seq_printf(seq, "Product info : %s\n",
46373 - chtostr(tmp, (u8 *) (work32 + 6), 16));
46374 - seq_printf(seq, "Description : %s\n",
46375 - chtostr(tmp, (u8 *) (work32 + 10), 16));
46376 - seq_printf(seq, "Product rev. : %s\n",
46377 - chtostr(tmp, (u8 *) (work32 + 14), 8));
46378 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46379 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46380 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46381 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46382
46383 seq_printf(seq, "Serial number : ");
46384 print_serial_number(seq, (u8 *) (work32 + 16),
46385 @@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46386 u8 pad[256]; // allow up to 256 byte (max) serial number
46387 } result;
46388
46389 - char tmp[24 + 1];
46390 -
46391 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46392
46393 if (token < 0) {
46394 @@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46395 }
46396
46397 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46398 - seq_printf(seq, "Module name : %s\n",
46399 - chtostr(tmp, result.module_name, 24));
46400 - seq_printf(seq, "Module revision : %s\n",
46401 - chtostr(tmp, result.module_rev, 8));
46402 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
46403 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46404
46405 seq_printf(seq, "Serial number : ");
46406 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46407 @@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46408 u8 instance_number[4];
46409 } result;
46410
46411 - char tmp[64 + 1];
46412 -
46413 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46414
46415 if (token < 0) {
46416 @@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46417 return 0;
46418 }
46419
46420 - seq_printf(seq, "Device name : %s\n",
46421 - chtostr(tmp, result.device_name, 64));
46422 - seq_printf(seq, "Service name : %s\n",
46423 - chtostr(tmp, result.service_name, 64));
46424 - seq_printf(seq, "Physical name : %s\n",
46425 - chtostr(tmp, result.physical_location, 64));
46426 - seq_printf(seq, "Instance number : %s\n",
46427 - chtostr(tmp, result.instance_number, 4));
46428 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
46429 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
46430 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46431 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46432
46433 return 0;
46434 }
46435 @@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46436 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46437 {
46438 struct i2o_device *d = (struct i2o_device *)seq->private;
46439 - static u32 work32[12];
46440 - static u16 *work16 = (u16 *) work32;
46441 - static u8 *work8 = (u8 *) work32;
46442 + u32 work32[12];
46443 + u16 *work16 = (u16 *) work32;
46444 + u8 *work8 = (u8 *) work32;
46445 int token;
46446
46447 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46448 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46449 index 92752fb..a7494f6 100644
46450 --- a/drivers/message/i2o/iop.c
46451 +++ b/drivers/message/i2o/iop.c
46452 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46453
46454 spin_lock_irqsave(&c->context_list_lock, flags);
46455
46456 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46457 - atomic_inc(&c->context_list_counter);
46458 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46459 + atomic_inc_unchecked(&c->context_list_counter);
46460
46461 - entry->context = atomic_read(&c->context_list_counter);
46462 + entry->context = atomic_read_unchecked(&c->context_list_counter);
46463
46464 list_add(&entry->list, &c->context_list);
46465
46466 @@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46467
46468 #if BITS_PER_LONG == 64
46469 spin_lock_init(&c->context_list_lock);
46470 - atomic_set(&c->context_list_counter, 0);
46471 + atomic_set_unchecked(&c->context_list_counter, 0);
46472 INIT_LIST_HEAD(&c->context_list);
46473 #endif
46474
46475 diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46476 index b2c7e3b..85aa4764 100644
46477 --- a/drivers/mfd/ab8500-debugfs.c
46478 +++ b/drivers/mfd/ab8500-debugfs.c
46479 @@ -100,7 +100,7 @@ static int irq_last;
46480 static u32 *irq_count;
46481 static int num_irqs;
46482
46483 -static struct device_attribute **dev_attr;
46484 +static device_attribute_no_const **dev_attr;
46485 static char **event_name;
46486
46487 static u8 avg_sample = SAMPLE_16;
46488 diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46489 index c880c89..45a7c68 100644
46490 --- a/drivers/mfd/max8925-i2c.c
46491 +++ b/drivers/mfd/max8925-i2c.c
46492 @@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46493 const struct i2c_device_id *id)
46494 {
46495 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46496 - static struct max8925_chip *chip;
46497 + struct max8925_chip *chip;
46498 struct device_node *node = client->dev.of_node;
46499
46500 if (node && !pdata) {
46501 diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46502 index 7612d89..70549c2 100644
46503 --- a/drivers/mfd/tps65910.c
46504 +++ b/drivers/mfd/tps65910.c
46505 @@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46506 struct tps65910_platform_data *pdata)
46507 {
46508 int ret = 0;
46509 - static struct regmap_irq_chip *tps6591x_irqs_chip;
46510 + struct regmap_irq_chip *tps6591x_irqs_chip;
46511
46512 if (!irq) {
46513 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46514 diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46515 index 1b772ef..01e77d33 100644
46516 --- a/drivers/mfd/twl4030-irq.c
46517 +++ b/drivers/mfd/twl4030-irq.c
46518 @@ -34,6 +34,7 @@
46519 #include <linux/of.h>
46520 #include <linux/irqdomain.h>
46521 #include <linux/i2c/twl.h>
46522 +#include <asm/pgtable.h>
46523
46524 #include "twl-core.h"
46525
46526 @@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46527 * Install an irq handler for each of the SIH modules;
46528 * clone dummy irq_chip since PIH can't *do* anything
46529 */
46530 - twl4030_irq_chip = dummy_irq_chip;
46531 - twl4030_irq_chip.name = "twl4030";
46532 + pax_open_kernel();
46533 + memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46534 + *(const char **)&twl4030_irq_chip.name = "twl4030";
46535
46536 - twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46537 + *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46538 + pax_close_kernel();
46539
46540 for (i = irq_base; i < irq_end; i++) {
46541 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46542 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46543 index 464419b..64bae8d 100644
46544 --- a/drivers/misc/c2port/core.c
46545 +++ b/drivers/misc/c2port/core.c
46546 @@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46547 goto error_idr_alloc;
46548 c2dev->id = ret;
46549
46550 - bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46551 + pax_open_kernel();
46552 + *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46553 + pax_close_kernel();
46554
46555 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46556 "c2port%d", c2dev->id);
46557 diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46558 index 3f2b625..945e179 100644
46559 --- a/drivers/misc/eeprom/sunxi_sid.c
46560 +++ b/drivers/misc/eeprom/sunxi_sid.c
46561 @@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46562
46563 platform_set_drvdata(pdev, sid_data);
46564
46565 - sid_bin_attr.size = sid_data->keysize;
46566 + pax_open_kernel();
46567 + *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46568 + pax_close_kernel();
46569 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46570 return -ENODEV;
46571
46572 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46573 index 36f5d52..32311c3 100644
46574 --- a/drivers/misc/kgdbts.c
46575 +++ b/drivers/misc/kgdbts.c
46576 @@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46577 char before[BREAK_INSTR_SIZE];
46578 char after[BREAK_INSTR_SIZE];
46579
46580 - probe_kernel_read(before, (char *)kgdbts_break_test,
46581 + probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46582 BREAK_INSTR_SIZE);
46583 init_simple_test();
46584 ts.tst = plant_and_detach_test;
46585 @@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46586 /* Activate test with initial breakpoint */
46587 if (!is_early)
46588 kgdb_breakpoint();
46589 - probe_kernel_read(after, (char *)kgdbts_break_test,
46590 + probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46591 BREAK_INSTR_SIZE);
46592 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46593 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46594 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46595 index 3ef4627..8d00486 100644
46596 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
46597 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46598 @@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46599 * the lid is closed. This leads to interrupts as soon as a little move
46600 * is done.
46601 */
46602 - atomic_inc(&lis3->count);
46603 + atomic_inc_unchecked(&lis3->count);
46604
46605 wake_up_interruptible(&lis3->misc_wait);
46606 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46607 @@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46608 if (lis3->pm_dev)
46609 pm_runtime_get_sync(lis3->pm_dev);
46610
46611 - atomic_set(&lis3->count, 0);
46612 + atomic_set_unchecked(&lis3->count, 0);
46613 return 0;
46614 }
46615
46616 @@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46617 add_wait_queue(&lis3->misc_wait, &wait);
46618 while (true) {
46619 set_current_state(TASK_INTERRUPTIBLE);
46620 - data = atomic_xchg(&lis3->count, 0);
46621 + data = atomic_xchg_unchecked(&lis3->count, 0);
46622 if (data)
46623 break;
46624
46625 @@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46626 struct lis3lv02d, miscdev);
46627
46628 poll_wait(file, &lis3->misc_wait, wait);
46629 - if (atomic_read(&lis3->count))
46630 + if (atomic_read_unchecked(&lis3->count))
46631 return POLLIN | POLLRDNORM;
46632 return 0;
46633 }
46634 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46635 index c439c82..1f20f57 100644
46636 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
46637 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46638 @@ -297,7 +297,7 @@ struct lis3lv02d {
46639 struct input_polled_dev *idev; /* input device */
46640 struct platform_device *pdev; /* platform device */
46641 struct regulator_bulk_data regulators[2];
46642 - atomic_t count; /* interrupt count after last read */
46643 + atomic_unchecked_t count; /* interrupt count after last read */
46644 union axis_conversion ac; /* hw -> logical axis */
46645 int mapped_btns[3];
46646
46647 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46648 index 2f30bad..c4c13d0 100644
46649 --- a/drivers/misc/sgi-gru/gruhandles.c
46650 +++ b/drivers/misc/sgi-gru/gruhandles.c
46651 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46652 unsigned long nsec;
46653
46654 nsec = CLKS2NSEC(clks);
46655 - atomic_long_inc(&mcs_op_statistics[op].count);
46656 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
46657 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46658 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46659 if (mcs_op_statistics[op].max < nsec)
46660 mcs_op_statistics[op].max = nsec;
46661 }
46662 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46663 index 4f76359..cdfcb2e 100644
46664 --- a/drivers/misc/sgi-gru/gruprocfs.c
46665 +++ b/drivers/misc/sgi-gru/gruprocfs.c
46666 @@ -32,9 +32,9 @@
46667
46668 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46669
46670 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46671 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46672 {
46673 - unsigned long val = atomic_long_read(v);
46674 + unsigned long val = atomic_long_read_unchecked(v);
46675
46676 seq_printf(s, "%16lu %s\n", val, id);
46677 }
46678 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46679
46680 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46681 for (op = 0; op < mcsop_last; op++) {
46682 - count = atomic_long_read(&mcs_op_statistics[op].count);
46683 - total = atomic_long_read(&mcs_op_statistics[op].total);
46684 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46685 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46686 max = mcs_op_statistics[op].max;
46687 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46688 count ? total / count : 0, max);
46689 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46690 index 5c3ce24..4915ccb 100644
46691 --- a/drivers/misc/sgi-gru/grutables.h
46692 +++ b/drivers/misc/sgi-gru/grutables.h
46693 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46694 * GRU statistics.
46695 */
46696 struct gru_stats_s {
46697 - atomic_long_t vdata_alloc;
46698 - atomic_long_t vdata_free;
46699 - atomic_long_t gts_alloc;
46700 - atomic_long_t gts_free;
46701 - atomic_long_t gms_alloc;
46702 - atomic_long_t gms_free;
46703 - atomic_long_t gts_double_allocate;
46704 - atomic_long_t assign_context;
46705 - atomic_long_t assign_context_failed;
46706 - atomic_long_t free_context;
46707 - atomic_long_t load_user_context;
46708 - atomic_long_t load_kernel_context;
46709 - atomic_long_t lock_kernel_context;
46710 - atomic_long_t unlock_kernel_context;
46711 - atomic_long_t steal_user_context;
46712 - atomic_long_t steal_kernel_context;
46713 - atomic_long_t steal_context_failed;
46714 - atomic_long_t nopfn;
46715 - atomic_long_t asid_new;
46716 - atomic_long_t asid_next;
46717 - atomic_long_t asid_wrap;
46718 - atomic_long_t asid_reuse;
46719 - atomic_long_t intr;
46720 - atomic_long_t intr_cbr;
46721 - atomic_long_t intr_tfh;
46722 - atomic_long_t intr_spurious;
46723 - atomic_long_t intr_mm_lock_failed;
46724 - atomic_long_t call_os;
46725 - atomic_long_t call_os_wait_queue;
46726 - atomic_long_t user_flush_tlb;
46727 - atomic_long_t user_unload_context;
46728 - atomic_long_t user_exception;
46729 - atomic_long_t set_context_option;
46730 - atomic_long_t check_context_retarget_intr;
46731 - atomic_long_t check_context_unload;
46732 - atomic_long_t tlb_dropin;
46733 - atomic_long_t tlb_preload_page;
46734 - atomic_long_t tlb_dropin_fail_no_asid;
46735 - atomic_long_t tlb_dropin_fail_upm;
46736 - atomic_long_t tlb_dropin_fail_invalid;
46737 - atomic_long_t tlb_dropin_fail_range_active;
46738 - atomic_long_t tlb_dropin_fail_idle;
46739 - atomic_long_t tlb_dropin_fail_fmm;
46740 - atomic_long_t tlb_dropin_fail_no_exception;
46741 - atomic_long_t tfh_stale_on_fault;
46742 - atomic_long_t mmu_invalidate_range;
46743 - atomic_long_t mmu_invalidate_page;
46744 - atomic_long_t flush_tlb;
46745 - atomic_long_t flush_tlb_gru;
46746 - atomic_long_t flush_tlb_gru_tgh;
46747 - atomic_long_t flush_tlb_gru_zero_asid;
46748 + atomic_long_unchecked_t vdata_alloc;
46749 + atomic_long_unchecked_t vdata_free;
46750 + atomic_long_unchecked_t gts_alloc;
46751 + atomic_long_unchecked_t gts_free;
46752 + atomic_long_unchecked_t gms_alloc;
46753 + atomic_long_unchecked_t gms_free;
46754 + atomic_long_unchecked_t gts_double_allocate;
46755 + atomic_long_unchecked_t assign_context;
46756 + atomic_long_unchecked_t assign_context_failed;
46757 + atomic_long_unchecked_t free_context;
46758 + atomic_long_unchecked_t load_user_context;
46759 + atomic_long_unchecked_t load_kernel_context;
46760 + atomic_long_unchecked_t lock_kernel_context;
46761 + atomic_long_unchecked_t unlock_kernel_context;
46762 + atomic_long_unchecked_t steal_user_context;
46763 + atomic_long_unchecked_t steal_kernel_context;
46764 + atomic_long_unchecked_t steal_context_failed;
46765 + atomic_long_unchecked_t nopfn;
46766 + atomic_long_unchecked_t asid_new;
46767 + atomic_long_unchecked_t asid_next;
46768 + atomic_long_unchecked_t asid_wrap;
46769 + atomic_long_unchecked_t asid_reuse;
46770 + atomic_long_unchecked_t intr;
46771 + atomic_long_unchecked_t intr_cbr;
46772 + atomic_long_unchecked_t intr_tfh;
46773 + atomic_long_unchecked_t intr_spurious;
46774 + atomic_long_unchecked_t intr_mm_lock_failed;
46775 + atomic_long_unchecked_t call_os;
46776 + atomic_long_unchecked_t call_os_wait_queue;
46777 + atomic_long_unchecked_t user_flush_tlb;
46778 + atomic_long_unchecked_t user_unload_context;
46779 + atomic_long_unchecked_t user_exception;
46780 + atomic_long_unchecked_t set_context_option;
46781 + atomic_long_unchecked_t check_context_retarget_intr;
46782 + atomic_long_unchecked_t check_context_unload;
46783 + atomic_long_unchecked_t tlb_dropin;
46784 + atomic_long_unchecked_t tlb_preload_page;
46785 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
46786 + atomic_long_unchecked_t tlb_dropin_fail_upm;
46787 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
46788 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
46789 + atomic_long_unchecked_t tlb_dropin_fail_idle;
46790 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
46791 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
46792 + atomic_long_unchecked_t tfh_stale_on_fault;
46793 + atomic_long_unchecked_t mmu_invalidate_range;
46794 + atomic_long_unchecked_t mmu_invalidate_page;
46795 + atomic_long_unchecked_t flush_tlb;
46796 + atomic_long_unchecked_t flush_tlb_gru;
46797 + atomic_long_unchecked_t flush_tlb_gru_tgh;
46798 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
46799
46800 - atomic_long_t copy_gpa;
46801 - atomic_long_t read_gpa;
46802 + atomic_long_unchecked_t copy_gpa;
46803 + atomic_long_unchecked_t read_gpa;
46804
46805 - atomic_long_t mesq_receive;
46806 - atomic_long_t mesq_receive_none;
46807 - atomic_long_t mesq_send;
46808 - atomic_long_t mesq_send_failed;
46809 - atomic_long_t mesq_noop;
46810 - atomic_long_t mesq_send_unexpected_error;
46811 - atomic_long_t mesq_send_lb_overflow;
46812 - atomic_long_t mesq_send_qlimit_reached;
46813 - atomic_long_t mesq_send_amo_nacked;
46814 - atomic_long_t mesq_send_put_nacked;
46815 - atomic_long_t mesq_page_overflow;
46816 - atomic_long_t mesq_qf_locked;
46817 - atomic_long_t mesq_qf_noop_not_full;
46818 - atomic_long_t mesq_qf_switch_head_failed;
46819 - atomic_long_t mesq_qf_unexpected_error;
46820 - atomic_long_t mesq_noop_unexpected_error;
46821 - atomic_long_t mesq_noop_lb_overflow;
46822 - atomic_long_t mesq_noop_qlimit_reached;
46823 - atomic_long_t mesq_noop_amo_nacked;
46824 - atomic_long_t mesq_noop_put_nacked;
46825 - atomic_long_t mesq_noop_page_overflow;
46826 + atomic_long_unchecked_t mesq_receive;
46827 + atomic_long_unchecked_t mesq_receive_none;
46828 + atomic_long_unchecked_t mesq_send;
46829 + atomic_long_unchecked_t mesq_send_failed;
46830 + atomic_long_unchecked_t mesq_noop;
46831 + atomic_long_unchecked_t mesq_send_unexpected_error;
46832 + atomic_long_unchecked_t mesq_send_lb_overflow;
46833 + atomic_long_unchecked_t mesq_send_qlimit_reached;
46834 + atomic_long_unchecked_t mesq_send_amo_nacked;
46835 + atomic_long_unchecked_t mesq_send_put_nacked;
46836 + atomic_long_unchecked_t mesq_page_overflow;
46837 + atomic_long_unchecked_t mesq_qf_locked;
46838 + atomic_long_unchecked_t mesq_qf_noop_not_full;
46839 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
46840 + atomic_long_unchecked_t mesq_qf_unexpected_error;
46841 + atomic_long_unchecked_t mesq_noop_unexpected_error;
46842 + atomic_long_unchecked_t mesq_noop_lb_overflow;
46843 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
46844 + atomic_long_unchecked_t mesq_noop_amo_nacked;
46845 + atomic_long_unchecked_t mesq_noop_put_nacked;
46846 + atomic_long_unchecked_t mesq_noop_page_overflow;
46847
46848 };
46849
46850 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
46851 tghop_invalidate, mcsop_last};
46852
46853 struct mcs_op_statistic {
46854 - atomic_long_t count;
46855 - atomic_long_t total;
46856 + atomic_long_unchecked_t count;
46857 + atomic_long_unchecked_t total;
46858 unsigned long max;
46859 };
46860
46861 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
46862
46863 #define STAT(id) do { \
46864 if (gru_options & OPT_STATS) \
46865 - atomic_long_inc(&gru_stats.id); \
46866 + atomic_long_inc_unchecked(&gru_stats.id); \
46867 } while (0)
46868
46869 #ifdef CONFIG_SGI_GRU_DEBUG
46870 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
46871 index c862cd4..0d176fe 100644
46872 --- a/drivers/misc/sgi-xp/xp.h
46873 +++ b/drivers/misc/sgi-xp/xp.h
46874 @@ -288,7 +288,7 @@ struct xpc_interface {
46875 xpc_notify_func, void *);
46876 void (*received) (short, int, void *);
46877 enum xp_retval (*partid_to_nasids) (short, void *);
46878 -};
46879 +} __no_const;
46880
46881 extern struct xpc_interface xpc_interface;
46882
46883 diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
46884 index 01be66d..e3a0c7e 100644
46885 --- a/drivers/misc/sgi-xp/xp_main.c
46886 +++ b/drivers/misc/sgi-xp/xp_main.c
46887 @@ -78,13 +78,13 @@ xpc_notloaded(void)
46888 }
46889
46890 struct xpc_interface xpc_interface = {
46891 - (void (*)(int))xpc_notloaded,
46892 - (void (*)(int))xpc_notloaded,
46893 - (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46894 - (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46895 + .connect = (void (*)(int))xpc_notloaded,
46896 + .disconnect = (void (*)(int))xpc_notloaded,
46897 + .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46898 + .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46899 void *))xpc_notloaded,
46900 - (void (*)(short, int, void *))xpc_notloaded,
46901 - (enum xp_retval(*)(short, void *))xpc_notloaded
46902 + .received = (void (*)(short, int, void *))xpc_notloaded,
46903 + .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
46904 };
46905 EXPORT_SYMBOL_GPL(xpc_interface);
46906
46907 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
46908 index b94d5f7..7f494c5 100644
46909 --- a/drivers/misc/sgi-xp/xpc.h
46910 +++ b/drivers/misc/sgi-xp/xpc.h
46911 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
46912 void (*received_payload) (struct xpc_channel *, void *);
46913 void (*notify_senders_of_disconnect) (struct xpc_channel *);
46914 };
46915 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
46916
46917 /* struct xpc_partition act_state values (for XPC HB) */
46918
46919 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
46920 /* found in xpc_main.c */
46921 extern struct device *xpc_part;
46922 extern struct device *xpc_chan;
46923 -extern struct xpc_arch_operations xpc_arch_ops;
46924 +extern xpc_arch_operations_no_const xpc_arch_ops;
46925 extern int xpc_disengage_timelimit;
46926 extern int xpc_disengage_timedout;
46927 extern int xpc_activate_IRQ_rcvd;
46928 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
46929 index 82dc574..8539ab2 100644
46930 --- a/drivers/misc/sgi-xp/xpc_main.c
46931 +++ b/drivers/misc/sgi-xp/xpc_main.c
46932 @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
46933 .notifier_call = xpc_system_die,
46934 };
46935
46936 -struct xpc_arch_operations xpc_arch_ops;
46937 +xpc_arch_operations_no_const xpc_arch_ops;
46938
46939 /*
46940 * Timer function to enforce the timelimit on the partition disengage.
46941 @@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
46942
46943 if (((die_args->trapnr == X86_TRAP_MF) ||
46944 (die_args->trapnr == X86_TRAP_XF)) &&
46945 - !user_mode_vm(die_args->regs))
46946 + !user_mode(die_args->regs))
46947 xpc_die_deactivate();
46948
46949 break;
46950 diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
46951 index 1fa4c80..59447c9 100644
46952 --- a/drivers/mmc/card/block.c
46953 +++ b/drivers/mmc/card/block.c
46954 @@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
46955 if (idata->ic.postsleep_min_us)
46956 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
46957
46958 - if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
46959 + if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
46960 err = -EFAULT;
46961 goto cmd_rel_host;
46962 }
46963 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
46964 index 7911e05..d0f9dda 100644
46965 --- a/drivers/mmc/core/mmc_ops.c
46966 +++ b/drivers/mmc/core/mmc_ops.c
46967 @@ -267,7 +267,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
46968 void *data_buf;
46969 int is_on_stack;
46970
46971 - is_on_stack = object_is_on_stack(buf);
46972 + is_on_stack = object_starts_on_stack(buf);
46973 if (is_on_stack) {
46974 /*
46975 * dma onto stack is unsafe/nonportable, but callers to this
46976 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
46977 index 01b99e8..5c325e3 100644
46978 --- a/drivers/mmc/host/dw_mmc.h
46979 +++ b/drivers/mmc/host/dw_mmc.h
46980 @@ -265,5 +265,5 @@ struct dw_mci_drv_data {
46981 int (*parse_dt)(struct dw_mci *host);
46982 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
46983 struct dw_mci_tuning_data *tuning_data);
46984 -};
46985 +} __do_const;
46986 #endif /* _DW_MMC_H_ */
46987 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
46988 index 43af791..86f4c48 100644
46989 --- a/drivers/mmc/host/mmci.c
46990 +++ b/drivers/mmc/host/mmci.c
46991 @@ -1628,7 +1628,9 @@ static int mmci_probe(struct amba_device *dev,
46992 mmc->caps |= MMC_CAP_CMD23;
46993
46994 if (variant->busy_detect) {
46995 - mmci_ops.card_busy = mmci_card_busy;
46996 + pax_open_kernel();
46997 + *(void **)&mmci_ops.card_busy = mmci_card_busy;
46998 + pax_close_kernel();
46999 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47000 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47001 mmc->max_busy_timeout = 0;
47002 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47003 index df27bb4..2085f0b 100644
47004 --- a/drivers/mmc/host/omap_hsmmc.c
47005 +++ b/drivers/mmc/host/omap_hsmmc.c
47006 @@ -2111,7 +2111,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47007
47008 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47009 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47010 - omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47011 + pax_open_kernel();
47012 + *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47013 + pax_close_kernel();
47014 }
47015
47016 pm_runtime_enable(host->dev);
47017 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47018 index 587ee0e..b3bbcab 100644
47019 --- a/drivers/mmc/host/sdhci-esdhc-imx.c
47020 +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47021 @@ -1054,9 +1054,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47022 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47023 }
47024
47025 - if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47026 - sdhci_esdhc_ops.platform_execute_tuning =
47027 + if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47028 + pax_open_kernel();
47029 + *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47030 esdhc_executing_tuning;
47031 + pax_close_kernel();
47032 + }
47033
47034 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47035 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47036 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47037 index 0ce6eb1..8dcce1b 100644
47038 --- a/drivers/mmc/host/sdhci-s3c.c
47039 +++ b/drivers/mmc/host/sdhci-s3c.c
47040 @@ -584,9 +584,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47041 * we can use overriding functions instead of default.
47042 */
47043 if (sc->no_divider) {
47044 - sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47045 - sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47046 - sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47047 + pax_open_kernel();
47048 + *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47049 + *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47050 + *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47051 + pax_close_kernel();
47052 }
47053
47054 /* It supports additional host capabilities if needed */
47055 diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47056 index 423666b..81ff5eb 100644
47057 --- a/drivers/mtd/chips/cfi_cmdset_0020.c
47058 +++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47059 @@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47060 size_t totlen = 0, thislen;
47061 int ret = 0;
47062 size_t buflen = 0;
47063 - static char *buffer;
47064 + char *buffer;
47065
47066 if (!ECCBUF_SIZE) {
47067 /* We should fall back to a general writev implementation.
47068 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47069 index b3b7ca1..5dd4634 100644
47070 --- a/drivers/mtd/nand/denali.c
47071 +++ b/drivers/mtd/nand/denali.c
47072 @@ -24,6 +24,7 @@
47073 #include <linux/slab.h>
47074 #include <linux/mtd/mtd.h>
47075 #include <linux/module.h>
47076 +#include <linux/slab.h>
47077
47078 #include "denali.h"
47079
47080 diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47081 index 959cb9b..8520fe5 100644
47082 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47083 +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47084 @@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47085
47086 /* first try to map the upper buffer directly */
47087 if (virt_addr_valid(this->upper_buf) &&
47088 - !object_is_on_stack(this->upper_buf)) {
47089 + !object_starts_on_stack(this->upper_buf)) {
47090 sg_init_one(sgl, this->upper_buf, this->upper_len);
47091 ret = dma_map_sg(this->dev, sgl, 1, dr);
47092 if (ret == 0)
47093 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47094 index 51b9d6a..52af9a7 100644
47095 --- a/drivers/mtd/nftlmount.c
47096 +++ b/drivers/mtd/nftlmount.c
47097 @@ -24,6 +24,7 @@
47098 #include <asm/errno.h>
47099 #include <linux/delay.h>
47100 #include <linux/slab.h>
47101 +#include <linux/sched.h>
47102 #include <linux/mtd/mtd.h>
47103 #include <linux/mtd/nand.h>
47104 #include <linux/mtd/nftl.h>
47105 diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47106 index c23184a..4115c41 100644
47107 --- a/drivers/mtd/sm_ftl.c
47108 +++ b/drivers/mtd/sm_ftl.c
47109 @@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47110 #define SM_CIS_VENDOR_OFFSET 0x59
47111 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47112 {
47113 - struct attribute_group *attr_group;
47114 + attribute_group_no_const *attr_group;
47115 struct attribute **attributes;
47116 struct sm_sysfs_attribute *vendor_attribute;
47117 char *vendor;
47118 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
47119 index a5115fb..81b03f6 100644
47120 --- a/drivers/net/bonding/bond_main.c
47121 +++ b/drivers/net/bonding/bond_main.c
47122 @@ -3749,7 +3749,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
47123 bond_dev_queue_xmit(bond, skb, slave->dev);
47124 } else {
47125 dev_kfree_skb_any(skb);
47126 - atomic_long_inc(&dev->tx_dropped);
47127 + atomic_long_inc_unchecked(&dev->tx_dropped);
47128 }
47129
47130 return NETDEV_TX_OK;
47131 diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47132 index 45f09a6..f154f8d 100644
47133 --- a/drivers/net/bonding/bond_netlink.c
47134 +++ b/drivers/net/bonding/bond_netlink.c
47135 @@ -585,7 +585,7 @@ nla_put_failure:
47136 return -EMSGSIZE;
47137 }
47138
47139 -struct rtnl_link_ops bond_link_ops __read_mostly = {
47140 +struct rtnl_link_ops bond_link_ops = {
47141 .kind = "bond",
47142 .priv_size = sizeof(struct bonding),
47143 .setup = bond_setup,
47144 diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47145 index 5e40a8b..126bfda 100644
47146 --- a/drivers/net/caif/caif_hsi.c
47147 +++ b/drivers/net/caif/caif_hsi.c
47148 @@ -1445,7 +1445,7 @@ err:
47149 return -ENODEV;
47150 }
47151
47152 -static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47153 +static struct rtnl_link_ops caif_hsi_link_ops = {
47154 .kind = "cfhsi",
47155 .priv_size = sizeof(struct cfhsi),
47156 .setup = cfhsi_setup,
47157 diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47158 index 98d73aa..63ef9da 100644
47159 --- a/drivers/net/can/Kconfig
47160 +++ b/drivers/net/can/Kconfig
47161 @@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47162
47163 config CAN_FLEXCAN
47164 tristate "Support for Freescale FLEXCAN based chips"
47165 - depends on ARM || PPC
47166 + depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47167 ---help---
47168 Say Y here if you want to support for Freescale FlexCAN.
47169
47170 diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47171 index 2cfe501..477d4b5 100644
47172 --- a/drivers/net/can/dev.c
47173 +++ b/drivers/net/can/dev.c
47174 @@ -868,7 +868,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47175 return -EOPNOTSUPP;
47176 }
47177
47178 -static struct rtnl_link_ops can_link_ops __read_mostly = {
47179 +static struct rtnl_link_ops can_link_ops = {
47180 .kind = "can",
47181 .maxtype = IFLA_CAN_MAX,
47182 .policy = can_policy,
47183 diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47184 index 4e94057..32032ff 100644
47185 --- a/drivers/net/can/vcan.c
47186 +++ b/drivers/net/can/vcan.c
47187 @@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
47188 dev->destructor = free_netdev;
47189 }
47190
47191 -static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47192 +static struct rtnl_link_ops vcan_link_ops = {
47193 .kind = "vcan",
47194 .setup = vcan_setup,
47195 };
47196 diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47197 index ff435fb..d408b1f 100644
47198 --- a/drivers/net/dummy.c
47199 +++ b/drivers/net/dummy.c
47200 @@ -149,7 +149,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47201 return 0;
47202 }
47203
47204 -static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47205 +static struct rtnl_link_ops dummy_link_ops = {
47206 .kind = "dummy",
47207 .setup = dummy_setup,
47208 .validate = dummy_validate,
47209 diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47210 index 1d162cc..b546a75 100644
47211 --- a/drivers/net/ethernet/8390/ax88796.c
47212 +++ b/drivers/net/ethernet/8390/ax88796.c
47213 @@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47214 if (ax->plat->reg_offsets)
47215 ei_local->reg_offset = ax->plat->reg_offsets;
47216 else {
47217 + resource_size_t _mem_size = mem_size;
47218 + do_div(_mem_size, 0x18);
47219 ei_local->reg_offset = ax->reg_offsets;
47220 for (ret = 0; ret < 0x18; ret++)
47221 - ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47222 + ax->reg_offsets[ret] = _mem_size * ret;
47223 }
47224
47225 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47226 diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47227 index 4efc435..4ab9e14 100644
47228 --- a/drivers/net/ethernet/altera/altera_tse_main.c
47229 +++ b/drivers/net/ethernet/altera/altera_tse_main.c
47230 @@ -1224,7 +1224,7 @@ static int tse_shutdown(struct net_device *dev)
47231 return 0;
47232 }
47233
47234 -static struct net_device_ops altera_tse_netdev_ops = {
47235 +static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47236 .ndo_open = tse_open,
47237 .ndo_stop = tse_shutdown,
47238 .ndo_start_xmit = tse_start_xmit,
47239 @@ -1461,11 +1461,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47240 ndev->netdev_ops = &altera_tse_netdev_ops;
47241 altera_tse_set_ethtool_ops(ndev);
47242
47243 + pax_open_kernel();
47244 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47245
47246 if (priv->hash_filter)
47247 altera_tse_netdev_ops.ndo_set_rx_mode =
47248 tse_set_rx_mode_hashfilter;
47249 + pax_close_kernel();
47250
47251 /* Scatter/gather IO is not supported,
47252 * so it is turned off
47253 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47254 index caade30..3e257d9 100644
47255 --- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47256 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47257 @@ -1072,14 +1072,14 @@ do { \
47258 * operations, everything works on mask values.
47259 */
47260 #define XMDIO_READ(_pdata, _mmd, _reg) \
47261 - ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47262 + ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47263 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47264
47265 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47266 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47267
47268 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47269 - ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47270 + ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47271 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47272
47273 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47274 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47275 index 8a50b01..39c1ad0 100644
47276 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47277 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47278 @@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47279
47280 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47281
47282 - pdata->hw_if.config_dcb_tc(pdata);
47283 + pdata->hw_if->config_dcb_tc(pdata);
47284
47285 return 0;
47286 }
47287 @@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47288
47289 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47290
47291 - pdata->hw_if.config_dcb_pfc(pdata);
47292 + pdata->hw_if->config_dcb_pfc(pdata);
47293
47294 return 0;
47295 }
47296 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47297 index 6fc5da0..61ac2cb 100644
47298 --- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47299 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47300 @@ -235,7 +235,7 @@ err_ring:
47301
47302 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47303 {
47304 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47305 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47306 struct xgbe_channel *channel;
47307 struct xgbe_ring *ring;
47308 struct xgbe_ring_data *rdata;
47309 @@ -276,7 +276,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47310
47311 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47312 {
47313 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47314 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47315 struct xgbe_channel *channel;
47316 struct xgbe_ring *ring;
47317 struct xgbe_ring_desc *rdesc;
47318 @@ -505,7 +505,7 @@ err_out:
47319 static void xgbe_realloc_skb(struct xgbe_channel *channel)
47320 {
47321 struct xgbe_prv_data *pdata = channel->pdata;
47322 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47323 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47324 struct xgbe_ring *ring = channel->rx_ring;
47325 struct xgbe_ring_data *rdata;
47326 struct sk_buff *skb = NULL;
47327 @@ -546,17 +546,12 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel)
47328 DBGPR("<--xgbe_realloc_skb\n");
47329 }
47330
47331 -void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47332 -{
47333 - DBGPR("-->xgbe_init_function_ptrs_desc\n");
47334 -
47335 - desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47336 - desc_if->free_ring_resources = xgbe_free_ring_resources;
47337 - desc_if->map_tx_skb = xgbe_map_tx_skb;
47338 - desc_if->realloc_skb = xgbe_realloc_skb;
47339 - desc_if->unmap_skb = xgbe_unmap_skb;
47340 - desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47341 - desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47342 -
47343 - DBGPR("<--xgbe_init_function_ptrs_desc\n");
47344 -}
47345 +const struct xgbe_desc_if default_xgbe_desc_if = {
47346 + .alloc_ring_resources = xgbe_alloc_ring_resources,
47347 + .free_ring_resources = xgbe_free_ring_resources,
47348 + .map_tx_skb = xgbe_map_tx_skb,
47349 + .realloc_skb = xgbe_realloc_skb,
47350 + .unmap_skb = xgbe_unmap_skb,
47351 + .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47352 + .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47353 +};
47354 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47355 index 9da3a03..022f15c 100644
47356 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47357 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47358 @@ -2462,7 +2462,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47359
47360 static int xgbe_init(struct xgbe_prv_data *pdata)
47361 {
47362 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47363 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47364 int ret;
47365
47366 DBGPR("-->xgbe_init\n");
47367 @@ -2524,101 +2524,96 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47368 return 0;
47369 }
47370
47371 -void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47372 -{
47373 - DBGPR("-->xgbe_init_function_ptrs\n");
47374 -
47375 - hw_if->tx_complete = xgbe_tx_complete;
47376 -
47377 - hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47378 - hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47379 - hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47380 - hw_if->set_mac_address = xgbe_set_mac_address;
47381 -
47382 - hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47383 - hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47384 -
47385 - hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47386 - hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47387 - hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47388 - hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47389 - hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47390 -
47391 - hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47392 - hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47393 -
47394 - hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47395 - hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47396 - hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47397 -
47398 - hw_if->enable_tx = xgbe_enable_tx;
47399 - hw_if->disable_tx = xgbe_disable_tx;
47400 - hw_if->enable_rx = xgbe_enable_rx;
47401 - hw_if->disable_rx = xgbe_disable_rx;
47402 -
47403 - hw_if->powerup_tx = xgbe_powerup_tx;
47404 - hw_if->powerdown_tx = xgbe_powerdown_tx;
47405 - hw_if->powerup_rx = xgbe_powerup_rx;
47406 - hw_if->powerdown_rx = xgbe_powerdown_rx;
47407 -
47408 - hw_if->pre_xmit = xgbe_pre_xmit;
47409 - hw_if->dev_read = xgbe_dev_read;
47410 - hw_if->enable_int = xgbe_enable_int;
47411 - hw_if->disable_int = xgbe_disable_int;
47412 - hw_if->init = xgbe_init;
47413 - hw_if->exit = xgbe_exit;
47414 +const struct xgbe_hw_if default_xgbe_hw_if = {
47415 + .tx_complete = xgbe_tx_complete,
47416 +
47417 + .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47418 + .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47419 + .add_mac_addresses = xgbe_add_mac_addresses,
47420 + .set_mac_address = xgbe_set_mac_address,
47421 +
47422 + .enable_rx_csum = xgbe_enable_rx_csum,
47423 + .disable_rx_csum = xgbe_disable_rx_csum,
47424 +
47425 + .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47426 + .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47427 + .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47428 + .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47429 + .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47430 +
47431 + .read_mmd_regs = xgbe_read_mmd_regs,
47432 + .write_mmd_regs = xgbe_write_mmd_regs,
47433 +
47434 + .set_gmii_speed = xgbe_set_gmii_speed,
47435 + .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47436 + .set_xgmii_speed = xgbe_set_xgmii_speed,
47437 +
47438 + .enable_tx = xgbe_enable_tx,
47439 + .disable_tx = xgbe_disable_tx,
47440 + .enable_rx = xgbe_enable_rx,
47441 + .disable_rx = xgbe_disable_rx,
47442 +
47443 + .powerup_tx = xgbe_powerup_tx,
47444 + .powerdown_tx = xgbe_powerdown_tx,
47445 + .powerup_rx = xgbe_powerup_rx,
47446 + .powerdown_rx = xgbe_powerdown_rx,
47447 +
47448 + .pre_xmit = xgbe_pre_xmit,
47449 + .dev_read = xgbe_dev_read,
47450 + .enable_int = xgbe_enable_int,
47451 + .disable_int = xgbe_disable_int,
47452 + .init = xgbe_init,
47453 + .exit = xgbe_exit,
47454
47455 /* Descriptor related Sequences have to be initialized here */
47456 - hw_if->tx_desc_init = xgbe_tx_desc_init;
47457 - hw_if->rx_desc_init = xgbe_rx_desc_init;
47458 - hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47459 - hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47460 - hw_if->is_last_desc = xgbe_is_last_desc;
47461 - hw_if->is_context_desc = xgbe_is_context_desc;
47462 + .tx_desc_init = xgbe_tx_desc_init,
47463 + .rx_desc_init = xgbe_rx_desc_init,
47464 + .tx_desc_reset = xgbe_tx_desc_reset,
47465 + .rx_desc_reset = xgbe_rx_desc_reset,
47466 + .is_last_desc = xgbe_is_last_desc,
47467 + .is_context_desc = xgbe_is_context_desc,
47468
47469 /* For FLOW ctrl */
47470 - hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47471 - hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47472 + .config_tx_flow_control = xgbe_config_tx_flow_control,
47473 + .config_rx_flow_control = xgbe_config_rx_flow_control,
47474
47475 /* For RX coalescing */
47476 - hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47477 - hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47478 - hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47479 - hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47480 + .config_rx_coalesce = xgbe_config_rx_coalesce,
47481 + .config_tx_coalesce = xgbe_config_tx_coalesce,
47482 + .usec_to_riwt = xgbe_usec_to_riwt,
47483 + .riwt_to_usec = xgbe_riwt_to_usec,
47484
47485 /* For RX and TX threshold config */
47486 - hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47487 - hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47488 + .config_rx_threshold = xgbe_config_rx_threshold,
47489 + .config_tx_threshold = xgbe_config_tx_threshold,
47490
47491 /* For RX and TX Store and Forward Mode config */
47492 - hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47493 - hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47494 + .config_rsf_mode = xgbe_config_rsf_mode,
47495 + .config_tsf_mode = xgbe_config_tsf_mode,
47496
47497 /* For TX DMA Operating on Second Frame config */
47498 - hw_if->config_osp_mode = xgbe_config_osp_mode;
47499 + .config_osp_mode = xgbe_config_osp_mode,
47500
47501 /* For RX and TX PBL config */
47502 - hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47503 - hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47504 - hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47505 - hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47506 - hw_if->config_pblx8 = xgbe_config_pblx8;
47507 + .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47508 + .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47509 + .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47510 + .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47511 + .config_pblx8 = xgbe_config_pblx8,
47512
47513 /* For MMC statistics support */
47514 - hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47515 - hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47516 - hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47517 + .tx_mmc_int = xgbe_tx_mmc_int,
47518 + .rx_mmc_int = xgbe_rx_mmc_int,
47519 + .read_mmc_stats = xgbe_read_mmc_stats,
47520
47521 /* For PTP config */
47522 - hw_if->config_tstamp = xgbe_config_tstamp;
47523 - hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47524 - hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47525 - hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47526 - hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47527 + .config_tstamp = xgbe_config_tstamp,
47528 + .update_tstamp_addend = xgbe_update_tstamp_addend,
47529 + .set_tstamp_time = xgbe_set_tstamp_time,
47530 + .get_tstamp_time = xgbe_get_tstamp_time,
47531 + .get_tx_tstamp = xgbe_get_tx_tstamp,
47532
47533 /* For Data Center Bridging config */
47534 - hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47535 - hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47536 -
47537 - DBGPR("<--xgbe_init_function_ptrs\n");
47538 -}
47539 + .config_dcb_tc = xgbe_config_dcb_tc,
47540 + .config_dcb_pfc = xgbe_config_dcb_pfc,
47541 +};
47542 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47543 index 2349ea9..a83a677 100644
47544 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47545 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47546 @@ -154,7 +154,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47547
47548 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47549 {
47550 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47551 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47552 struct xgbe_channel *channel;
47553 enum xgbe_int int_id;
47554 unsigned int i;
47555 @@ -176,7 +176,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47556
47557 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47558 {
47559 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47560 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47561 struct xgbe_channel *channel;
47562 enum xgbe_int int_id;
47563 unsigned int i;
47564 @@ -199,7 +199,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47565 static irqreturn_t xgbe_isr(int irq, void *data)
47566 {
47567 struct xgbe_prv_data *pdata = data;
47568 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47569 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47570 struct xgbe_channel *channel;
47571 unsigned int dma_isr, dma_ch_isr;
47572 unsigned int mac_isr, mac_tssr;
47573 @@ -446,7 +446,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47574
47575 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47576 {
47577 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47578 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47579
47580 DBGPR("-->xgbe_init_tx_coalesce\n");
47581
47582 @@ -460,7 +460,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47583
47584 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47585 {
47586 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47587 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47588
47589 DBGPR("-->xgbe_init_rx_coalesce\n");
47590
47591 @@ -474,7 +474,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47592
47593 static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47594 {
47595 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47596 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47597 struct xgbe_channel *channel;
47598 struct xgbe_ring *ring;
47599 struct xgbe_ring_data *rdata;
47600 @@ -499,7 +499,7 @@ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47601
47602 static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47603 {
47604 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47605 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47606 struct xgbe_channel *channel;
47607 struct xgbe_ring *ring;
47608 struct xgbe_ring_data *rdata;
47609 @@ -525,7 +525,7 @@ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47610 static void xgbe_adjust_link(struct net_device *netdev)
47611 {
47612 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47613 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47614 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47615 struct phy_device *phydev = pdata->phydev;
47616 int new_state = 0;
47617
47618 @@ -633,7 +633,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47619 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47620 {
47621 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47622 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47623 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47624 unsigned long flags;
47625
47626 DBGPR("-->xgbe_powerdown\n");
47627 @@ -671,7 +671,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47628 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47629 {
47630 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47631 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47632 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47633 unsigned long flags;
47634
47635 DBGPR("-->xgbe_powerup\n");
47636 @@ -708,7 +708,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47637
47638 static int xgbe_start(struct xgbe_prv_data *pdata)
47639 {
47640 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47641 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47642 struct net_device *netdev = pdata->netdev;
47643
47644 DBGPR("-->xgbe_start\n");
47645 @@ -734,7 +734,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47646
47647 static void xgbe_stop(struct xgbe_prv_data *pdata)
47648 {
47649 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47650 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47651 struct net_device *netdev = pdata->netdev;
47652
47653 DBGPR("-->xgbe_stop\n");
47654 @@ -754,7 +754,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47655
47656 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47657 {
47658 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47659 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47660
47661 DBGPR("-->xgbe_restart_dev\n");
47662
47663 @@ -951,7 +951,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47664 return -ERANGE;
47665 }
47666
47667 - pdata->hw_if.config_tstamp(pdata, mac_tscr);
47668 + pdata->hw_if->config_tstamp(pdata, mac_tscr);
47669
47670 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47671
47672 @@ -1089,8 +1089,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47673 static int xgbe_open(struct net_device *netdev)
47674 {
47675 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47676 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47677 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47678 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47679 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47680 int ret;
47681
47682 DBGPR("-->xgbe_open\n");
47683 @@ -1170,8 +1170,8 @@ err_phy_init:
47684 static int xgbe_close(struct net_device *netdev)
47685 {
47686 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47687 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47688 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47689 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47690 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47691
47692 DBGPR("-->xgbe_close\n");
47693
47694 @@ -1205,8 +1205,8 @@ static int xgbe_close(struct net_device *netdev)
47695 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47696 {
47697 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47698 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47699 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47700 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47701 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47702 struct xgbe_channel *channel;
47703 struct xgbe_ring *ring;
47704 struct xgbe_packet_data *packet;
47705 @@ -1275,7 +1275,7 @@ tx_netdev_return:
47706 static void xgbe_set_rx_mode(struct net_device *netdev)
47707 {
47708 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47709 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47710 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47711 unsigned int pr_mode, am_mode;
47712
47713 DBGPR("-->xgbe_set_rx_mode\n");
47714 @@ -1294,7 +1294,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47715 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47716 {
47717 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47718 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47719 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47720 struct sockaddr *saddr = addr;
47721
47722 DBGPR("-->xgbe_set_mac_address\n");
47723 @@ -1361,7 +1361,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47724
47725 DBGPR("-->%s\n", __func__);
47726
47727 - pdata->hw_if.read_mmc_stats(pdata);
47728 + pdata->hw_if->read_mmc_stats(pdata);
47729
47730 s->rx_packets = pstats->rxframecount_gb;
47731 s->rx_bytes = pstats->rxoctetcount_gb;
47732 @@ -1388,7 +1388,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47733 u16 vid)
47734 {
47735 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47736 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47737 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47738
47739 DBGPR("-->%s\n", __func__);
47740
47741 @@ -1404,7 +1404,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47742 u16 vid)
47743 {
47744 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47745 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47746 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47747
47748 DBGPR("-->%s\n", __func__);
47749
47750 @@ -1464,7 +1464,7 @@ static int xgbe_set_features(struct net_device *netdev,
47751 netdev_features_t features)
47752 {
47753 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47754 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47755 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47756 netdev_features_t rxcsum, rxvlan, rxvlan_filter;
47757
47758 rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
47759 @@ -1520,7 +1520,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47760 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47761 {
47762 struct xgbe_prv_data *pdata = channel->pdata;
47763 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47764 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47765 struct xgbe_ring *ring = channel->rx_ring;
47766 struct xgbe_ring_data *rdata;
47767
47768 @@ -1536,8 +1536,8 @@ static void xgbe_rx_refresh(struct xgbe_channel *channel)
47769 static int xgbe_tx_poll(struct xgbe_channel *channel)
47770 {
47771 struct xgbe_prv_data *pdata = channel->pdata;
47772 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47773 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47774 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47775 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47776 struct xgbe_ring *ring = channel->tx_ring;
47777 struct xgbe_ring_data *rdata;
47778 struct xgbe_ring_desc *rdesc;
47779 @@ -1589,7 +1589,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
47780 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
47781 {
47782 struct xgbe_prv_data *pdata = channel->pdata;
47783 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47784 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47785 struct xgbe_ring *ring = channel->rx_ring;
47786 struct xgbe_ring_data *rdata;
47787 struct xgbe_packet_data *packet;
47788 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47789 index 49508ec..2617cca 100644
47790 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47791 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47792 @@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
47793
47794 DBGPR("-->%s\n", __func__);
47795
47796 - pdata->hw_if.read_mmc_stats(pdata);
47797 + pdata->hw_if->read_mmc_stats(pdata);
47798 for (i = 0; i < XGBE_STATS_COUNT; i++) {
47799 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
47800 *data++ = *(u64 *)stat;
47801 @@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
47802 struct ethtool_coalesce *ec)
47803 {
47804 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47805 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47806 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47807 unsigned int riwt;
47808
47809 DBGPR("-->xgbe_get_coalesce\n");
47810 @@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
47811 struct ethtool_coalesce *ec)
47812 {
47813 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47814 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47815 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47816 unsigned int rx_frames, rx_riwt, rx_usecs;
47817 unsigned int tx_frames, tx_usecs;
47818
47819 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47820 index f5a8fa0..0bb58ff 100644
47821 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47822 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47823 @@ -209,12 +209,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
47824 DBGPR("<--xgbe_default_config\n");
47825 }
47826
47827 -static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
47828 -{
47829 - xgbe_init_function_ptrs_dev(&pdata->hw_if);
47830 - xgbe_init_function_ptrs_desc(&pdata->desc_if);
47831 -}
47832 -
47833 static int xgbe_probe(struct platform_device *pdev)
47834 {
47835 struct xgbe_prv_data *pdata;
47836 @@ -327,9 +321,8 @@ static int xgbe_probe(struct platform_device *pdev)
47837 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
47838
47839 /* Set all the function pointers */
47840 - xgbe_init_all_fptrs(pdata);
47841 - hw_if = &pdata->hw_if;
47842 - desc_if = &pdata->desc_if;
47843 + hw_if = pdata->hw_if = &default_xgbe_hw_if;
47844 + desc_if = pdata->desc_if = &default_xgbe_desc_if;
47845
47846 /* Issue software reset to device */
47847 hw_if->exit(pdata);
47848 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47849 index 363b210..b241389 100644
47850 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47851 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47852 @@ -126,7 +126,7 @@
47853 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
47854 {
47855 struct xgbe_prv_data *pdata = mii->priv;
47856 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47857 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47858 int mmd_data;
47859
47860 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
47861 @@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
47862 u16 mmd_val)
47863 {
47864 struct xgbe_prv_data *pdata = mii->priv;
47865 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47866 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47867 int mmd_data = mmd_val;
47868
47869 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
47870 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47871 index a1bf9d1c..84adcab 100644
47872 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47873 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47874 @@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
47875 tstamp_cc);
47876 u64 nsec;
47877
47878 - nsec = pdata->hw_if.get_tstamp_time(pdata);
47879 + nsec = pdata->hw_if->get_tstamp_time(pdata);
47880
47881 return nsec;
47882 }
47883 @@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
47884
47885 spin_lock_irqsave(&pdata->tstamp_lock, flags);
47886
47887 - pdata->hw_if.update_tstamp_addend(pdata, addend);
47888 + pdata->hw_if->update_tstamp_addend(pdata, addend);
47889
47890 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
47891
47892 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
47893 index 789957d..d7d0245 100644
47894 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h
47895 +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
47896 @@ -583,8 +583,8 @@ struct xgbe_prv_data {
47897
47898 int irq_number;
47899
47900 - struct xgbe_hw_if hw_if;
47901 - struct xgbe_desc_if desc_if;
47902 + const struct xgbe_hw_if *hw_if;
47903 + const struct xgbe_desc_if *desc_if;
47904
47905 /* AXI DMA settings */
47906 unsigned int axdomain;
47907 @@ -697,6 +697,9 @@ struct xgbe_prv_data {
47908 #endif
47909 };
47910
47911 +extern const struct xgbe_hw_if default_xgbe_hw_if;
47912 +extern const struct xgbe_desc_if default_xgbe_desc_if;
47913 +
47914 /* Function prototypes*/
47915
47916 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
47917 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47918 index adcacda..fa6e0ae 100644
47919 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47920 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47921 @@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
47922 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
47923 {
47924 /* RX_MODE controlling object */
47925 - bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
47926 + bnx2x_init_rx_mode_obj(bp);
47927
47928 /* multicast configuration controlling object */
47929 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
47930 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47931 index 7bc2924..2112002 100644
47932 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47933 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47934 @@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
47935 return rc;
47936 }
47937
47938 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47939 - struct bnx2x_rx_mode_obj *o)
47940 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
47941 {
47942 if (CHIP_IS_E1x(bp)) {
47943 - o->wait_comp = bnx2x_empty_rx_mode_wait;
47944 - o->config_rx_mode = bnx2x_set_rx_mode_e1x;
47945 + bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
47946 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
47947 } else {
47948 - o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
47949 - o->config_rx_mode = bnx2x_set_rx_mode_e2;
47950 + bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
47951 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
47952 }
47953 }
47954
47955 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47956 index e97275f..52e28bc 100644
47957 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47958 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47959 @@ -1409,8 +1409,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
47960
47961 /********************* RX MODE ****************/
47962
47963 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47964 - struct bnx2x_rx_mode_obj *o);
47965 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
47966
47967 /**
47968 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
47969 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
47970 index 31c9f82..e65e986 100644
47971 --- a/drivers/net/ethernet/broadcom/tg3.h
47972 +++ b/drivers/net/ethernet/broadcom/tg3.h
47973 @@ -150,6 +150,7 @@
47974 #define CHIPREV_ID_5750_A0 0x4000
47975 #define CHIPREV_ID_5750_A1 0x4001
47976 #define CHIPREV_ID_5750_A3 0x4003
47977 +#define CHIPREV_ID_5750_C1 0x4201
47978 #define CHIPREV_ID_5750_C2 0x4202
47979 #define CHIPREV_ID_5752_A0_HW 0x5000
47980 #define CHIPREV_ID_5752_A0 0x6000
47981 diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
47982 index 903466e..b285864 100644
47983 --- a/drivers/net/ethernet/brocade/bna/bna_enet.c
47984 +++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
47985 @@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
47986 }
47987
47988 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
47989 - bna_cb_ioceth_enable,
47990 - bna_cb_ioceth_disable,
47991 - bna_cb_ioceth_hbfail,
47992 - bna_cb_ioceth_reset
47993 + .enable_cbfn = bna_cb_ioceth_enable,
47994 + .disable_cbfn = bna_cb_ioceth_disable,
47995 + .hbfail_cbfn = bna_cb_ioceth_hbfail,
47996 + .reset_cbfn = bna_cb_ioceth_reset
47997 };
47998
47999 static void bna_attr_init(struct bna_ioceth *ioceth)
48000 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48001 index 8cffcdf..aadf043 100644
48002 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48003 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48004 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48005 */
48006 struct l2t_skb_cb {
48007 arp_failure_handler_func arp_failure_handler;
48008 -};
48009 +} __no_const;
48010
48011 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48012
48013 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48014 index 279873c..11e1921 100644
48015 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48016 +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48017 @@ -2365,7 +2365,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48018
48019 int i;
48020 struct adapter *ap = netdev2adap(dev);
48021 - static const unsigned int *reg_ranges;
48022 + const unsigned int *reg_ranges;
48023 int arr_size = 0, buf_size = 0;
48024
48025 if (is_t4(ap->params.chip)) {
48026 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48027 index cf8b6ff..274271e 100644
48028 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
48029 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48030 @@ -5387,7 +5387,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48031 for (i=0; i<ETH_ALEN; i++) {
48032 tmp.addr[i] = dev->dev_addr[i];
48033 }
48034 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48035 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48036 break;
48037
48038 case DE4X5_SET_HWADDR: /* Set the hardware address */
48039 @@ -5427,7 +5427,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48040 spin_lock_irqsave(&lp->lock, flags);
48041 memcpy(&statbuf, &lp->pktStats, ioc->len);
48042 spin_unlock_irqrestore(&lp->lock, flags);
48043 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
48044 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48045 return -EFAULT;
48046 break;
48047 }
48048 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48049 index 597c463..5cc1a7f 100644
48050 --- a/drivers/net/ethernet/emulex/benet/be_main.c
48051 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
48052 @@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48053
48054 if (wrapped)
48055 newacc += 65536;
48056 - ACCESS_ONCE(*acc) = newacc;
48057 + ACCESS_ONCE_RW(*acc) = newacc;
48058 }
48059
48060 static void populate_erx_stats(struct be_adapter *adapter,
48061 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48062 index c77fa4a..7fd42fc 100644
48063 --- a/drivers/net/ethernet/faraday/ftgmac100.c
48064 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
48065 @@ -30,6 +30,8 @@
48066 #include <linux/netdevice.h>
48067 #include <linux/phy.h>
48068 #include <linux/platform_device.h>
48069 +#include <linux/interrupt.h>
48070 +#include <linux/irqreturn.h>
48071 #include <net/ip.h>
48072
48073 #include "ftgmac100.h"
48074 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48075 index 4ff1adc..0ea6bf4 100644
48076 --- a/drivers/net/ethernet/faraday/ftmac100.c
48077 +++ b/drivers/net/ethernet/faraday/ftmac100.c
48078 @@ -31,6 +31,8 @@
48079 #include <linux/module.h>
48080 #include <linux/netdevice.h>
48081 #include <linux/platform_device.h>
48082 +#include <linux/interrupt.h>
48083 +#include <linux/irqreturn.h>
48084
48085 #include "ftmac100.h"
48086
48087 diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48088 index 537b621..07f87ce 100644
48089 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48090 +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48091 @@ -401,7 +401,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48092 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48093
48094 /* Update the base adjustement value. */
48095 - ACCESS_ONCE(pf->ptp_base_adj) = incval;
48096 + ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48097 smp_mb(); /* Force the above update. */
48098 }
48099
48100 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48101 index 5fd4b52..87aa34b 100644
48102 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48103 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48104 @@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48105 }
48106
48107 /* update the base incval used to calculate frequency adjustment */
48108 - ACCESS_ONCE(adapter->base_incval) = incval;
48109 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
48110 smp_mb();
48111
48112 /* need lock to prevent incorrect read while modifying cyclecounter */
48113 diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48114 index 454d9fe..59f0f0b 100644
48115 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48116 +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48117 @@ -458,8 +458,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48118 wmb();
48119
48120 /* we want to dirty this cache line once */
48121 - ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48122 - ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48123 + ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48124 + ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48125
48126 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48127
48128 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48129 index 2bbd01f..e8baa64 100644
48130 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48131 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48132 @@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48133 struct __vxge_hw_fifo *fifo;
48134 struct vxge_hw_fifo_config *config;
48135 u32 txdl_size, txdl_per_memblock;
48136 - struct vxge_hw_mempool_cbs fifo_mp_callback;
48137 + static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48138 + .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48139 + };
48140 +
48141 struct __vxge_hw_virtualpath *vpath;
48142
48143 if ((vp == NULL) || (attr == NULL)) {
48144 @@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48145 goto exit;
48146 }
48147
48148 - fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48149 -
48150 fifo->mempool =
48151 __vxge_hw_mempool_create(vpath->hldev,
48152 fifo->config->memblock_size,
48153 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48154 index 2bb48d5..d1a865d 100644
48155 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48156 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48157 @@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48158 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48159 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48160 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48161 - adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48162 + pax_open_kernel();
48163 + *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48164 + pax_close_kernel();
48165 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48166 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48167 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48168 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48169 index be7d7a6..a8983f8 100644
48170 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48171 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48172 @@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48173 case QLCNIC_NON_PRIV_FUNC:
48174 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48175 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48176 - nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48177 + pax_open_kernel();
48178 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48179 + pax_close_kernel();
48180 break;
48181 case QLCNIC_PRIV_FUNC:
48182 ahw->op_mode = QLCNIC_PRIV_FUNC;
48183 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48184 - nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48185 + pax_open_kernel();
48186 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48187 + pax_close_kernel();
48188 break;
48189 case QLCNIC_MGMT_FUNC:
48190 ahw->op_mode = QLCNIC_MGMT_FUNC;
48191 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48192 - nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48193 + pax_open_kernel();
48194 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48195 + pax_close_kernel();
48196 break;
48197 default:
48198 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48199 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48200 index c9f57fb..208bdc1 100644
48201 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48202 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48203 @@ -1285,7 +1285,7 @@ flash_temp:
48204 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48205 {
48206 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48207 - static const struct qlcnic_dump_operations *fw_dump_ops;
48208 + const struct qlcnic_dump_operations *fw_dump_ops;
48209 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48210 u32 entry_offset, dump, no_entries, buf_offset = 0;
48211 int i, k, ops_cnt, ops_index, dump_size = 0;
48212 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48213 index cf154f7..c948d1b 100644
48214 --- a/drivers/net/ethernet/realtek/r8169.c
48215 +++ b/drivers/net/ethernet/realtek/r8169.c
48216 @@ -788,22 +788,22 @@ struct rtl8169_private {
48217 struct mdio_ops {
48218 void (*write)(struct rtl8169_private *, int, int);
48219 int (*read)(struct rtl8169_private *, int);
48220 - } mdio_ops;
48221 + } __no_const mdio_ops;
48222
48223 struct pll_power_ops {
48224 void (*down)(struct rtl8169_private *);
48225 void (*up)(struct rtl8169_private *);
48226 - } pll_power_ops;
48227 + } __no_const pll_power_ops;
48228
48229 struct jumbo_ops {
48230 void (*enable)(struct rtl8169_private *);
48231 void (*disable)(struct rtl8169_private *);
48232 - } jumbo_ops;
48233 + } __no_const jumbo_ops;
48234
48235 struct csi_ops {
48236 void (*write)(struct rtl8169_private *, int, int);
48237 u32 (*read)(struct rtl8169_private *, int);
48238 - } csi_ops;
48239 + } __no_const csi_ops;
48240
48241 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48242 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48243 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48244 index 6b861e3..204ac86 100644
48245 --- a/drivers/net/ethernet/sfc/ptp.c
48246 +++ b/drivers/net/ethernet/sfc/ptp.c
48247 @@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48248 ptp->start.dma_addr);
48249
48250 /* Clear flag that signals MC ready */
48251 - ACCESS_ONCE(*start) = 0;
48252 + ACCESS_ONCE_RW(*start) = 0;
48253 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48254 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48255 EFX_BUG_ON_PARANOID(rc);
48256 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48257 index 08c483b..2c4a553 100644
48258 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48259 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48260 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48261
48262 writel(value, ioaddr + MMC_CNTRL);
48263
48264 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48265 - MMC_CNTRL, value);
48266 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48267 +// MMC_CNTRL, value);
48268 }
48269
48270 /* To mask all all interrupts.*/
48271 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48272 index 2f48f79..8ae1a1a 100644
48273 --- a/drivers/net/hyperv/hyperv_net.h
48274 +++ b/drivers/net/hyperv/hyperv_net.h
48275 @@ -171,7 +171,7 @@ struct rndis_device {
48276 enum rndis_device_state state;
48277 bool link_state;
48278 bool link_change;
48279 - atomic_t new_req_id;
48280 + atomic_unchecked_t new_req_id;
48281
48282 spinlock_t request_lock;
48283 struct list_head req_list;
48284 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48285 index 2b86f0b..ecc996f 100644
48286 --- a/drivers/net/hyperv/rndis_filter.c
48287 +++ b/drivers/net/hyperv/rndis_filter.c
48288 @@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48289 * template
48290 */
48291 set = &rndis_msg->msg.set_req;
48292 - set->req_id = atomic_inc_return(&dev->new_req_id);
48293 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48294
48295 /* Add to the request list */
48296 spin_lock_irqsave(&dev->request_lock, flags);
48297 @@ -911,7 +911,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48298
48299 /* Setup the rndis set */
48300 halt = &request->request_msg.msg.halt_req;
48301 - halt->req_id = atomic_inc_return(&dev->new_req_id);
48302 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48303
48304 /* Ignore return since this msg is optional. */
48305 rndis_filter_send_request(dev, request);
48306 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
48307 index 6cbc56a..5f7e6c8 100644
48308 --- a/drivers/net/ieee802154/fakehard.c
48309 +++ b/drivers/net/ieee802154/fakehard.c
48310 @@ -365,7 +365,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
48311 phy->transmit_power = 0xbf;
48312
48313 dev->netdev_ops = &fake_ops;
48314 - dev->ml_priv = &fake_mlme;
48315 + dev->ml_priv = (void *)&fake_mlme;
48316
48317 priv = netdev_priv(dev);
48318 priv->phy = phy;
48319 diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48320 index 34f846b..4a0d5b1 100644
48321 --- a/drivers/net/ifb.c
48322 +++ b/drivers/net/ifb.c
48323 @@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48324 return 0;
48325 }
48326
48327 -static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48328 +static struct rtnl_link_ops ifb_link_ops = {
48329 .kind = "ifb",
48330 .priv_size = sizeof(struct ifb_private),
48331 .setup = ifb_setup,
48332 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48333 index bfb0b6e..5c396ce 100644
48334 --- a/drivers/net/macvlan.c
48335 +++ b/drivers/net/macvlan.c
48336 @@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48337 free_nskb:
48338 kfree_skb(nskb);
48339 err:
48340 - atomic_long_inc(&skb->dev->rx_dropped);
48341 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48342 }
48343
48344 static void macvlan_flush_sources(struct macvlan_port *port,
48345 @@ -1454,13 +1454,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48346 int macvlan_link_register(struct rtnl_link_ops *ops)
48347 {
48348 /* common fields */
48349 - ops->priv_size = sizeof(struct macvlan_dev);
48350 - ops->validate = macvlan_validate;
48351 - ops->maxtype = IFLA_MACVLAN_MAX;
48352 - ops->policy = macvlan_policy;
48353 - ops->changelink = macvlan_changelink;
48354 - ops->get_size = macvlan_get_size;
48355 - ops->fill_info = macvlan_fill_info;
48356 + pax_open_kernel();
48357 + *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48358 + *(void **)&ops->validate = macvlan_validate;
48359 + *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48360 + *(const void **)&ops->policy = macvlan_policy;
48361 + *(void **)&ops->changelink = macvlan_changelink;
48362 + *(void **)&ops->get_size = macvlan_get_size;
48363 + *(void **)&ops->fill_info = macvlan_fill_info;
48364 + pax_close_kernel();
48365
48366 return rtnl_link_register(ops);
48367 };
48368 @@ -1540,7 +1542,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48369 return NOTIFY_DONE;
48370 }
48371
48372 -static struct notifier_block macvlan_notifier_block __read_mostly = {
48373 +static struct notifier_block macvlan_notifier_block = {
48374 .notifier_call = macvlan_device_event,
48375 };
48376
48377 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48378 index 880cc09..6a68ba6 100644
48379 --- a/drivers/net/macvtap.c
48380 +++ b/drivers/net/macvtap.c
48381 @@ -422,7 +422,7 @@ static void macvtap_setup(struct net_device *dev)
48382 dev->tx_queue_len = TUN_READQ_SIZE;
48383 }
48384
48385 -static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48386 +static struct rtnl_link_ops macvtap_link_ops = {
48387 .kind = "macvtap",
48388 .setup = macvtap_setup,
48389 .newlink = macvtap_newlink,
48390 @@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48391 }
48392
48393 ret = 0;
48394 - if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48395 + if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48396 put_user(q->flags, &ifr->ifr_flags))
48397 ret = -EFAULT;
48398 macvtap_put_vlan(vlan);
48399 @@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48400 return NOTIFY_DONE;
48401 }
48402
48403 -static struct notifier_block macvtap_notifier_block __read_mostly = {
48404 +static struct notifier_block macvtap_notifier_block = {
48405 .notifier_call = macvtap_device_event,
48406 };
48407
48408 diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48409 index 34924df..a747360 100644
48410 --- a/drivers/net/nlmon.c
48411 +++ b/drivers/net/nlmon.c
48412 @@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48413 return 0;
48414 }
48415
48416 -static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48417 +static struct rtnl_link_ops nlmon_link_ops = {
48418 .kind = "nlmon",
48419 .priv_size = sizeof(struct nlmon),
48420 .setup = nlmon_setup,
48421 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48422 index 794a473..9fd437b 100644
48423 --- a/drivers/net/ppp/ppp_generic.c
48424 +++ b/drivers/net/ppp/ppp_generic.c
48425 @@ -1020,7 +1020,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48426 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48427 struct ppp_stats stats;
48428 struct ppp_comp_stats cstats;
48429 - char *vers;
48430
48431 switch (cmd) {
48432 case SIOCGPPPSTATS:
48433 @@ -1042,8 +1041,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48434 break;
48435
48436 case SIOCGPPPVER:
48437 - vers = PPP_VERSION;
48438 - if (copy_to_user(addr, vers, strlen(vers) + 1))
48439 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48440 break;
48441 err = 0;
48442 break;
48443 diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48444 index 079f7ad..b2a2bfa7 100644
48445 --- a/drivers/net/slip/slhc.c
48446 +++ b/drivers/net/slip/slhc.c
48447 @@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48448 register struct tcphdr *thp;
48449 register struct iphdr *ip;
48450 register struct cstate *cs;
48451 - int len, hdrlen;
48452 + long len, hdrlen;
48453 unsigned char *cp = icp;
48454
48455 /* We've got a compressed packet; read the change byte */
48456 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48457 index 2368395..bf6fe96 100644
48458 --- a/drivers/net/team/team.c
48459 +++ b/drivers/net/team/team.c
48460 @@ -2090,7 +2090,7 @@ static unsigned int team_get_num_rx_queues(void)
48461 return TEAM_DEFAULT_NUM_RX_QUEUES;
48462 }
48463
48464 -static struct rtnl_link_ops team_link_ops __read_mostly = {
48465 +static struct rtnl_link_ops team_link_ops = {
48466 .kind = DRV_NAME,
48467 .priv_size = sizeof(struct team),
48468 .setup = team_setup,
48469 @@ -2880,7 +2880,7 @@ static int team_device_event(struct notifier_block *unused,
48470 return NOTIFY_DONE;
48471 }
48472
48473 -static struct notifier_block team_notifier_block __read_mostly = {
48474 +static struct notifier_block team_notifier_block = {
48475 .notifier_call = team_device_event,
48476 };
48477
48478 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48479 index 9dd3746..74f191e 100644
48480 --- a/drivers/net/tun.c
48481 +++ b/drivers/net/tun.c
48482 @@ -1426,7 +1426,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48483 return -EINVAL;
48484 }
48485
48486 -static struct rtnl_link_ops tun_link_ops __read_mostly = {
48487 +static struct rtnl_link_ops tun_link_ops = {
48488 .kind = DRV_NAME,
48489 .priv_size = sizeof(struct tun_struct),
48490 .setup = tun_setup,
48491 @@ -1868,7 +1868,7 @@ unlock:
48492 }
48493
48494 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48495 - unsigned long arg, int ifreq_len)
48496 + unsigned long arg, size_t ifreq_len)
48497 {
48498 struct tun_file *tfile = file->private_data;
48499 struct tun_struct *tun;
48500 @@ -1881,6 +1881,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48501 unsigned int ifindex;
48502 int ret;
48503
48504 + if (ifreq_len > sizeof ifr)
48505 + return -EFAULT;
48506 +
48507 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48508 if (copy_from_user(&ifr, argp, ifreq_len))
48509 return -EFAULT;
48510 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48511 index babda7d..e40c90a 100644
48512 --- a/drivers/net/usb/hso.c
48513 +++ b/drivers/net/usb/hso.c
48514 @@ -71,7 +71,7 @@
48515 #include <asm/byteorder.h>
48516 #include <linux/serial_core.h>
48517 #include <linux/serial.h>
48518 -
48519 +#include <asm/local.h>
48520
48521 #define MOD_AUTHOR "Option Wireless"
48522 #define MOD_DESCRIPTION "USB High Speed Option driver"
48523 @@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48524 struct urb *urb;
48525
48526 urb = serial->rx_urb[0];
48527 - if (serial->port.count > 0) {
48528 + if (atomic_read(&serial->port.count) > 0) {
48529 count = put_rxbuf_data(urb, serial);
48530 if (count == -1)
48531 return;
48532 @@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48533 DUMP1(urb->transfer_buffer, urb->actual_length);
48534
48535 /* Anyone listening? */
48536 - if (serial->port.count == 0)
48537 + if (atomic_read(&serial->port.count) == 0)
48538 return;
48539
48540 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48541 @@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48542 tty_port_tty_set(&serial->port, tty);
48543
48544 /* check for port already opened, if not set the termios */
48545 - serial->port.count++;
48546 - if (serial->port.count == 1) {
48547 + if (atomic_inc_return(&serial->port.count) == 1) {
48548 serial->rx_state = RX_IDLE;
48549 /* Force default termio settings */
48550 _hso_serial_set_termios(tty, NULL);
48551 @@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48552 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48553 if (result) {
48554 hso_stop_serial_device(serial->parent);
48555 - serial->port.count--;
48556 + atomic_dec(&serial->port.count);
48557 kref_put(&serial->parent->ref, hso_serial_ref_free);
48558 }
48559 } else {
48560 @@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48561
48562 /* reset the rts and dtr */
48563 /* do the actual close */
48564 - serial->port.count--;
48565 + atomic_dec(&serial->port.count);
48566
48567 - if (serial->port.count <= 0) {
48568 - serial->port.count = 0;
48569 + if (atomic_read(&serial->port.count) <= 0) {
48570 + atomic_set(&serial->port.count, 0);
48571 tty_port_tty_set(&serial->port, NULL);
48572 if (!usb_gone)
48573 hso_stop_serial_device(serial->parent);
48574 @@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48575
48576 /* the actual setup */
48577 spin_lock_irqsave(&serial->serial_lock, flags);
48578 - if (serial->port.count)
48579 + if (atomic_read(&serial->port.count))
48580 _hso_serial_set_termios(tty, old);
48581 else
48582 tty->termios = *old;
48583 @@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48584 D1("Pending read interrupt on port %d\n", i);
48585 spin_lock(&serial->serial_lock);
48586 if (serial->rx_state == RX_IDLE &&
48587 - serial->port.count > 0) {
48588 + atomic_read(&serial->port.count) > 0) {
48589 /* Setup and send a ctrl req read on
48590 * port i */
48591 if (!serial->rx_urb_filled[0]) {
48592 @@ -3047,7 +3046,7 @@ static int hso_resume(struct usb_interface *iface)
48593 /* Start all serial ports */
48594 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48595 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48596 - if (dev2ser(serial_table[i])->port.count) {
48597 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48598 result =
48599 hso_start_serial_device(serial_table[i], GFP_NOIO);
48600 hso_kick_transmit(dev2ser(serial_table[i]));
48601 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48602 index c6554c7..7e2ebd7 100644
48603 --- a/drivers/net/usb/r8152.c
48604 +++ b/drivers/net/usb/r8152.c
48605 @@ -577,7 +577,7 @@ struct r8152 {
48606 void (*unload)(struct r8152 *);
48607 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48608 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48609 - } rtl_ops;
48610 + } __no_const rtl_ops;
48611
48612 int intr_interval;
48613 u32 saved_wolopts;
48614 diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48615 index a2515887..6d13233 100644
48616 --- a/drivers/net/usb/sierra_net.c
48617 +++ b/drivers/net/usb/sierra_net.c
48618 @@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48619 /* atomic counter partially included in MAC address to make sure 2 devices
48620 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48621 */
48622 -static atomic_t iface_counter = ATOMIC_INIT(0);
48623 +static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48624
48625 /*
48626 * SYNC Timer Delay definition used to set the expiry time
48627 @@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48628 dev->net->netdev_ops = &sierra_net_device_ops;
48629
48630 /* change MAC addr to include, ifacenum, and to be unique */
48631 - dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48632 + dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48633 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48634
48635 /* we will have to manufacture ethernet headers, prepare template */
48636 diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48637 index b0bc8ea..3af931b5 100644
48638 --- a/drivers/net/virtio_net.c
48639 +++ b/drivers/net/virtio_net.c
48640 @@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48641 #define RECEIVE_AVG_WEIGHT 64
48642
48643 /* Minimum alignment for mergeable packet buffers. */
48644 -#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48645 +#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48646
48647 #define VIRTNET_DRIVER_VERSION "1.0.0"
48648
48649 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48650 index 42b2d6a5..2a2cb41 100644
48651 --- a/drivers/net/vxlan.c
48652 +++ b/drivers/net/vxlan.c
48653 @@ -2695,7 +2695,7 @@ nla_put_failure:
48654 return -EMSGSIZE;
48655 }
48656
48657 -static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48658 +static struct rtnl_link_ops vxlan_link_ops = {
48659 .kind = "vxlan",
48660 .maxtype = IFLA_VXLAN_MAX,
48661 .policy = vxlan_policy,
48662 @@ -2742,7 +2742,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48663 return NOTIFY_DONE;
48664 }
48665
48666 -static struct notifier_block vxlan_notifier_block __read_mostly = {
48667 +static struct notifier_block vxlan_notifier_block = {
48668 .notifier_call = vxlan_lowerdev_event,
48669 };
48670
48671 diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48672 index 5920c99..ff2e4a5 100644
48673 --- a/drivers/net/wan/lmc/lmc_media.c
48674 +++ b/drivers/net/wan/lmc/lmc_media.c
48675 @@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48676 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48677
48678 lmc_media_t lmc_ds3_media = {
48679 - lmc_ds3_init, /* special media init stuff */
48680 - lmc_ds3_default, /* reset to default state */
48681 - lmc_ds3_set_status, /* reset status to state provided */
48682 - lmc_dummy_set_1, /* set clock source */
48683 - lmc_dummy_set2_1, /* set line speed */
48684 - lmc_ds3_set_100ft, /* set cable length */
48685 - lmc_ds3_set_scram, /* set scrambler */
48686 - lmc_ds3_get_link_status, /* get link status */
48687 - lmc_dummy_set_1, /* set link status */
48688 - lmc_ds3_set_crc_length, /* set CRC length */
48689 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48690 - lmc_ds3_watchdog
48691 + .init = lmc_ds3_init, /* special media init stuff */
48692 + .defaults = lmc_ds3_default, /* reset to default state */
48693 + .set_status = lmc_ds3_set_status, /* reset status to state provided */
48694 + .set_clock_source = lmc_dummy_set_1, /* set clock source */
48695 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48696 + .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48697 + .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48698 + .get_link_status = lmc_ds3_get_link_status, /* get link status */
48699 + .set_link_status = lmc_dummy_set_1, /* set link status */
48700 + .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48701 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48702 + .watchdog = lmc_ds3_watchdog
48703 };
48704
48705 lmc_media_t lmc_hssi_media = {
48706 - lmc_hssi_init, /* special media init stuff */
48707 - lmc_hssi_default, /* reset to default state */
48708 - lmc_hssi_set_status, /* reset status to state provided */
48709 - lmc_hssi_set_clock, /* set clock source */
48710 - lmc_dummy_set2_1, /* set line speed */
48711 - lmc_dummy_set_1, /* set cable length */
48712 - lmc_dummy_set_1, /* set scrambler */
48713 - lmc_hssi_get_link_status, /* get link status */
48714 - lmc_hssi_set_link_status, /* set link status */
48715 - lmc_hssi_set_crc_length, /* set CRC length */
48716 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48717 - lmc_hssi_watchdog
48718 + .init = lmc_hssi_init, /* special media init stuff */
48719 + .defaults = lmc_hssi_default, /* reset to default state */
48720 + .set_status = lmc_hssi_set_status, /* reset status to state provided */
48721 + .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48722 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48723 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48724 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48725 + .get_link_status = lmc_hssi_get_link_status, /* get link status */
48726 + .set_link_status = lmc_hssi_set_link_status, /* set link status */
48727 + .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
48728 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48729 + .watchdog = lmc_hssi_watchdog
48730 };
48731
48732 -lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
48733 - lmc_ssi_default, /* reset to default state */
48734 - lmc_ssi_set_status, /* reset status to state provided */
48735 - lmc_ssi_set_clock, /* set clock source */
48736 - lmc_ssi_set_speed, /* set line speed */
48737 - lmc_dummy_set_1, /* set cable length */
48738 - lmc_dummy_set_1, /* set scrambler */
48739 - lmc_ssi_get_link_status, /* get link status */
48740 - lmc_ssi_set_link_status, /* set link status */
48741 - lmc_ssi_set_crc_length, /* set CRC length */
48742 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48743 - lmc_ssi_watchdog
48744 +lmc_media_t lmc_ssi_media = {
48745 + .init = lmc_ssi_init, /* special media init stuff */
48746 + .defaults = lmc_ssi_default, /* reset to default state */
48747 + .set_status = lmc_ssi_set_status, /* reset status to state provided */
48748 + .set_clock_source = lmc_ssi_set_clock, /* set clock source */
48749 + .set_speed = lmc_ssi_set_speed, /* set line speed */
48750 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48751 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48752 + .get_link_status = lmc_ssi_get_link_status, /* get link status */
48753 + .set_link_status = lmc_ssi_set_link_status, /* set link status */
48754 + .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
48755 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48756 + .watchdog = lmc_ssi_watchdog
48757 };
48758
48759 lmc_media_t lmc_t1_media = {
48760 - lmc_t1_init, /* special media init stuff */
48761 - lmc_t1_default, /* reset to default state */
48762 - lmc_t1_set_status, /* reset status to state provided */
48763 - lmc_t1_set_clock, /* set clock source */
48764 - lmc_dummy_set2_1, /* set line speed */
48765 - lmc_dummy_set_1, /* set cable length */
48766 - lmc_dummy_set_1, /* set scrambler */
48767 - lmc_t1_get_link_status, /* get link status */
48768 - lmc_dummy_set_1, /* set link status */
48769 - lmc_t1_set_crc_length, /* set CRC length */
48770 - lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48771 - lmc_t1_watchdog
48772 + .init = lmc_t1_init, /* special media init stuff */
48773 + .defaults = lmc_t1_default, /* reset to default state */
48774 + .set_status = lmc_t1_set_status, /* reset status to state provided */
48775 + .set_clock_source = lmc_t1_set_clock, /* set clock source */
48776 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48777 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48778 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48779 + .get_link_status = lmc_t1_get_link_status, /* get link status */
48780 + .set_link_status = lmc_dummy_set_1, /* set link status */
48781 + .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
48782 + .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48783 + .watchdog = lmc_t1_watchdog
48784 };
48785
48786 static void
48787 diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
48788 index feacc3b..5bac0de 100644
48789 --- a/drivers/net/wan/z85230.c
48790 +++ b/drivers/net/wan/z85230.c
48791 @@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
48792
48793 struct z8530_irqhandler z8530_sync =
48794 {
48795 - z8530_rx,
48796 - z8530_tx,
48797 - z8530_status
48798 + .rx = z8530_rx,
48799 + .tx = z8530_tx,
48800 + .status = z8530_status
48801 };
48802
48803 EXPORT_SYMBOL(z8530_sync);
48804 @@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
48805 }
48806
48807 static struct z8530_irqhandler z8530_dma_sync = {
48808 - z8530_dma_rx,
48809 - z8530_dma_tx,
48810 - z8530_dma_status
48811 + .rx = z8530_dma_rx,
48812 + .tx = z8530_dma_tx,
48813 + .status = z8530_dma_status
48814 };
48815
48816 static struct z8530_irqhandler z8530_txdma_sync = {
48817 - z8530_rx,
48818 - z8530_dma_tx,
48819 - z8530_dma_status
48820 + .rx = z8530_rx,
48821 + .tx = z8530_dma_tx,
48822 + .status = z8530_dma_status
48823 };
48824
48825 /**
48826 @@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
48827
48828 struct z8530_irqhandler z8530_nop=
48829 {
48830 - z8530_rx_clear,
48831 - z8530_tx_clear,
48832 - z8530_status_clear
48833 + .rx = z8530_rx_clear,
48834 + .tx = z8530_tx_clear,
48835 + .status = z8530_status_clear
48836 };
48837
48838
48839 diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
48840 index 0b60295..b8bfa5b 100644
48841 --- a/drivers/net/wimax/i2400m/rx.c
48842 +++ b/drivers/net/wimax/i2400m/rx.c
48843 @@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
48844 if (i2400m->rx_roq == NULL)
48845 goto error_roq_alloc;
48846
48847 - rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
48848 + rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
48849 GFP_KERNEL);
48850 if (rd == NULL) {
48851 result = -ENOMEM;
48852 diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
48853 index e71a2ce..2268d61 100644
48854 --- a/drivers/net/wireless/airo.c
48855 +++ b/drivers/net/wireless/airo.c
48856 @@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
48857 struct airo_info *ai = dev->ml_priv;
48858 int ridcode;
48859 int enabled;
48860 - static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48861 + int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48862 unsigned char *iobuf;
48863
48864 /* Only super-user can write RIDs */
48865 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
48866 index da92bfa..5a9001a 100644
48867 --- a/drivers/net/wireless/at76c50x-usb.c
48868 +++ b/drivers/net/wireless/at76c50x-usb.c
48869 @@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
48870 }
48871
48872 /* Convert timeout from the DFU status to jiffies */
48873 -static inline unsigned long at76_get_timeout(struct dfu_status *s)
48874 +static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
48875 {
48876 return msecs_to_jiffies((s->poll_timeout[2] << 16)
48877 | (s->poll_timeout[1] << 8)
48878 diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
48879 index 676bd4e..0b807a3 100644
48880 --- a/drivers/net/wireless/ath/ath10k/htc.c
48881 +++ b/drivers/net/wireless/ath/ath10k/htc.c
48882 @@ -848,7 +848,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
48883 /* registered target arrival callback from the HIF layer */
48884 int ath10k_htc_init(struct ath10k *ar)
48885 {
48886 - struct ath10k_hif_cb htc_callbacks;
48887 + static struct ath10k_hif_cb htc_callbacks = {
48888 + .rx_completion = ath10k_htc_rx_completion_handler,
48889 + .tx_completion = ath10k_htc_tx_completion_handler,
48890 + };
48891 struct ath10k_htc_ep *ep = NULL;
48892 struct ath10k_htc *htc = &ar->htc;
48893
48894 @@ -857,8 +860,6 @@ int ath10k_htc_init(struct ath10k *ar)
48895 ath10k_htc_reset_endpoint_states(htc);
48896
48897 /* setup HIF layer callbacks */
48898 - htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
48899 - htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
48900 htc->ar = ar;
48901
48902 /* Get HIF default pipe for HTC message exchange */
48903 diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
48904 index 527179c..a890150 100644
48905 --- a/drivers/net/wireless/ath/ath10k/htc.h
48906 +++ b/drivers/net/wireless/ath/ath10k/htc.h
48907 @@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
48908
48909 struct ath10k_htc_ops {
48910 void (*target_send_suspend_complete)(struct ath10k *ar);
48911 -};
48912 +} __no_const;
48913
48914 struct ath10k_htc_ep_ops {
48915 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
48916 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
48917 void (*ep_tx_credits)(struct ath10k *);
48918 -};
48919 +} __no_const;
48920
48921 /* service connection information */
48922 struct ath10k_htc_svc_conn_req {
48923 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48924 index 2a93519..7052786 100644
48925 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48926 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48927 @@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48928 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
48929 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
48930
48931 - ACCESS_ONCE(ads->ds_link) = i->link;
48932 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
48933 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
48934 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
48935
48936 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
48937 ctl6 = SM(i->keytype, AR_EncrType);
48938 @@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48939
48940 if ((i->is_first || i->is_last) &&
48941 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
48942 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
48943 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
48944 | set11nTries(i->rates, 1)
48945 | set11nTries(i->rates, 2)
48946 | set11nTries(i->rates, 3)
48947 | (i->dur_update ? AR_DurUpdateEna : 0)
48948 | SM(0, AR_BurstDur);
48949
48950 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
48951 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
48952 | set11nRate(i->rates, 1)
48953 | set11nRate(i->rates, 2)
48954 | set11nRate(i->rates, 3);
48955 } else {
48956 - ACCESS_ONCE(ads->ds_ctl2) = 0;
48957 - ACCESS_ONCE(ads->ds_ctl3) = 0;
48958 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
48959 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
48960 }
48961
48962 if (!i->is_first) {
48963 - ACCESS_ONCE(ads->ds_ctl0) = 0;
48964 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48965 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48966 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
48967 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48968 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48969 return;
48970 }
48971
48972 @@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48973 break;
48974 }
48975
48976 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48977 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48978 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
48979 | SM(i->txpower, AR_XmitPower0)
48980 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
48981 @@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48982 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
48983 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
48984
48985 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48986 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48987 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48988 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48989
48990 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
48991 return;
48992
48993 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48994 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48995 | set11nPktDurRTSCTS(i->rates, 1);
48996
48997 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48998 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48999 | set11nPktDurRTSCTS(i->rates, 3);
49000
49001 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49002 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49003 | set11nRateFlags(i->rates, 1)
49004 | set11nRateFlags(i->rates, 2)
49005 | set11nRateFlags(i->rates, 3)
49006 | SM(i->rtscts_rate, AR_RTSCTSRate);
49007
49008 - ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
49009 - ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
49010 - ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
49011 + ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
49012 + ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
49013 + ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
49014 }
49015
49016 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49017 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49018 index 057b165..98ae88f 100644
49019 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49020 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49021 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49022 (i->qcu << AR_TxQcuNum_S) | desc_len;
49023
49024 checksum += val;
49025 - ACCESS_ONCE(ads->info) = val;
49026 + ACCESS_ONCE_RW(ads->info) = val;
49027
49028 checksum += i->link;
49029 - ACCESS_ONCE(ads->link) = i->link;
49030 + ACCESS_ONCE_RW(ads->link) = i->link;
49031
49032 checksum += i->buf_addr[0];
49033 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49034 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49035 checksum += i->buf_addr[1];
49036 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49037 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49038 checksum += i->buf_addr[2];
49039 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49040 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49041 checksum += i->buf_addr[3];
49042 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49043 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49044
49045 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49046 - ACCESS_ONCE(ads->ctl3) = val;
49047 + ACCESS_ONCE_RW(ads->ctl3) = val;
49048 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49049 - ACCESS_ONCE(ads->ctl5) = val;
49050 + ACCESS_ONCE_RW(ads->ctl5) = val;
49051 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49052 - ACCESS_ONCE(ads->ctl7) = val;
49053 + ACCESS_ONCE_RW(ads->ctl7) = val;
49054 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49055 - ACCESS_ONCE(ads->ctl9) = val;
49056 + ACCESS_ONCE_RW(ads->ctl9) = val;
49057
49058 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49059 - ACCESS_ONCE(ads->ctl10) = checksum;
49060 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
49061
49062 if (i->is_first || i->is_last) {
49063 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49064 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49065 | set11nTries(i->rates, 1)
49066 | set11nTries(i->rates, 2)
49067 | set11nTries(i->rates, 3)
49068 | (i->dur_update ? AR_DurUpdateEna : 0)
49069 | SM(0, AR_BurstDur);
49070
49071 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49072 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49073 | set11nRate(i->rates, 1)
49074 | set11nRate(i->rates, 2)
49075 | set11nRate(i->rates, 3);
49076 } else {
49077 - ACCESS_ONCE(ads->ctl13) = 0;
49078 - ACCESS_ONCE(ads->ctl14) = 0;
49079 + ACCESS_ONCE_RW(ads->ctl13) = 0;
49080 + ACCESS_ONCE_RW(ads->ctl14) = 0;
49081 }
49082
49083 ads->ctl20 = 0;
49084 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49085
49086 ctl17 = SM(i->keytype, AR_EncrType);
49087 if (!i->is_first) {
49088 - ACCESS_ONCE(ads->ctl11) = 0;
49089 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49090 - ACCESS_ONCE(ads->ctl15) = 0;
49091 - ACCESS_ONCE(ads->ctl16) = 0;
49092 - ACCESS_ONCE(ads->ctl17) = ctl17;
49093 - ACCESS_ONCE(ads->ctl18) = 0;
49094 - ACCESS_ONCE(ads->ctl19) = 0;
49095 + ACCESS_ONCE_RW(ads->ctl11) = 0;
49096 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49097 + ACCESS_ONCE_RW(ads->ctl15) = 0;
49098 + ACCESS_ONCE_RW(ads->ctl16) = 0;
49099 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49100 + ACCESS_ONCE_RW(ads->ctl18) = 0;
49101 + ACCESS_ONCE_RW(ads->ctl19) = 0;
49102 return;
49103 }
49104
49105 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49106 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49107 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49108 | SM(i->txpower, AR_XmitPower0)
49109 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49110 @@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49111 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49112 ctl12 |= SM(val, AR_PAPRDChainMask);
49113
49114 - ACCESS_ONCE(ads->ctl12) = ctl12;
49115 - ACCESS_ONCE(ads->ctl17) = ctl17;
49116 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49117 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49118
49119 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49120 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49121 | set11nPktDurRTSCTS(i->rates, 1);
49122
49123 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49124 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49125 | set11nPktDurRTSCTS(i->rates, 3);
49126
49127 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49128 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49129 | set11nRateFlags(i->rates, 1)
49130 | set11nRateFlags(i->rates, 2)
49131 | set11nRateFlags(i->rates, 3)
49132 | SM(i->rtscts_rate, AR_RTSCTSRate);
49133
49134 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49135 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49136
49137 - ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49138 - ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49139 - ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49140 + ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49141 + ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49142 + ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49143 }
49144
49145 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49146 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49147 index 975074f..e9440da 100644
49148 --- a/drivers/net/wireless/ath/ath9k/hw.h
49149 +++ b/drivers/net/wireless/ath/ath9k/hw.h
49150 @@ -630,7 +630,7 @@ struct ath_hw_private_ops {
49151
49152 /* ANI */
49153 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49154 -};
49155 +} __no_const;
49156
49157 /**
49158 * struct ath_spec_scan - parameters for Atheros spectral scan
49159 @@ -708,7 +708,7 @@ struct ath_hw_ops {
49160 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49161 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49162 #endif
49163 -};
49164 +} __no_const;
49165
49166 struct ath_nf_limits {
49167 s16 max;
49168 diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49169 index 4f18a6b..b07d92f 100644
49170 --- a/drivers/net/wireless/ath/ath9k/main.c
49171 +++ b/drivers/net/wireless/ath/ath9k/main.c
49172 @@ -2454,16 +2454,18 @@ void ath9k_fill_chanctx_ops(void)
49173 if (!ath9k_is_chanctx_enabled())
49174 return;
49175
49176 - ath9k_ops.hw_scan = ath9k_hw_scan;
49177 - ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49178 - ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49179 - ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49180 - ath9k_ops.add_chanctx = ath9k_add_chanctx;
49181 - ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49182 - ath9k_ops.change_chanctx = ath9k_change_chanctx;
49183 - ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49184 - ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49185 - ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49186 + pax_open_kernel();
49187 + *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49188 + *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49189 + *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49190 + *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49191 + *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49192 + *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49193 + *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49194 + *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49195 + *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49196 + *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49197 + pax_close_kernel();
49198 }
49199
49200 #endif
49201 diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49202 index 058a9f2..d5cb1ba 100644
49203 --- a/drivers/net/wireless/b43/phy_lp.c
49204 +++ b/drivers/net/wireless/b43/phy_lp.c
49205 @@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49206 {
49207 struct ssb_bus *bus = dev->dev->sdev->bus;
49208
49209 - static const struct b206x_channel *chandata = NULL;
49210 + const struct b206x_channel *chandata = NULL;
49211 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49212 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49213 u16 old_comm15, scale;
49214 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49215 index dc1d20c..f7a4f06 100644
49216 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
49217 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49218 @@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49219 */
49220 if (il3945_mod_params.disable_hw_scan) {
49221 D_INFO("Disabling hw_scan\n");
49222 - il3945_mac_ops.hw_scan = NULL;
49223 + pax_open_kernel();
49224 + *(void **)&il3945_mac_ops.hw_scan = NULL;
49225 + pax_close_kernel();
49226 }
49227
49228 D_INFO("*** LOAD DRIVER ***\n");
49229 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49230 index 0ffb6ff..c0b7f0e 100644
49231 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49232 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49233 @@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49234 {
49235 struct iwl_priv *priv = file->private_data;
49236 char buf[64];
49237 - int buf_size;
49238 + size_t buf_size;
49239 u32 offset, len;
49240
49241 memset(buf, 0, sizeof(buf));
49242 @@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49243 struct iwl_priv *priv = file->private_data;
49244
49245 char buf[8];
49246 - int buf_size;
49247 + size_t buf_size;
49248 u32 reset_flag;
49249
49250 memset(buf, 0, sizeof(buf));
49251 @@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49252 {
49253 struct iwl_priv *priv = file->private_data;
49254 char buf[8];
49255 - int buf_size;
49256 + size_t buf_size;
49257 int ht40;
49258
49259 memset(buf, 0, sizeof(buf));
49260 @@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49261 {
49262 struct iwl_priv *priv = file->private_data;
49263 char buf[8];
49264 - int buf_size;
49265 + size_t buf_size;
49266 int value;
49267
49268 memset(buf, 0, sizeof(buf));
49269 @@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49270 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49271 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49272
49273 -static const char *fmt_value = " %-30s %10u\n";
49274 -static const char *fmt_hex = " %-30s 0x%02X\n";
49275 -static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49276 -static const char *fmt_header =
49277 +static const char fmt_value[] = " %-30s %10u\n";
49278 +static const char fmt_hex[] = " %-30s 0x%02X\n";
49279 +static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49280 +static const char fmt_header[] =
49281 "%-32s current cumulative delta max\n";
49282
49283 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49284 @@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49285 {
49286 struct iwl_priv *priv = file->private_data;
49287 char buf[8];
49288 - int buf_size;
49289 + size_t buf_size;
49290 int clear;
49291
49292 memset(buf, 0, sizeof(buf));
49293 @@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49294 {
49295 struct iwl_priv *priv = file->private_data;
49296 char buf[8];
49297 - int buf_size;
49298 + size_t buf_size;
49299 int trace;
49300
49301 memset(buf, 0, sizeof(buf));
49302 @@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49303 {
49304 struct iwl_priv *priv = file->private_data;
49305 char buf[8];
49306 - int buf_size;
49307 + size_t buf_size;
49308 int missed;
49309
49310 memset(buf, 0, sizeof(buf));
49311 @@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49312
49313 struct iwl_priv *priv = file->private_data;
49314 char buf[8];
49315 - int buf_size;
49316 + size_t buf_size;
49317 int plcp;
49318
49319 memset(buf, 0, sizeof(buf));
49320 @@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49321
49322 struct iwl_priv *priv = file->private_data;
49323 char buf[8];
49324 - int buf_size;
49325 + size_t buf_size;
49326 int flush;
49327
49328 memset(buf, 0, sizeof(buf));
49329 @@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49330
49331 struct iwl_priv *priv = file->private_data;
49332 char buf[8];
49333 - int buf_size;
49334 + size_t buf_size;
49335 int rts;
49336
49337 if (!priv->cfg->ht_params)
49338 @@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49339 {
49340 struct iwl_priv *priv = file->private_data;
49341 char buf[8];
49342 - int buf_size;
49343 + size_t buf_size;
49344
49345 memset(buf, 0, sizeof(buf));
49346 buf_size = min(count, sizeof(buf) - 1);
49347 @@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49348 struct iwl_priv *priv = file->private_data;
49349 u32 event_log_flag;
49350 char buf[8];
49351 - int buf_size;
49352 + size_t buf_size;
49353
49354 /* check that the interface is up */
49355 if (!iwl_is_ready(priv))
49356 @@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49357 struct iwl_priv *priv = file->private_data;
49358 char buf[8];
49359 u32 calib_disabled;
49360 - int buf_size;
49361 + size_t buf_size;
49362
49363 memset(buf, 0, sizeof(buf));
49364 buf_size = min(count, sizeof(buf) - 1);
49365 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49366 index dd2f3f8..fb1ae88 100644
49367 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49368 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49369 @@ -1689,7 +1689,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49370 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49371
49372 char buf[8];
49373 - int buf_size;
49374 + size_t buf_size;
49375 u32 reset_flag;
49376
49377 memset(buf, 0, sizeof(buf));
49378 @@ -1710,7 +1710,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49379 {
49380 struct iwl_trans *trans = file->private_data;
49381 char buf[8];
49382 - int buf_size;
49383 + size_t buf_size;
49384 int csr;
49385
49386 memset(buf, 0, sizeof(buf));
49387 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49388 index c9ad4cf..49a2fa0 100644
49389 --- a/drivers/net/wireless/mac80211_hwsim.c
49390 +++ b/drivers/net/wireless/mac80211_hwsim.c
49391 @@ -2577,20 +2577,20 @@ static int __init init_mac80211_hwsim(void)
49392 if (channels < 1)
49393 return -EINVAL;
49394
49395 - mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49396 - mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49397 - mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49398 - mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49399 - mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49400 - mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49401 - mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49402 - mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49403 - mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49404 - mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49405 - mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49406 - mac80211_hwsim_assign_vif_chanctx;
49407 - mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49408 - mac80211_hwsim_unassign_vif_chanctx;
49409 + pax_open_kernel();
49410 + memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49411 + *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49412 + *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49413 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49414 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49415 + *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49416 + *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49417 + *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49418 + *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49419 + *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49420 + *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49421 + *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49422 + pax_close_kernel();
49423
49424 spin_lock_init(&hwsim_radio_lock);
49425 INIT_LIST_HEAD(&hwsim_radios);
49426 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49427 index 1a4facd..a2ecbbd 100644
49428 --- a/drivers/net/wireless/rndis_wlan.c
49429 +++ b/drivers/net/wireless/rndis_wlan.c
49430 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49431
49432 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49433
49434 - if (rts_threshold < 0 || rts_threshold > 2347)
49435 + if (rts_threshold > 2347)
49436 rts_threshold = 2347;
49437
49438 tmp = cpu_to_le32(rts_threshold);
49439 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49440 index d13f25c..2573994 100644
49441 --- a/drivers/net/wireless/rt2x00/rt2x00.h
49442 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
49443 @@ -375,7 +375,7 @@ struct rt2x00_intf {
49444 * for hardware which doesn't support hardware
49445 * sequence counting.
49446 */
49447 - atomic_t seqno;
49448 + atomic_unchecked_t seqno;
49449 };
49450
49451 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49452 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49453 index 66ff364..3ce34f7 100644
49454 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49455 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49456 @@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49457 * sequence counter given by mac80211.
49458 */
49459 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49460 - seqno = atomic_add_return(0x10, &intf->seqno);
49461 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49462 else
49463 - seqno = atomic_read(&intf->seqno);
49464 + seqno = atomic_read_unchecked(&intf->seqno);
49465
49466 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49467 hdr->seq_ctrl |= cpu_to_le16(seqno);
49468 diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49469 index b661f896..ddf7d2b 100644
49470 --- a/drivers/net/wireless/ti/wl1251/sdio.c
49471 +++ b/drivers/net/wireless/ti/wl1251/sdio.c
49472 @@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49473
49474 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49475
49476 - wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49477 - wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49478 + pax_open_kernel();
49479 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49480 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49481 + pax_close_kernel();
49482
49483 wl1251_info("using dedicated interrupt line");
49484 } else {
49485 - wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49486 - wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49487 + pax_open_kernel();
49488 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49489 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49490 + pax_close_kernel();
49491
49492 wl1251_info("using SDIO interrupt");
49493 }
49494 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49495 index 0bccf12..3d95068 100644
49496 --- a/drivers/net/wireless/ti/wl12xx/main.c
49497 +++ b/drivers/net/wireless/ti/wl12xx/main.c
49498 @@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49499 sizeof(wl->conf.mem));
49500
49501 /* read data preparation is only needed by wl127x */
49502 - wl->ops->prepare_read = wl127x_prepare_read;
49503 + pax_open_kernel();
49504 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49505 + pax_close_kernel();
49506
49507 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49508 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49509 @@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49510 sizeof(wl->conf.mem));
49511
49512 /* read data preparation is only needed by wl127x */
49513 - wl->ops->prepare_read = wl127x_prepare_read;
49514 + pax_open_kernel();
49515 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49516 + pax_close_kernel();
49517
49518 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49519 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49520 diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49521 index 7af1936..128bb35 100644
49522 --- a/drivers/net/wireless/ti/wl18xx/main.c
49523 +++ b/drivers/net/wireless/ti/wl18xx/main.c
49524 @@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49525 }
49526
49527 if (!checksum_param) {
49528 - wl18xx_ops.set_rx_csum = NULL;
49529 - wl18xx_ops.init_vif = NULL;
49530 + pax_open_kernel();
49531 + *(void **)&wl18xx_ops.set_rx_csum = NULL;
49532 + *(void **)&wl18xx_ops.init_vif = NULL;
49533 + pax_close_kernel();
49534 }
49535
49536 /* Enable 11a Band only if we have 5G antennas */
49537 diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49538 index a912dc0..a8225ba 100644
49539 --- a/drivers/net/wireless/zd1211rw/zd_usb.c
49540 +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49541 @@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49542 {
49543 struct zd_usb *usb = urb->context;
49544 struct zd_usb_interrupt *intr = &usb->intr;
49545 - int len;
49546 + unsigned int len;
49547 u16 int_num;
49548
49549 ZD_ASSERT(in_interrupt());
49550 diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49551 index 683671a..4519fc2 100644
49552 --- a/drivers/nfc/nfcwilink.c
49553 +++ b/drivers/nfc/nfcwilink.c
49554 @@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49555
49556 static int nfcwilink_probe(struct platform_device *pdev)
49557 {
49558 - static struct nfcwilink *drv;
49559 + struct nfcwilink *drv;
49560 int rc;
49561 __u32 protocols;
49562
49563 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49564 index d93b2b6..ae50401 100644
49565 --- a/drivers/oprofile/buffer_sync.c
49566 +++ b/drivers/oprofile/buffer_sync.c
49567 @@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49568 if (cookie == NO_COOKIE)
49569 offset = pc;
49570 if (cookie == INVALID_COOKIE) {
49571 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49572 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49573 offset = pc;
49574 }
49575 if (cookie != last_cookie) {
49576 @@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49577 /* add userspace sample */
49578
49579 if (!mm) {
49580 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
49581 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49582 return 0;
49583 }
49584
49585 cookie = lookup_dcookie(mm, s->eip, &offset);
49586
49587 if (cookie == INVALID_COOKIE) {
49588 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49589 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49590 return 0;
49591 }
49592
49593 @@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49594 /* ignore backtraces if failed to add a sample */
49595 if (state == sb_bt_start) {
49596 state = sb_bt_ignore;
49597 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49598 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49599 }
49600 }
49601 release_mm(mm);
49602 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49603 index c0cc4e7..44d4e54 100644
49604 --- a/drivers/oprofile/event_buffer.c
49605 +++ b/drivers/oprofile/event_buffer.c
49606 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49607 }
49608
49609 if (buffer_pos == buffer_size) {
49610 - atomic_inc(&oprofile_stats.event_lost_overflow);
49611 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49612 return;
49613 }
49614
49615 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49616 index ed2c3ec..deda85a 100644
49617 --- a/drivers/oprofile/oprof.c
49618 +++ b/drivers/oprofile/oprof.c
49619 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49620 if (oprofile_ops.switch_events())
49621 return;
49622
49623 - atomic_inc(&oprofile_stats.multiplex_counter);
49624 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49625 start_switch_worker();
49626 }
49627
49628 diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49629 index ee2cfce..7f8f699 100644
49630 --- a/drivers/oprofile/oprofile_files.c
49631 +++ b/drivers/oprofile/oprofile_files.c
49632 @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49633
49634 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49635
49636 -static ssize_t timeout_read(struct file *file, char __user *buf,
49637 +static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49638 size_t count, loff_t *offset)
49639 {
49640 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49641 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49642 index 59659ce..6c860a0 100644
49643 --- a/drivers/oprofile/oprofile_stats.c
49644 +++ b/drivers/oprofile/oprofile_stats.c
49645 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49646 cpu_buf->sample_invalid_eip = 0;
49647 }
49648
49649 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49650 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49651 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
49652 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49653 - atomic_set(&oprofile_stats.multiplex_counter, 0);
49654 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49655 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49656 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49657 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49658 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49659 }
49660
49661
49662 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49663 index 1fc622b..8c48fc3 100644
49664 --- a/drivers/oprofile/oprofile_stats.h
49665 +++ b/drivers/oprofile/oprofile_stats.h
49666 @@ -13,11 +13,11 @@
49667 #include <linux/atomic.h>
49668
49669 struct oprofile_stat_struct {
49670 - atomic_t sample_lost_no_mm;
49671 - atomic_t sample_lost_no_mapping;
49672 - atomic_t bt_lost_no_mapping;
49673 - atomic_t event_lost_overflow;
49674 - atomic_t multiplex_counter;
49675 + atomic_unchecked_t sample_lost_no_mm;
49676 + atomic_unchecked_t sample_lost_no_mapping;
49677 + atomic_unchecked_t bt_lost_no_mapping;
49678 + atomic_unchecked_t event_lost_overflow;
49679 + atomic_unchecked_t multiplex_counter;
49680 };
49681
49682 extern struct oprofile_stat_struct oprofile_stats;
49683 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49684 index 3f49345..c750d0b 100644
49685 --- a/drivers/oprofile/oprofilefs.c
49686 +++ b/drivers/oprofile/oprofilefs.c
49687 @@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49688
49689 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49690 {
49691 - atomic_t *val = file->private_data;
49692 - return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49693 + atomic_unchecked_t *val = file->private_data;
49694 + return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
49695 }
49696
49697
49698 @@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
49699
49700
49701 int oprofilefs_create_ro_atomic(struct dentry *root,
49702 - char const *name, atomic_t *val)
49703 + char const *name, atomic_unchecked_t *val)
49704 {
49705 return __oprofilefs_create_file(root, name,
49706 &atomic_ro_fops, 0444, val);
49707 diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
49708 index bdef916..88c7dee 100644
49709 --- a/drivers/oprofile/timer_int.c
49710 +++ b/drivers/oprofile/timer_int.c
49711 @@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
49712 return NOTIFY_OK;
49713 }
49714
49715 -static struct notifier_block __refdata oprofile_cpu_notifier = {
49716 +static struct notifier_block oprofile_cpu_notifier = {
49717 .notifier_call = oprofile_cpu_notify,
49718 };
49719
49720 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
49721 index 3b47080..6cd05dd 100644
49722 --- a/drivers/parport/procfs.c
49723 +++ b/drivers/parport/procfs.c
49724 @@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
49725
49726 *ppos += len;
49727
49728 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
49729 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
49730 }
49731
49732 #ifdef CONFIG_PARPORT_1284
49733 @@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
49734
49735 *ppos += len;
49736
49737 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
49738 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
49739 }
49740 #endif /* IEEE1284.3 support. */
49741
49742 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
49743 index 6ca2399..68d866b 100644
49744 --- a/drivers/pci/hotplug/acpiphp_ibm.c
49745 +++ b/drivers/pci/hotplug/acpiphp_ibm.c
49746 @@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
49747 goto init_cleanup;
49748 }
49749
49750 - ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49751 + pax_open_kernel();
49752 + *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49753 + pax_close_kernel();
49754 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
49755
49756 return retval;
49757 diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
49758 index 66b7bbe..26bee78 100644
49759 --- a/drivers/pci/hotplug/cpcihp_generic.c
49760 +++ b/drivers/pci/hotplug/cpcihp_generic.c
49761 @@ -73,7 +73,6 @@ static u16 port;
49762 static unsigned int enum_bit;
49763 static u8 enum_mask;
49764
49765 -static struct cpci_hp_controller_ops generic_hpc_ops;
49766 static struct cpci_hp_controller generic_hpc;
49767
49768 static int __init validate_parameters(void)
49769 @@ -139,6 +138,10 @@ static int query_enum(void)
49770 return ((value & enum_mask) == enum_mask);
49771 }
49772
49773 +static struct cpci_hp_controller_ops generic_hpc_ops = {
49774 + .query_enum = query_enum,
49775 +};
49776 +
49777 static int __init cpcihp_generic_init(void)
49778 {
49779 int status;
49780 @@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
49781 pci_dev_put(dev);
49782
49783 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
49784 - generic_hpc_ops.query_enum = query_enum;
49785 generic_hpc.ops = &generic_hpc_ops;
49786
49787 status = cpci_hp_register_controller(&generic_hpc);
49788 diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
49789 index 7ecf34e..effed62 100644
49790 --- a/drivers/pci/hotplug/cpcihp_zt5550.c
49791 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c
49792 @@ -59,7 +59,6 @@
49793 /* local variables */
49794 static bool debug;
49795 static bool poll;
49796 -static struct cpci_hp_controller_ops zt5550_hpc_ops;
49797 static struct cpci_hp_controller zt5550_hpc;
49798
49799 /* Primary cPCI bus bridge device */
49800 @@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
49801 return 0;
49802 }
49803
49804 +static struct cpci_hp_controller_ops zt5550_hpc_ops = {
49805 + .query_enum = zt5550_hc_query_enum,
49806 +};
49807 +
49808 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
49809 {
49810 int status;
49811 @@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
49812 dbg("returned from zt5550_hc_config");
49813
49814 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
49815 - zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
49816 zt5550_hpc.ops = &zt5550_hpc_ops;
49817 if (!poll) {
49818 zt5550_hpc.irq = hc_dev->irq;
49819 zt5550_hpc.irq_flags = IRQF_SHARED;
49820 zt5550_hpc.dev_id = hc_dev;
49821
49822 - zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49823 - zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49824 - zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49825 + pax_open_kernel();
49826 + *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49827 + *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49828 + *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49829 + pax_open_kernel();
49830 } else {
49831 info("using ENUM# polling mode");
49832 }
49833 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
49834 index 1e08ff8c..3cd145f 100644
49835 --- a/drivers/pci/hotplug/cpqphp_nvram.c
49836 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
49837 @@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
49838
49839 void compaq_nvram_init (void __iomem *rom_start)
49840 {
49841 +#ifndef CONFIG_PAX_KERNEXEC
49842 if (rom_start)
49843 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
49844 +#endif
49845
49846 dbg("int15 entry = %p\n", compaq_int15_entry_point);
49847
49848 diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
49849 index 56d8486..f26113f 100644
49850 --- a/drivers/pci/hotplug/pci_hotplug_core.c
49851 +++ b/drivers/pci/hotplug/pci_hotplug_core.c
49852 @@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
49853 return -EINVAL;
49854 }
49855
49856 - slot->ops->owner = owner;
49857 - slot->ops->mod_name = mod_name;
49858 + pax_open_kernel();
49859 + *(struct module **)&slot->ops->owner = owner;
49860 + *(const char **)&slot->ops->mod_name = mod_name;
49861 + pax_close_kernel();
49862
49863 mutex_lock(&pci_hp_mutex);
49864 /*
49865 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
49866 index 07aa722..84514b4 100644
49867 --- a/drivers/pci/hotplug/pciehp_core.c
49868 +++ b/drivers/pci/hotplug/pciehp_core.c
49869 @@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
49870 struct slot *slot = ctrl->slot;
49871 struct hotplug_slot *hotplug = NULL;
49872 struct hotplug_slot_info *info = NULL;
49873 - struct hotplug_slot_ops *ops = NULL;
49874 + hotplug_slot_ops_no_const *ops = NULL;
49875 char name[SLOT_NAME_SIZE];
49876 int retval = -ENOMEM;
49877
49878 diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
49879 index 084587d..4a8f9df 100644
49880 --- a/drivers/pci/msi.c
49881 +++ b/drivers/pci/msi.c
49882 @@ -488,8 +488,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
49883 {
49884 struct attribute **msi_attrs;
49885 struct attribute *msi_attr;
49886 - struct device_attribute *msi_dev_attr;
49887 - struct attribute_group *msi_irq_group;
49888 + device_attribute_no_const *msi_dev_attr;
49889 + attribute_group_no_const *msi_irq_group;
49890 const struct attribute_group **msi_irq_groups;
49891 struct msi_desc *entry;
49892 int ret = -ENOMEM;
49893 @@ -549,7 +549,7 @@ error_attrs:
49894 count = 0;
49895 msi_attr = msi_attrs[count];
49896 while (msi_attr) {
49897 - msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
49898 + msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
49899 kfree(msi_attr->name);
49900 kfree(msi_dev_attr);
49901 ++count;
49902 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
49903 index 2c6643f..3a6d8e0 100644
49904 --- a/drivers/pci/pci-sysfs.c
49905 +++ b/drivers/pci/pci-sysfs.c
49906 @@ -1133,7 +1133,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
49907 {
49908 /* allocate attribute structure, piggyback attribute name */
49909 int name_len = write_combine ? 13 : 10;
49910 - struct bin_attribute *res_attr;
49911 + bin_attribute_no_const *res_attr;
49912 int retval;
49913
49914 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
49915 @@ -1310,7 +1310,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
49916 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
49917 {
49918 int retval;
49919 - struct bin_attribute *attr;
49920 + bin_attribute_no_const *attr;
49921
49922 /* If the device has VPD, try to expose it in sysfs. */
49923 if (dev->vpd) {
49924 @@ -1357,7 +1357,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
49925 {
49926 int retval;
49927 int rom_size = 0;
49928 - struct bin_attribute *attr;
49929 + bin_attribute_no_const *attr;
49930
49931 if (!sysfs_initialized)
49932 return -EACCES;
49933 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
49934 index 4a3902d..7f1fc42 100644
49935 --- a/drivers/pci/pci.h
49936 +++ b/drivers/pci/pci.h
49937 @@ -93,7 +93,7 @@ struct pci_vpd_ops {
49938 struct pci_vpd {
49939 unsigned int len;
49940 const struct pci_vpd_ops *ops;
49941 - struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
49942 + bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
49943 };
49944
49945 int pci_vpd_pci22_init(struct pci_dev *dev);
49946 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
49947 index e1e7026..d28dd33 100644
49948 --- a/drivers/pci/pcie/aspm.c
49949 +++ b/drivers/pci/pcie/aspm.c
49950 @@ -27,9 +27,9 @@
49951 #define MODULE_PARAM_PREFIX "pcie_aspm."
49952
49953 /* Note: those are not register definitions */
49954 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
49955 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
49956 -#define ASPM_STATE_L1 (4) /* L1 state */
49957 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
49958 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
49959 +#define ASPM_STATE_L1 (4U) /* L1 state */
49960 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
49961 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
49962
49963 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
49964 index c8ca98c..b1bc005 100644
49965 --- a/drivers/pci/probe.c
49966 +++ b/drivers/pci/probe.c
49967 @@ -177,7 +177,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
49968 struct pci_bus_region region, inverted_region;
49969 bool bar_too_big = false, bar_too_high = false, bar_invalid = false;
49970
49971 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
49972 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
49973
49974 /* No printks while decoding is disabled! */
49975 if (!dev->mmio_always_on) {
49976 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
49977 index 3f155e7..0f4b1f0 100644
49978 --- a/drivers/pci/proc.c
49979 +++ b/drivers/pci/proc.c
49980 @@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
49981 static int __init pci_proc_init(void)
49982 {
49983 struct pci_dev *dev = NULL;
49984 +
49985 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
49986 +#ifdef CONFIG_GRKERNSEC_PROC_USER
49987 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
49988 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49989 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
49990 +#endif
49991 +#else
49992 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
49993 +#endif
49994 proc_create("devices", 0, proc_bus_pci_dir,
49995 &proc_bus_pci_dev_operations);
49996 proc_initialized = 1;
49997 diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
49998 index d866db8..c827d1f 100644
49999 --- a/drivers/platform/chrome/chromeos_laptop.c
50000 +++ b/drivers/platform/chrome/chromeos_laptop.c
50001 @@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
50002 .callback = chromeos_laptop_dmi_matched, \
50003 .driver_data = (void *)&board_
50004
50005 -static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
50006 +static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
50007 {
50008 .ident = "Samsung Series 5 550",
50009 .matches = {
50010 diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
50011 index c5af23b..3d62d5e 100644
50012 --- a/drivers/platform/x86/alienware-wmi.c
50013 +++ b/drivers/platform/x86/alienware-wmi.c
50014 @@ -150,7 +150,7 @@ struct wmax_led_args {
50015 } __packed;
50016
50017 static struct platform_device *platform_device;
50018 -static struct device_attribute *zone_dev_attrs;
50019 +static device_attribute_no_const *zone_dev_attrs;
50020 static struct attribute **zone_attrs;
50021 static struct platform_zone *zone_data;
50022
50023 @@ -161,7 +161,7 @@ static struct platform_driver platform_driver = {
50024 }
50025 };
50026
50027 -static struct attribute_group zone_attribute_group = {
50028 +static attribute_group_no_const zone_attribute_group = {
50029 .name = "rgb_zones",
50030 };
50031
50032 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
50033 index 21fc932..ee9394a 100644
50034 --- a/drivers/platform/x86/asus-wmi.c
50035 +++ b/drivers/platform/x86/asus-wmi.c
50036 @@ -1590,6 +1590,10 @@ static int show_dsts(struct seq_file *m, void *data)
50037 int err;
50038 u32 retval = -1;
50039
50040 +#ifdef CONFIG_GRKERNSEC_KMEM
50041 + return -EPERM;
50042 +#endif
50043 +
50044 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50045
50046 if (err < 0)
50047 @@ -1606,6 +1610,10 @@ static int show_devs(struct seq_file *m, void *data)
50048 int err;
50049 u32 retval = -1;
50050
50051 +#ifdef CONFIG_GRKERNSEC_KMEM
50052 + return -EPERM;
50053 +#endif
50054 +
50055 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50056 &retval);
50057
50058 @@ -1630,6 +1638,10 @@ static int show_call(struct seq_file *m, void *data)
50059 union acpi_object *obj;
50060 acpi_status status;
50061
50062 +#ifdef CONFIG_GRKERNSEC_KMEM
50063 + return -EPERM;
50064 +#endif
50065 +
50066 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50067 1, asus->debug.method_id,
50068 &input, &output);
50069 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50070 index 62f8030..c7f2a45 100644
50071 --- a/drivers/platform/x86/msi-laptop.c
50072 +++ b/drivers/platform/x86/msi-laptop.c
50073 @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50074
50075 if (!quirks->ec_read_only) {
50076 /* allow userland write sysfs file */
50077 - dev_attr_bluetooth.store = store_bluetooth;
50078 - dev_attr_wlan.store = store_wlan;
50079 - dev_attr_threeg.store = store_threeg;
50080 - dev_attr_bluetooth.attr.mode |= S_IWUSR;
50081 - dev_attr_wlan.attr.mode |= S_IWUSR;
50082 - dev_attr_threeg.attr.mode |= S_IWUSR;
50083 + pax_open_kernel();
50084 + *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50085 + *(void **)&dev_attr_wlan.store = store_wlan;
50086 + *(void **)&dev_attr_threeg.store = store_threeg;
50087 + *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50088 + *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50089 + *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50090 + pax_close_kernel();
50091 }
50092
50093 /* disable hardware control by fn key */
50094 diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50095 index 70222f2..8c8ce66 100644
50096 --- a/drivers/platform/x86/msi-wmi.c
50097 +++ b/drivers/platform/x86/msi-wmi.c
50098 @@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50099 static void msi_wmi_notify(u32 value, void *context)
50100 {
50101 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50102 - static struct key_entry *key;
50103 + struct key_entry *key;
50104 union acpi_object *obj;
50105 acpi_status status;
50106
50107 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50108 index 26ad9ff..7c52909 100644
50109 --- a/drivers/platform/x86/sony-laptop.c
50110 +++ b/drivers/platform/x86/sony-laptop.c
50111 @@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50112 }
50113
50114 /* High speed charging function */
50115 -static struct device_attribute *hsc_handle;
50116 +static device_attribute_no_const *hsc_handle;
50117
50118 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50119 struct device_attribute *attr,
50120 @@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50121 }
50122
50123 /* low battery function */
50124 -static struct device_attribute *lowbatt_handle;
50125 +static device_attribute_no_const *lowbatt_handle;
50126
50127 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50128 struct device_attribute *attr,
50129 @@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50130 }
50131
50132 /* fan speed function */
50133 -static struct device_attribute *fan_handle, *hsf_handle;
50134 +static device_attribute_no_const *fan_handle, *hsf_handle;
50135
50136 static ssize_t sony_nc_hsfan_store(struct device *dev,
50137 struct device_attribute *attr,
50138 @@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50139 }
50140
50141 /* USB charge function */
50142 -static struct device_attribute *uc_handle;
50143 +static device_attribute_no_const *uc_handle;
50144
50145 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50146 struct device_attribute *attr,
50147 @@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50148 }
50149
50150 /* Panel ID function */
50151 -static struct device_attribute *panel_handle;
50152 +static device_attribute_no_const *panel_handle;
50153
50154 static ssize_t sony_nc_panelid_show(struct device *dev,
50155 struct device_attribute *attr, char *buffer)
50156 @@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50157 }
50158
50159 /* smart connect function */
50160 -static struct device_attribute *sc_handle;
50161 +static device_attribute_no_const *sc_handle;
50162
50163 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50164 struct device_attribute *attr,
50165 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50166 index cf0f893..5955997 100644
50167 --- a/drivers/platform/x86/thinkpad_acpi.c
50168 +++ b/drivers/platform/x86/thinkpad_acpi.c
50169 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
50170 return 0;
50171 }
50172
50173 -void static hotkey_mask_warn_incomplete_mask(void)
50174 +static void hotkey_mask_warn_incomplete_mask(void)
50175 {
50176 /* log only what the user can fix... */
50177 const u32 wantedmask = hotkey_driver_mask &
50178 @@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50179 && !tp_features.bright_unkfw)
50180 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50181 }
50182 +}
50183
50184 #undef TPACPI_COMPARE_KEY
50185 #undef TPACPI_MAY_SEND_KEY
50186 -}
50187
50188 /*
50189 * Polling driver
50190 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50191 index 438d4c7..ca8a2fb 100644
50192 --- a/drivers/pnp/pnpbios/bioscalls.c
50193 +++ b/drivers/pnp/pnpbios/bioscalls.c
50194 @@ -59,7 +59,7 @@ do { \
50195 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50196 } while(0)
50197
50198 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50199 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50200 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50201
50202 /*
50203 @@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50204
50205 cpu = get_cpu();
50206 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50207 +
50208 + pax_open_kernel();
50209 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50210 + pax_close_kernel();
50211
50212 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50213 spin_lock_irqsave(&pnp_bios_lock, flags);
50214 @@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50215 :"memory");
50216 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50217
50218 + pax_open_kernel();
50219 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50220 + pax_close_kernel();
50221 +
50222 put_cpu();
50223
50224 /* If we get here and this is set then the PnP BIOS faulted on us. */
50225 @@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50226 return status;
50227 }
50228
50229 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
50230 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50231 {
50232 int i;
50233
50234 @@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50235 pnp_bios_callpoint.offset = header->fields.pm16offset;
50236 pnp_bios_callpoint.segment = PNP_CS16;
50237
50238 + pax_open_kernel();
50239 +
50240 for_each_possible_cpu(i) {
50241 struct desc_struct *gdt = get_cpu_gdt_table(i);
50242 if (!gdt)
50243 @@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50244 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50245 (unsigned long)__va(header->fields.pm16dseg));
50246 }
50247 +
50248 + pax_close_kernel();
50249 }
50250 diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50251 index 0c52e2a..3421ab7 100644
50252 --- a/drivers/power/pda_power.c
50253 +++ b/drivers/power/pda_power.c
50254 @@ -37,7 +37,11 @@ static int polling;
50255
50256 #if IS_ENABLED(CONFIG_USB_PHY)
50257 static struct usb_phy *transceiver;
50258 -static struct notifier_block otg_nb;
50259 +static int otg_handle_notification(struct notifier_block *nb,
50260 + unsigned long event, void *unused);
50261 +static struct notifier_block otg_nb = {
50262 + .notifier_call = otg_handle_notification
50263 +};
50264 #endif
50265
50266 static struct regulator *ac_draw;
50267 @@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50268
50269 #if IS_ENABLED(CONFIG_USB_PHY)
50270 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50271 - otg_nb.notifier_call = otg_handle_notification;
50272 ret = usb_register_notifier(transceiver, &otg_nb);
50273 if (ret) {
50274 dev_err(dev, "failure to register otg notifier\n");
50275 diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50276 index cc439fd..8fa30df 100644
50277 --- a/drivers/power/power_supply.h
50278 +++ b/drivers/power/power_supply.h
50279 @@ -16,12 +16,12 @@ struct power_supply;
50280
50281 #ifdef CONFIG_SYSFS
50282
50283 -extern void power_supply_init_attrs(struct device_type *dev_type);
50284 +extern void power_supply_init_attrs(void);
50285 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50286
50287 #else
50288
50289 -static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50290 +static inline void power_supply_init_attrs(void) {}
50291 #define power_supply_uevent NULL
50292
50293 #endif /* CONFIG_SYSFS */
50294 diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50295 index 694e8cd..9f03483 100644
50296 --- a/drivers/power/power_supply_core.c
50297 +++ b/drivers/power/power_supply_core.c
50298 @@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50299 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50300 EXPORT_SYMBOL_GPL(power_supply_notifier);
50301
50302 -static struct device_type power_supply_dev_type;
50303 +extern const struct attribute_group *power_supply_attr_groups[];
50304 +static struct device_type power_supply_dev_type = {
50305 + .groups = power_supply_attr_groups,
50306 +};
50307
50308 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50309 struct power_supply *supply)
50310 @@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50311 return PTR_ERR(power_supply_class);
50312
50313 power_supply_class->dev_uevent = power_supply_uevent;
50314 - power_supply_init_attrs(&power_supply_dev_type);
50315 + power_supply_init_attrs();
50316
50317 return 0;
50318 }
50319 diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50320 index 62653f5..d0bb485 100644
50321 --- a/drivers/power/power_supply_sysfs.c
50322 +++ b/drivers/power/power_supply_sysfs.c
50323 @@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50324 .is_visible = power_supply_attr_is_visible,
50325 };
50326
50327 -static const struct attribute_group *power_supply_attr_groups[] = {
50328 +const struct attribute_group *power_supply_attr_groups[] = {
50329 &power_supply_attr_group,
50330 NULL,
50331 };
50332
50333 -void power_supply_init_attrs(struct device_type *dev_type)
50334 +void power_supply_init_attrs(void)
50335 {
50336 int i;
50337
50338 - dev_type->groups = power_supply_attr_groups;
50339 -
50340 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50341 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50342 }
50343 diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50344 index 84419af..268ede8 100644
50345 --- a/drivers/powercap/powercap_sys.c
50346 +++ b/drivers/powercap/powercap_sys.c
50347 @@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50348 struct device_attribute name_attr;
50349 };
50350
50351 +static ssize_t show_constraint_name(struct device *dev,
50352 + struct device_attribute *dev_attr,
50353 + char *buf);
50354 +
50355 static struct powercap_constraint_attr
50356 - constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50357 + constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50358 + [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50359 + .power_limit_attr = {
50360 + .attr = {
50361 + .name = NULL,
50362 + .mode = S_IWUSR | S_IRUGO
50363 + },
50364 + .show = show_constraint_power_limit_uw,
50365 + .store = store_constraint_power_limit_uw
50366 + },
50367 +
50368 + .time_window_attr = {
50369 + .attr = {
50370 + .name = NULL,
50371 + .mode = S_IWUSR | S_IRUGO
50372 + },
50373 + .show = show_constraint_time_window_us,
50374 + .store = store_constraint_time_window_us
50375 + },
50376 +
50377 + .max_power_attr = {
50378 + .attr = {
50379 + .name = NULL,
50380 + .mode = S_IRUGO
50381 + },
50382 + .show = show_constraint_max_power_uw,
50383 + .store = NULL
50384 + },
50385 +
50386 + .min_power_attr = {
50387 + .attr = {
50388 + .name = NULL,
50389 + .mode = S_IRUGO
50390 + },
50391 + .show = show_constraint_min_power_uw,
50392 + .store = NULL
50393 + },
50394 +
50395 + .max_time_window_attr = {
50396 + .attr = {
50397 + .name = NULL,
50398 + .mode = S_IRUGO
50399 + },
50400 + .show = show_constraint_max_time_window_us,
50401 + .store = NULL
50402 + },
50403 +
50404 + .min_time_window_attr = {
50405 + .attr = {
50406 + .name = NULL,
50407 + .mode = S_IRUGO
50408 + },
50409 + .show = show_constraint_min_time_window_us,
50410 + .store = NULL
50411 + },
50412 +
50413 + .name_attr = {
50414 + .attr = {
50415 + .name = NULL,
50416 + .mode = S_IRUGO
50417 + },
50418 + .show = show_constraint_name,
50419 + .store = NULL
50420 + }
50421 + }
50422 +};
50423
50424 /* A list of powercap control_types */
50425 static LIST_HEAD(powercap_cntrl_list);
50426 @@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50427 }
50428
50429 static int create_constraint_attribute(int id, const char *name,
50430 - int mode,
50431 - struct device_attribute *dev_attr,
50432 - ssize_t (*show)(struct device *,
50433 - struct device_attribute *, char *),
50434 - ssize_t (*store)(struct device *,
50435 - struct device_attribute *,
50436 - const char *, size_t)
50437 - )
50438 + struct device_attribute *dev_attr)
50439 {
50440 + name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50441
50442 - dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50443 - id, name);
50444 - if (!dev_attr->attr.name)
50445 + if (!name)
50446 return -ENOMEM;
50447 - dev_attr->attr.mode = mode;
50448 - dev_attr->show = show;
50449 - dev_attr->store = store;
50450 +
50451 + pax_open_kernel();
50452 + *(const char **)&dev_attr->attr.name = name;
50453 + pax_close_kernel();
50454
50455 return 0;
50456 }
50457 @@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50458
50459 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50460 ret = create_constraint_attribute(i, "power_limit_uw",
50461 - S_IWUSR | S_IRUGO,
50462 - &constraint_attrs[i].power_limit_attr,
50463 - show_constraint_power_limit_uw,
50464 - store_constraint_power_limit_uw);
50465 + &constraint_attrs[i].power_limit_attr);
50466 if (ret)
50467 goto err_alloc;
50468 ret = create_constraint_attribute(i, "time_window_us",
50469 - S_IWUSR | S_IRUGO,
50470 - &constraint_attrs[i].time_window_attr,
50471 - show_constraint_time_window_us,
50472 - store_constraint_time_window_us);
50473 + &constraint_attrs[i].time_window_attr);
50474 if (ret)
50475 goto err_alloc;
50476 - ret = create_constraint_attribute(i, "name", S_IRUGO,
50477 - &constraint_attrs[i].name_attr,
50478 - show_constraint_name,
50479 - NULL);
50480 + ret = create_constraint_attribute(i, "name",
50481 + &constraint_attrs[i].name_attr);
50482 if (ret)
50483 goto err_alloc;
50484 - ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50485 - &constraint_attrs[i].max_power_attr,
50486 - show_constraint_max_power_uw,
50487 - NULL);
50488 + ret = create_constraint_attribute(i, "max_power_uw",
50489 + &constraint_attrs[i].max_power_attr);
50490 if (ret)
50491 goto err_alloc;
50492 - ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50493 - &constraint_attrs[i].min_power_attr,
50494 - show_constraint_min_power_uw,
50495 - NULL);
50496 + ret = create_constraint_attribute(i, "min_power_uw",
50497 + &constraint_attrs[i].min_power_attr);
50498 if (ret)
50499 goto err_alloc;
50500 ret = create_constraint_attribute(i, "max_time_window_us",
50501 - S_IRUGO,
50502 - &constraint_attrs[i].max_time_window_attr,
50503 - show_constraint_max_time_window_us,
50504 - NULL);
50505 + &constraint_attrs[i].max_time_window_attr);
50506 if (ret)
50507 goto err_alloc;
50508 ret = create_constraint_attribute(i, "min_time_window_us",
50509 - S_IRUGO,
50510 - &constraint_attrs[i].min_time_window_attr,
50511 - show_constraint_min_time_window_us,
50512 - NULL);
50513 + &constraint_attrs[i].min_time_window_attr);
50514 if (ret)
50515 goto err_alloc;
50516
50517 @@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50518 power_zone->zone_dev_attrs[count++] =
50519 &dev_attr_max_energy_range_uj.attr;
50520 if (power_zone->ops->get_energy_uj) {
50521 + pax_open_kernel();
50522 if (power_zone->ops->reset_energy_uj)
50523 - dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50524 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50525 else
50526 - dev_attr_energy_uj.attr.mode = S_IRUGO;
50527 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50528 + pax_close_kernel();
50529 power_zone->zone_dev_attrs[count++] =
50530 &dev_attr_energy_uj.attr;
50531 }
50532 diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50533 index 9c5d414..c7900ce 100644
50534 --- a/drivers/ptp/ptp_private.h
50535 +++ b/drivers/ptp/ptp_private.h
50536 @@ -51,7 +51,7 @@ struct ptp_clock {
50537 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50538 wait_queue_head_t tsev_wq;
50539 int defunct; /* tells readers to go away when clock is being removed */
50540 - struct device_attribute *pin_dev_attr;
50541 + device_attribute_no_const *pin_dev_attr;
50542 struct attribute **pin_attr;
50543 struct attribute_group pin_attr_group;
50544 };
50545 diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50546 index 302e626..12579af 100644
50547 --- a/drivers/ptp/ptp_sysfs.c
50548 +++ b/drivers/ptp/ptp_sysfs.c
50549 @@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50550 goto no_pin_attr;
50551
50552 for (i = 0; i < n_pins; i++) {
50553 - struct device_attribute *da = &ptp->pin_dev_attr[i];
50554 + device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50555 sysfs_attr_init(&da->attr);
50556 da->attr.name = info->pin_config[i].name;
50557 da->attr.mode = 0644;
50558 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50559 index cd87c0c..715ecbe 100644
50560 --- a/drivers/regulator/core.c
50561 +++ b/drivers/regulator/core.c
50562 @@ -3567,7 +3567,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50563 {
50564 const struct regulation_constraints *constraints = NULL;
50565 const struct regulator_init_data *init_data;
50566 - static atomic_t regulator_no = ATOMIC_INIT(0);
50567 + static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
50568 struct regulator_dev *rdev;
50569 struct device *dev;
50570 int ret, i;
50571 @@ -3641,7 +3641,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50572 rdev->dev.class = &regulator_class;
50573 rdev->dev.parent = dev;
50574 dev_set_name(&rdev->dev, "regulator.%d",
50575 - atomic_inc_return(&regulator_no) - 1);
50576 + atomic_inc_return_unchecked(&regulator_no) - 1);
50577 ret = device_register(&rdev->dev);
50578 if (ret != 0) {
50579 put_device(&rdev->dev);
50580 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
50581 index 7eee2ca..4024513 100644
50582 --- a/drivers/regulator/max8660.c
50583 +++ b/drivers/regulator/max8660.c
50584 @@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
50585 max8660->shadow_regs[MAX8660_OVER1] = 5;
50586 } else {
50587 /* Otherwise devices can be toggled via software */
50588 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
50589 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
50590 + pax_open_kernel();
50591 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
50592 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
50593 + pax_close_kernel();
50594 }
50595
50596 /*
50597 diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
50598 index dbedf17..18ff6b7 100644
50599 --- a/drivers/regulator/max8973-regulator.c
50600 +++ b/drivers/regulator/max8973-regulator.c
50601 @@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
50602 if (!pdata || !pdata->enable_ext_control) {
50603 max->desc.enable_reg = MAX8973_VOUT;
50604 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
50605 - max->ops.enable = regulator_enable_regmap;
50606 - max->ops.disable = regulator_disable_regmap;
50607 - max->ops.is_enabled = regulator_is_enabled_regmap;
50608 + pax_open_kernel();
50609 + *(void **)&max->ops.enable = regulator_enable_regmap;
50610 + *(void **)&max->ops.disable = regulator_disable_regmap;
50611 + *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
50612 + pax_close_kernel();
50613 }
50614
50615 if (pdata) {
50616 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
50617 index 793b662..85f74cd 100644
50618 --- a/drivers/regulator/mc13892-regulator.c
50619 +++ b/drivers/regulator/mc13892-regulator.c
50620 @@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
50621 mc13xxx_unlock(mc13892);
50622
50623 /* update mc13892_vcam ops */
50624 + pax_open_kernel();
50625 memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
50626 sizeof(struct regulator_ops));
50627 - mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50628 - mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50629 + *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50630 + *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50631 + pax_close_kernel();
50632 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
50633
50634 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
50635 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
50636 index 5b2e761..c8c8a4a 100644
50637 --- a/drivers/rtc/rtc-cmos.c
50638 +++ b/drivers/rtc/rtc-cmos.c
50639 @@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
50640 hpet_rtc_timer_init();
50641
50642 /* export at least the first block of NVRAM */
50643 - nvram.size = address_space - NVRAM_OFFSET;
50644 + pax_open_kernel();
50645 + *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
50646 + pax_close_kernel();
50647 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
50648 if (retval < 0) {
50649 dev_dbg(dev, "can't create nvram file? %d\n", retval);
50650 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
50651 index d049393..bb20be0 100644
50652 --- a/drivers/rtc/rtc-dev.c
50653 +++ b/drivers/rtc/rtc-dev.c
50654 @@ -16,6 +16,7 @@
50655 #include <linux/module.h>
50656 #include <linux/rtc.h>
50657 #include <linux/sched.h>
50658 +#include <linux/grsecurity.h>
50659 #include "rtc-core.h"
50660
50661 static dev_t rtc_devt;
50662 @@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
50663 if (copy_from_user(&tm, uarg, sizeof(tm)))
50664 return -EFAULT;
50665
50666 + gr_log_timechange();
50667 +
50668 return rtc_set_time(rtc, &tm);
50669
50670 case RTC_PIE_ON:
50671 diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
50672 index bb43cf7..ee4d274 100644
50673 --- a/drivers/rtc/rtc-ds1307.c
50674 +++ b/drivers/rtc/rtc-ds1307.c
50675 @@ -107,7 +107,7 @@ struct ds1307 {
50676 u8 offset; /* register's offset */
50677 u8 regs[11];
50678 u16 nvram_offset;
50679 - struct bin_attribute *nvram;
50680 + bin_attribute_no_const *nvram;
50681 enum ds_type type;
50682 unsigned long flags;
50683 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
50684 diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
50685 index 11880c1..b823aa4 100644
50686 --- a/drivers/rtc/rtc-m48t59.c
50687 +++ b/drivers/rtc/rtc-m48t59.c
50688 @@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
50689 if (IS_ERR(m48t59->rtc))
50690 return PTR_ERR(m48t59->rtc);
50691
50692 - m48t59_nvram_attr.size = pdata->offset;
50693 + pax_open_kernel();
50694 + *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
50695 + pax_close_kernel();
50696
50697 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
50698 if (ret)
50699 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
50700 index e693af6..2e525b6 100644
50701 --- a/drivers/scsi/bfa/bfa_fcpim.h
50702 +++ b/drivers/scsi/bfa/bfa_fcpim.h
50703 @@ -36,7 +36,7 @@ struct bfa_iotag_s {
50704
50705 struct bfa_itn_s {
50706 bfa_isr_func_t isr;
50707 -};
50708 +} __no_const;
50709
50710 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
50711 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
50712 diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
50713 index 0f19455..ef7adb5 100644
50714 --- a/drivers/scsi/bfa/bfa_fcs.c
50715 +++ b/drivers/scsi/bfa/bfa_fcs.c
50716 @@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
50717 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
50718
50719 static struct bfa_fcs_mod_s fcs_modules[] = {
50720 - { bfa_fcs_port_attach, NULL, NULL },
50721 - { bfa_fcs_uf_attach, NULL, NULL },
50722 - { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
50723 - bfa_fcs_fabric_modexit },
50724 + {
50725 + .attach = bfa_fcs_port_attach,
50726 + .modinit = NULL,
50727 + .modexit = NULL
50728 + },
50729 + {
50730 + .attach = bfa_fcs_uf_attach,
50731 + .modinit = NULL,
50732 + .modexit = NULL
50733 + },
50734 + {
50735 + .attach = bfa_fcs_fabric_attach,
50736 + .modinit = bfa_fcs_fabric_modinit,
50737 + .modexit = bfa_fcs_fabric_modexit
50738 + },
50739 };
50740
50741 /*
50742 diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
50743 index ff75ef8..2dfe00a 100644
50744 --- a/drivers/scsi/bfa/bfa_fcs_lport.c
50745 +++ b/drivers/scsi/bfa/bfa_fcs_lport.c
50746 @@ -89,15 +89,26 @@ static struct {
50747 void (*offline) (struct bfa_fcs_lport_s *port);
50748 } __port_action[] = {
50749 {
50750 - bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
50751 - bfa_fcs_lport_unknown_offline}, {
50752 - bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
50753 - bfa_fcs_lport_fab_offline}, {
50754 - bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
50755 - bfa_fcs_lport_n2n_offline}, {
50756 - bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
50757 - bfa_fcs_lport_loop_offline},
50758 - };
50759 + .init = bfa_fcs_lport_unknown_init,
50760 + .online = bfa_fcs_lport_unknown_online,
50761 + .offline = bfa_fcs_lport_unknown_offline
50762 + },
50763 + {
50764 + .init = bfa_fcs_lport_fab_init,
50765 + .online = bfa_fcs_lport_fab_online,
50766 + .offline = bfa_fcs_lport_fab_offline
50767 + },
50768 + {
50769 + .init = bfa_fcs_lport_n2n_init,
50770 + .online = bfa_fcs_lport_n2n_online,
50771 + .offline = bfa_fcs_lport_n2n_offline
50772 + },
50773 + {
50774 + .init = bfa_fcs_lport_loop_init,
50775 + .online = bfa_fcs_lport_loop_online,
50776 + .offline = bfa_fcs_lport_loop_offline
50777 + },
50778 +};
50779
50780 /*
50781 * fcs_port_sm FCS logical port state machine
50782 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
50783 index a38aafa0..fe8f03b 100644
50784 --- a/drivers/scsi/bfa/bfa_ioc.h
50785 +++ b/drivers/scsi/bfa/bfa_ioc.h
50786 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
50787 bfa_ioc_disable_cbfn_t disable_cbfn;
50788 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
50789 bfa_ioc_reset_cbfn_t reset_cbfn;
50790 -};
50791 +} __no_const;
50792
50793 /*
50794 * IOC event notification mechanism.
50795 @@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
50796 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
50797 enum bfi_ioc_state fwstate);
50798 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
50799 -};
50800 +} __no_const;
50801
50802 /*
50803 * Queue element to wait for room in request queue. FIFO order is
50804 diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
50805 index a14c784..6de6790 100644
50806 --- a/drivers/scsi/bfa/bfa_modules.h
50807 +++ b/drivers/scsi/bfa/bfa_modules.h
50808 @@ -78,12 +78,12 @@ enum {
50809 \
50810 extern struct bfa_module_s hal_mod_ ## __mod; \
50811 struct bfa_module_s hal_mod_ ## __mod = { \
50812 - bfa_ ## __mod ## _meminfo, \
50813 - bfa_ ## __mod ## _attach, \
50814 - bfa_ ## __mod ## _detach, \
50815 - bfa_ ## __mod ## _start, \
50816 - bfa_ ## __mod ## _stop, \
50817 - bfa_ ## __mod ## _iocdisable, \
50818 + .meminfo = bfa_ ## __mod ## _meminfo, \
50819 + .attach = bfa_ ## __mod ## _attach, \
50820 + .detach = bfa_ ## __mod ## _detach, \
50821 + .start = bfa_ ## __mod ## _start, \
50822 + .stop = bfa_ ## __mod ## _stop, \
50823 + .iocdisable = bfa_ ## __mod ## _iocdisable, \
50824 }
50825
50826 #define BFA_CACHELINE_SZ (256)
50827 diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
50828 index 045c4e1..13de803 100644
50829 --- a/drivers/scsi/fcoe/fcoe_sysfs.c
50830 +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
50831 @@ -33,8 +33,8 @@
50832 */
50833 #include "libfcoe.h"
50834
50835 -static atomic_t ctlr_num;
50836 -static atomic_t fcf_num;
50837 +static atomic_unchecked_t ctlr_num;
50838 +static atomic_unchecked_t fcf_num;
50839
50840 /*
50841 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
50842 @@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
50843 if (!ctlr)
50844 goto out;
50845
50846 - ctlr->id = atomic_inc_return(&ctlr_num) - 1;
50847 + ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
50848 ctlr->f = f;
50849 ctlr->mode = FIP_CONN_TYPE_FABRIC;
50850 INIT_LIST_HEAD(&ctlr->fcfs);
50851 @@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
50852 fcf->dev.parent = &ctlr->dev;
50853 fcf->dev.bus = &fcoe_bus_type;
50854 fcf->dev.type = &fcoe_fcf_device_type;
50855 - fcf->id = atomic_inc_return(&fcf_num) - 1;
50856 + fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
50857 fcf->state = FCOE_FCF_STATE_UNKNOWN;
50858
50859 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
50860 @@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
50861 {
50862 int error;
50863
50864 - atomic_set(&ctlr_num, 0);
50865 - atomic_set(&fcf_num, 0);
50866 + atomic_set_unchecked(&ctlr_num, 0);
50867 + atomic_set_unchecked(&fcf_num, 0);
50868
50869 error = bus_register(&fcoe_bus_type);
50870 if (error)
50871 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
50872 index 6de80e3..a11e0ac 100644
50873 --- a/drivers/scsi/hosts.c
50874 +++ b/drivers/scsi/hosts.c
50875 @@ -42,7 +42,7 @@
50876 #include "scsi_logging.h"
50877
50878
50879 -static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50880 +static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50881
50882
50883 static void scsi_host_cls_release(struct device *dev)
50884 @@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
50885 * subtract one because we increment first then return, but we need to
50886 * know what the next host number was before increment
50887 */
50888 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
50889 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
50890 shost->dma_channel = 0xff;
50891
50892 /* These three are default values which can be overridden */
50893 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
50894 index cef5d49..01e280e 100644
50895 --- a/drivers/scsi/hpsa.c
50896 +++ b/drivers/scsi/hpsa.c
50897 @@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
50898 unsigned long flags;
50899
50900 if (h->transMethod & CFGTBL_Trans_io_accel1)
50901 - return h->access.command_completed(h, q);
50902 + return h->access->command_completed(h, q);
50903
50904 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
50905 - return h->access.command_completed(h, q);
50906 + return h->access->command_completed(h, q);
50907
50908 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
50909 a = rq->head[rq->current_entry];
50910 @@ -5454,7 +5454,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50911 while (!list_empty(&h->reqQ)) {
50912 c = list_entry(h->reqQ.next, struct CommandList, list);
50913 /* can't do anything if fifo is full */
50914 - if ((h->access.fifo_full(h))) {
50915 + if ((h->access->fifo_full(h))) {
50916 h->fifo_recently_full = 1;
50917 dev_warn(&h->pdev->dev, "fifo full\n");
50918 break;
50919 @@ -5476,7 +5476,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50920
50921 /* Tell the controller execute command */
50922 spin_unlock_irqrestore(&h->lock, *flags);
50923 - h->access.submit_command(h, c);
50924 + h->access->submit_command(h, c);
50925 spin_lock_irqsave(&h->lock, *flags);
50926 }
50927 }
50928 @@ -5492,17 +5492,17 @@ static void lock_and_start_io(struct ctlr_info *h)
50929
50930 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
50931 {
50932 - return h->access.command_completed(h, q);
50933 + return h->access->command_completed(h, q);
50934 }
50935
50936 static inline bool interrupt_pending(struct ctlr_info *h)
50937 {
50938 - return h->access.intr_pending(h);
50939 + return h->access->intr_pending(h);
50940 }
50941
50942 static inline long interrupt_not_for_us(struct ctlr_info *h)
50943 {
50944 - return (h->access.intr_pending(h) == 0) ||
50945 + return (h->access->intr_pending(h) == 0) ||
50946 (h->interrupts_enabled == 0);
50947 }
50948
50949 @@ -6445,7 +6445,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
50950 if (prod_index < 0)
50951 return -ENODEV;
50952 h->product_name = products[prod_index].product_name;
50953 - h->access = *(products[prod_index].access);
50954 + h->access = products[prod_index].access;
50955
50956 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
50957 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
50958 @@ -6790,7 +6790,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
50959 unsigned long flags;
50960 u32 lockup_detected;
50961
50962 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50963 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50964 spin_lock_irqsave(&h->lock, flags);
50965 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
50966 if (!lockup_detected) {
50967 @@ -7037,7 +7037,7 @@ reinit_after_soft_reset:
50968 }
50969
50970 /* make sure the board interrupts are off */
50971 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50972 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50973
50974 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
50975 goto clean2;
50976 @@ -7072,7 +7072,7 @@ reinit_after_soft_reset:
50977 * fake ones to scoop up any residual completions.
50978 */
50979 spin_lock_irqsave(&h->lock, flags);
50980 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50981 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50982 spin_unlock_irqrestore(&h->lock, flags);
50983 free_irqs(h);
50984 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
50985 @@ -7091,9 +7091,9 @@ reinit_after_soft_reset:
50986 dev_info(&h->pdev->dev, "Board READY.\n");
50987 dev_info(&h->pdev->dev,
50988 "Waiting for stale completions to drain.\n");
50989 - h->access.set_intr_mask(h, HPSA_INTR_ON);
50990 + h->access->set_intr_mask(h, HPSA_INTR_ON);
50991 msleep(10000);
50992 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50993 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50994
50995 rc = controller_reset_failed(h->cfgtable);
50996 if (rc)
50997 @@ -7119,7 +7119,7 @@ reinit_after_soft_reset:
50998 h->drv_req_rescan = 0;
50999
51000 /* Turn the interrupts on so we can service requests */
51001 - h->access.set_intr_mask(h, HPSA_INTR_ON);
51002 + h->access->set_intr_mask(h, HPSA_INTR_ON);
51003
51004 hpsa_hba_inquiry(h);
51005 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
51006 @@ -7184,7 +7184,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
51007 * To write all data in the battery backed cache to disks
51008 */
51009 hpsa_flush_cache(h);
51010 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
51011 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
51012 hpsa_free_irqs_and_disable_msix(h);
51013 }
51014
51015 @@ -7302,7 +7302,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51016 CFGTBL_Trans_enable_directed_msix |
51017 (trans_support & (CFGTBL_Trans_io_accel1 |
51018 CFGTBL_Trans_io_accel2));
51019 - struct access_method access = SA5_performant_access;
51020 + struct access_method *access = &SA5_performant_access;
51021
51022 /* This is a bit complicated. There are 8 registers on
51023 * the controller which we write to to tell it 8 different
51024 @@ -7344,7 +7344,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51025 * perform the superfluous readl() after each command submission.
51026 */
51027 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
51028 - access = SA5_performant_access_no_read;
51029 + access = &SA5_performant_access_no_read;
51030
51031 /* Controller spec: zero out this buffer. */
51032 for (i = 0; i < h->nreply_queues; i++)
51033 @@ -7374,12 +7374,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51034 * enable outbound interrupt coalescing in accelerator mode;
51035 */
51036 if (trans_support & CFGTBL_Trans_io_accel1) {
51037 - access = SA5_ioaccel_mode1_access;
51038 + access = &SA5_ioaccel_mode1_access;
51039 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51040 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51041 } else {
51042 if (trans_support & CFGTBL_Trans_io_accel2) {
51043 - access = SA5_ioaccel_mode2_access;
51044 + access = &SA5_ioaccel_mode2_access;
51045 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51046 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51047 }
51048 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51049 index 24472ce..8782caf 100644
51050 --- a/drivers/scsi/hpsa.h
51051 +++ b/drivers/scsi/hpsa.h
51052 @@ -127,7 +127,7 @@ struct ctlr_info {
51053 unsigned int msix_vector;
51054 unsigned int msi_vector;
51055 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51056 - struct access_method access;
51057 + struct access_method *access;
51058 char hba_mode_enabled;
51059
51060 /* queue and queue Info */
51061 @@ -536,43 +536,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51062 }
51063
51064 static struct access_method SA5_access = {
51065 - SA5_submit_command,
51066 - SA5_intr_mask,
51067 - SA5_fifo_full,
51068 - SA5_intr_pending,
51069 - SA5_completed,
51070 + .submit_command = SA5_submit_command,
51071 + .set_intr_mask = SA5_intr_mask,
51072 + .fifo_full = SA5_fifo_full,
51073 + .intr_pending = SA5_intr_pending,
51074 + .command_completed = SA5_completed,
51075 };
51076
51077 static struct access_method SA5_ioaccel_mode1_access = {
51078 - SA5_submit_command,
51079 - SA5_performant_intr_mask,
51080 - SA5_fifo_full,
51081 - SA5_ioaccel_mode1_intr_pending,
51082 - SA5_ioaccel_mode1_completed,
51083 + .submit_command = SA5_submit_command,
51084 + .set_intr_mask = SA5_performant_intr_mask,
51085 + .fifo_full = SA5_fifo_full,
51086 + .intr_pending = SA5_ioaccel_mode1_intr_pending,
51087 + .command_completed = SA5_ioaccel_mode1_completed,
51088 };
51089
51090 static struct access_method SA5_ioaccel_mode2_access = {
51091 - SA5_submit_command_ioaccel2,
51092 - SA5_performant_intr_mask,
51093 - SA5_fifo_full,
51094 - SA5_performant_intr_pending,
51095 - SA5_performant_completed,
51096 + .submit_command = SA5_submit_command_ioaccel2,
51097 + .set_intr_mask = SA5_performant_intr_mask,
51098 + .fifo_full = SA5_fifo_full,
51099 + .intr_pending = SA5_performant_intr_pending,
51100 + .command_completed = SA5_performant_completed,
51101 };
51102
51103 static struct access_method SA5_performant_access = {
51104 - SA5_submit_command,
51105 - SA5_performant_intr_mask,
51106 - SA5_fifo_full,
51107 - SA5_performant_intr_pending,
51108 - SA5_performant_completed,
51109 + .submit_command = SA5_submit_command,
51110 + .set_intr_mask = SA5_performant_intr_mask,
51111 + .fifo_full = SA5_fifo_full,
51112 + .intr_pending = SA5_performant_intr_pending,
51113 + .command_completed = SA5_performant_completed,
51114 };
51115
51116 static struct access_method SA5_performant_access_no_read = {
51117 - SA5_submit_command_no_read,
51118 - SA5_performant_intr_mask,
51119 - SA5_fifo_full,
51120 - SA5_performant_intr_pending,
51121 - SA5_performant_completed,
51122 + .submit_command = SA5_submit_command_no_read,
51123 + .set_intr_mask = SA5_performant_intr_mask,
51124 + .fifo_full = SA5_fifo_full,
51125 + .intr_pending = SA5_performant_intr_pending,
51126 + .command_completed = SA5_performant_completed,
51127 };
51128
51129 struct board_type {
51130 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51131 index 1b3a094..068e683 100644
51132 --- a/drivers/scsi/libfc/fc_exch.c
51133 +++ b/drivers/scsi/libfc/fc_exch.c
51134 @@ -101,12 +101,12 @@ struct fc_exch_mgr {
51135 u16 pool_max_index;
51136
51137 struct {
51138 - atomic_t no_free_exch;
51139 - atomic_t no_free_exch_xid;
51140 - atomic_t xid_not_found;
51141 - atomic_t xid_busy;
51142 - atomic_t seq_not_found;
51143 - atomic_t non_bls_resp;
51144 + atomic_unchecked_t no_free_exch;
51145 + atomic_unchecked_t no_free_exch_xid;
51146 + atomic_unchecked_t xid_not_found;
51147 + atomic_unchecked_t xid_busy;
51148 + atomic_unchecked_t seq_not_found;
51149 + atomic_unchecked_t non_bls_resp;
51150 } stats;
51151 };
51152
51153 @@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51154 /* allocate memory for exchange */
51155 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51156 if (!ep) {
51157 - atomic_inc(&mp->stats.no_free_exch);
51158 + atomic_inc_unchecked(&mp->stats.no_free_exch);
51159 goto out;
51160 }
51161 memset(ep, 0, sizeof(*ep));
51162 @@ -874,7 +874,7 @@ out:
51163 return ep;
51164 err:
51165 spin_unlock_bh(&pool->lock);
51166 - atomic_inc(&mp->stats.no_free_exch_xid);
51167 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51168 mempool_free(ep, mp->ep_pool);
51169 return NULL;
51170 }
51171 @@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51172 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51173 ep = fc_exch_find(mp, xid);
51174 if (!ep) {
51175 - atomic_inc(&mp->stats.xid_not_found);
51176 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51177 reject = FC_RJT_OX_ID;
51178 goto out;
51179 }
51180 @@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51181 ep = fc_exch_find(mp, xid);
51182 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51183 if (ep) {
51184 - atomic_inc(&mp->stats.xid_busy);
51185 + atomic_inc_unchecked(&mp->stats.xid_busy);
51186 reject = FC_RJT_RX_ID;
51187 goto rel;
51188 }
51189 @@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51190 }
51191 xid = ep->xid; /* get our XID */
51192 } else if (!ep) {
51193 - atomic_inc(&mp->stats.xid_not_found);
51194 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51195 reject = FC_RJT_RX_ID; /* XID not found */
51196 goto out;
51197 }
51198 @@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51199 } else {
51200 sp = &ep->seq;
51201 if (sp->id != fh->fh_seq_id) {
51202 - atomic_inc(&mp->stats.seq_not_found);
51203 + atomic_inc_unchecked(&mp->stats.seq_not_found);
51204 if (f_ctl & FC_FC_END_SEQ) {
51205 /*
51206 * Update sequence_id based on incoming last
51207 @@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51208
51209 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51210 if (!ep) {
51211 - atomic_inc(&mp->stats.xid_not_found);
51212 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51213 goto out;
51214 }
51215 if (ep->esb_stat & ESB_ST_COMPLETE) {
51216 - atomic_inc(&mp->stats.xid_not_found);
51217 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51218 goto rel;
51219 }
51220 if (ep->rxid == FC_XID_UNKNOWN)
51221 ep->rxid = ntohs(fh->fh_rx_id);
51222 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51223 - atomic_inc(&mp->stats.xid_not_found);
51224 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51225 goto rel;
51226 }
51227 if (ep->did != ntoh24(fh->fh_s_id) &&
51228 ep->did != FC_FID_FLOGI) {
51229 - atomic_inc(&mp->stats.xid_not_found);
51230 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51231 goto rel;
51232 }
51233 sof = fr_sof(fp);
51234 @@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51235 sp->ssb_stat |= SSB_ST_RESP;
51236 sp->id = fh->fh_seq_id;
51237 } else if (sp->id != fh->fh_seq_id) {
51238 - atomic_inc(&mp->stats.seq_not_found);
51239 + atomic_inc_unchecked(&mp->stats.seq_not_found);
51240 goto rel;
51241 }
51242
51243 @@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51244 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51245
51246 if (!sp)
51247 - atomic_inc(&mp->stats.xid_not_found);
51248 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51249 else
51250 - atomic_inc(&mp->stats.non_bls_resp);
51251 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
51252
51253 fc_frame_free(fp);
51254 }
51255 @@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51256
51257 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51258 mp = ema->mp;
51259 - st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51260 + st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51261 st->fc_no_free_exch_xid +=
51262 - atomic_read(&mp->stats.no_free_exch_xid);
51263 - st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51264 - st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51265 - st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51266 - st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51267 + atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51268 + st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51269 + st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51270 + st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51271 + st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51272 }
51273 }
51274 EXPORT_SYMBOL(fc_exch_update_stats);
51275 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51276 index 766098a..1c6c971 100644
51277 --- a/drivers/scsi/libsas/sas_ata.c
51278 +++ b/drivers/scsi/libsas/sas_ata.c
51279 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
51280 .postreset = ata_std_postreset,
51281 .error_handler = ata_std_error_handler,
51282 .post_internal_cmd = sas_ata_post_internal,
51283 - .qc_defer = ata_std_qc_defer,
51284 + .qc_defer = ata_std_qc_defer,
51285 .qc_prep = ata_noop_qc_prep,
51286 .qc_issue = sas_ata_qc_issue,
51287 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51288 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51289 index 434e903..5a4a79b 100644
51290 --- a/drivers/scsi/lpfc/lpfc.h
51291 +++ b/drivers/scsi/lpfc/lpfc.h
51292 @@ -430,7 +430,7 @@ struct lpfc_vport {
51293 struct dentry *debug_nodelist;
51294 struct dentry *vport_debugfs_root;
51295 struct lpfc_debugfs_trc *disc_trc;
51296 - atomic_t disc_trc_cnt;
51297 + atomic_unchecked_t disc_trc_cnt;
51298 #endif
51299 uint8_t stat_data_enabled;
51300 uint8_t stat_data_blocked;
51301 @@ -880,8 +880,8 @@ struct lpfc_hba {
51302 struct timer_list fabric_block_timer;
51303 unsigned long bit_flags;
51304 #define FABRIC_COMANDS_BLOCKED 0
51305 - atomic_t num_rsrc_err;
51306 - atomic_t num_cmd_success;
51307 + atomic_unchecked_t num_rsrc_err;
51308 + atomic_unchecked_t num_cmd_success;
51309 unsigned long last_rsrc_error_time;
51310 unsigned long last_ramp_down_time;
51311 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51312 @@ -916,7 +916,7 @@ struct lpfc_hba {
51313
51314 struct dentry *debug_slow_ring_trc;
51315 struct lpfc_debugfs_trc *slow_ring_trc;
51316 - atomic_t slow_ring_trc_cnt;
51317 + atomic_unchecked_t slow_ring_trc_cnt;
51318 /* iDiag debugfs sub-directory */
51319 struct dentry *idiag_root;
51320 struct dentry *idiag_pci_cfg;
51321 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51322 index 786a2af..562c6a2 100644
51323 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
51324 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51325 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51326
51327 #include <linux/debugfs.h>
51328
51329 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51330 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51331 static unsigned long lpfc_debugfs_start_time = 0L;
51332
51333 /* iDiag */
51334 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51335 lpfc_debugfs_enable = 0;
51336
51337 len = 0;
51338 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51339 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51340 (lpfc_debugfs_max_disc_trc - 1);
51341 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51342 dtp = vport->disc_trc + i;
51343 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51344 lpfc_debugfs_enable = 0;
51345
51346 len = 0;
51347 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51348 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51349 (lpfc_debugfs_max_slow_ring_trc - 1);
51350 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51351 dtp = phba->slow_ring_trc + i;
51352 @@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51353 !vport || !vport->disc_trc)
51354 return;
51355
51356 - index = atomic_inc_return(&vport->disc_trc_cnt) &
51357 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51358 (lpfc_debugfs_max_disc_trc - 1);
51359 dtp = vport->disc_trc + index;
51360 dtp->fmt = fmt;
51361 dtp->data1 = data1;
51362 dtp->data2 = data2;
51363 dtp->data3 = data3;
51364 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51365 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51366 dtp->jif = jiffies;
51367 #endif
51368 return;
51369 @@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51370 !phba || !phba->slow_ring_trc)
51371 return;
51372
51373 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51374 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51375 (lpfc_debugfs_max_slow_ring_trc - 1);
51376 dtp = phba->slow_ring_trc + index;
51377 dtp->fmt = fmt;
51378 dtp->data1 = data1;
51379 dtp->data2 = data2;
51380 dtp->data3 = data3;
51381 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51382 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51383 dtp->jif = jiffies;
51384 #endif
51385 return;
51386 @@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51387 "slow_ring buffer\n");
51388 goto debug_failed;
51389 }
51390 - atomic_set(&phba->slow_ring_trc_cnt, 0);
51391 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51392 memset(phba->slow_ring_trc, 0,
51393 (sizeof(struct lpfc_debugfs_trc) *
51394 lpfc_debugfs_max_slow_ring_trc));
51395 @@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51396 "buffer\n");
51397 goto debug_failed;
51398 }
51399 - atomic_set(&vport->disc_trc_cnt, 0);
51400 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51401
51402 snprintf(name, sizeof(name), "discovery_trace");
51403 vport->debug_disc_trc =
51404 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51405 index 0b2c53a..aec2b45 100644
51406 --- a/drivers/scsi/lpfc/lpfc_init.c
51407 +++ b/drivers/scsi/lpfc/lpfc_init.c
51408 @@ -11290,8 +11290,10 @@ lpfc_init(void)
51409 "misc_register returned with status %d", error);
51410
51411 if (lpfc_enable_npiv) {
51412 - lpfc_transport_functions.vport_create = lpfc_vport_create;
51413 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51414 + pax_open_kernel();
51415 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51416 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51417 + pax_close_kernel();
51418 }
51419 lpfc_transport_template =
51420 fc_attach_transport(&lpfc_transport_functions);
51421 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51422 index b99399f..d29dc75 100644
51423 --- a/drivers/scsi/lpfc/lpfc_scsi.c
51424 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
51425 @@ -383,7 +383,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51426 unsigned long expires;
51427
51428 spin_lock_irqsave(&phba->hbalock, flags);
51429 - atomic_inc(&phba->num_rsrc_err);
51430 + atomic_inc_unchecked(&phba->num_rsrc_err);
51431 phba->last_rsrc_error_time = jiffies;
51432
51433 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51434 @@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51435 unsigned long num_rsrc_err, num_cmd_success;
51436 int i;
51437
51438 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51439 - num_cmd_success = atomic_read(&phba->num_cmd_success);
51440 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51441 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51442
51443 /*
51444 * The error and success command counters are global per
51445 @@ -454,8 +454,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51446 }
51447 }
51448 lpfc_destroy_vport_work_array(phba, vports);
51449 - atomic_set(&phba->num_rsrc_err, 0);
51450 - atomic_set(&phba->num_cmd_success, 0);
51451 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
51452 + atomic_set_unchecked(&phba->num_cmd_success, 0);
51453 }
51454
51455 /**
51456 diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51457 index c80ed04..e674f01 100644
51458 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51459 +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51460 @@ -1561,7 +1561,7 @@ _scsih_get_resync(struct device *dev)
51461 {
51462 struct scsi_device *sdev = to_scsi_device(dev);
51463 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51464 - static struct _raid_device *raid_device;
51465 + struct _raid_device *raid_device;
51466 unsigned long flags;
51467 Mpi2RaidVolPage0_t vol_pg0;
51468 Mpi2ConfigReply_t mpi_reply;
51469 @@ -1613,7 +1613,7 @@ _scsih_get_state(struct device *dev)
51470 {
51471 struct scsi_device *sdev = to_scsi_device(dev);
51472 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51473 - static struct _raid_device *raid_device;
51474 + struct _raid_device *raid_device;
51475 unsigned long flags;
51476 Mpi2RaidVolPage0_t vol_pg0;
51477 Mpi2ConfigReply_t mpi_reply;
51478 @@ -6663,7 +6663,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51479 Mpi2EventDataIrOperationStatus_t *event_data =
51480 (Mpi2EventDataIrOperationStatus_t *)
51481 fw_event->event_data;
51482 - static struct _raid_device *raid_device;
51483 + struct _raid_device *raid_device;
51484 unsigned long flags;
51485 u16 handle;
51486
51487 @@ -7134,7 +7134,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51488 u64 sas_address;
51489 struct _sas_device *sas_device;
51490 struct _sas_node *expander_device;
51491 - static struct _raid_device *raid_device;
51492 + struct _raid_device *raid_device;
51493 u8 retry_count;
51494 unsigned long flags;
51495
51496 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51497 index bcb64eb..f08cf71 100644
51498 --- a/drivers/scsi/pmcraid.c
51499 +++ b/drivers/scsi/pmcraid.c
51500 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51501 res->scsi_dev = scsi_dev;
51502 scsi_dev->hostdata = res;
51503 res->change_detected = 0;
51504 - atomic_set(&res->read_failures, 0);
51505 - atomic_set(&res->write_failures, 0);
51506 + atomic_set_unchecked(&res->read_failures, 0);
51507 + atomic_set_unchecked(&res->write_failures, 0);
51508 rc = 0;
51509 }
51510 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51511 @@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51512
51513 /* If this was a SCSI read/write command keep count of errors */
51514 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51515 - atomic_inc(&res->read_failures);
51516 + atomic_inc_unchecked(&res->read_failures);
51517 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51518 - atomic_inc(&res->write_failures);
51519 + atomic_inc_unchecked(&res->write_failures);
51520
51521 if (!RES_IS_GSCSI(res->cfg_entry) &&
51522 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51523 @@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
51524 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51525 * hrrq_id assigned here in queuecommand
51526 */
51527 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51528 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51529 pinstance->num_hrrq;
51530 cmd->cmd_done = pmcraid_io_done;
51531
51532 @@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
51533 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51534 * hrrq_id assigned here in queuecommand
51535 */
51536 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51537 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51538 pinstance->num_hrrq;
51539
51540 if (request_size) {
51541 @@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51542
51543 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51544 /* add resources only after host is added into system */
51545 - if (!atomic_read(&pinstance->expose_resources))
51546 + if (!atomic_read_unchecked(&pinstance->expose_resources))
51547 return;
51548
51549 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51550 @@ -5312,8 +5312,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51551 init_waitqueue_head(&pinstance->reset_wait_q);
51552
51553 atomic_set(&pinstance->outstanding_cmds, 0);
51554 - atomic_set(&pinstance->last_message_id, 0);
51555 - atomic_set(&pinstance->expose_resources, 0);
51556 + atomic_set_unchecked(&pinstance->last_message_id, 0);
51557 + atomic_set_unchecked(&pinstance->expose_resources, 0);
51558
51559 INIT_LIST_HEAD(&pinstance->free_res_q);
51560 INIT_LIST_HEAD(&pinstance->used_res_q);
51561 @@ -6026,7 +6026,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
51562 /* Schedule worker thread to handle CCN and take care of adding and
51563 * removing devices to OS
51564 */
51565 - atomic_set(&pinstance->expose_resources, 1);
51566 + atomic_set_unchecked(&pinstance->expose_resources, 1);
51567 schedule_work(&pinstance->worker_q);
51568 return rc;
51569
51570 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
51571 index e1d150f..6c6df44 100644
51572 --- a/drivers/scsi/pmcraid.h
51573 +++ b/drivers/scsi/pmcraid.h
51574 @@ -748,7 +748,7 @@ struct pmcraid_instance {
51575 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
51576
51577 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
51578 - atomic_t last_message_id;
51579 + atomic_unchecked_t last_message_id;
51580
51581 /* configuration table */
51582 struct pmcraid_config_table *cfg_table;
51583 @@ -777,7 +777,7 @@ struct pmcraid_instance {
51584 atomic_t outstanding_cmds;
51585
51586 /* should add/delete resources to mid-layer now ?*/
51587 - atomic_t expose_resources;
51588 + atomic_unchecked_t expose_resources;
51589
51590
51591
51592 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
51593 struct pmcraid_config_table_entry_ext cfg_entry_ext;
51594 };
51595 struct scsi_device *scsi_dev; /* Link scsi_device structure */
51596 - atomic_t read_failures; /* count of failed READ commands */
51597 - atomic_t write_failures; /* count of failed WRITE commands */
51598 + atomic_unchecked_t read_failures; /* count of failed READ commands */
51599 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
51600
51601 /* To indicate add/delete/modify during CCN */
51602 u8 change_detected;
51603 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
51604 index 82b92c4..3178171 100644
51605 --- a/drivers/scsi/qla2xxx/qla_attr.c
51606 +++ b/drivers/scsi/qla2xxx/qla_attr.c
51607 @@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
51608 return 0;
51609 }
51610
51611 -struct fc_function_template qla2xxx_transport_functions = {
51612 +fc_function_template_no_const qla2xxx_transport_functions = {
51613
51614 .show_host_node_name = 1,
51615 .show_host_port_name = 1,
51616 @@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
51617 .bsg_timeout = qla24xx_bsg_timeout,
51618 };
51619
51620 -struct fc_function_template qla2xxx_transport_vport_functions = {
51621 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
51622
51623 .show_host_node_name = 1,
51624 .show_host_port_name = 1,
51625 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
51626 index b1865a7..a7723d3 100644
51627 --- a/drivers/scsi/qla2xxx/qla_gbl.h
51628 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
51629 @@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
51630 struct device_attribute;
51631 extern struct device_attribute *qla2x00_host_attrs[];
51632 struct fc_function_template;
51633 -extern struct fc_function_template qla2xxx_transport_functions;
51634 -extern struct fc_function_template qla2xxx_transport_vport_functions;
51635 +extern fc_function_template_no_const qla2xxx_transport_functions;
51636 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
51637 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
51638 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
51639 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
51640 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
51641 index db3dbd9..2492392 100644
51642 --- a/drivers/scsi/qla2xxx/qla_os.c
51643 +++ b/drivers/scsi/qla2xxx/qla_os.c
51644 @@ -1507,8 +1507,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
51645 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
51646 /* Ok, a 64bit DMA mask is applicable. */
51647 ha->flags.enable_64bit_addressing = 1;
51648 - ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51649 - ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51650 + pax_open_kernel();
51651 + *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51652 + *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51653 + pax_close_kernel();
51654 return;
51655 }
51656 }
51657 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
51658 index 8f6d0fb..1b21097 100644
51659 --- a/drivers/scsi/qla4xxx/ql4_def.h
51660 +++ b/drivers/scsi/qla4xxx/ql4_def.h
51661 @@ -305,7 +305,7 @@ struct ddb_entry {
51662 * (4000 only) */
51663 atomic_t relogin_timer; /* Max Time to wait for
51664 * relogin to complete */
51665 - atomic_t relogin_retry_count; /* Num of times relogin has been
51666 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
51667 * retried */
51668 uint32_t default_time2wait; /* Default Min time between
51669 * relogins (+aens) */
51670 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
51671 index 199fcf7..3c3a918 100644
51672 --- a/drivers/scsi/qla4xxx/ql4_os.c
51673 +++ b/drivers/scsi/qla4xxx/ql4_os.c
51674 @@ -4496,12 +4496,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
51675 */
51676 if (!iscsi_is_session_online(cls_sess)) {
51677 /* Reset retry relogin timer */
51678 - atomic_inc(&ddb_entry->relogin_retry_count);
51679 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
51680 DEBUG2(ql4_printk(KERN_INFO, ha,
51681 "%s: index[%d] relogin timed out-retrying"
51682 " relogin (%d), retry (%d)\n", __func__,
51683 ddb_entry->fw_ddb_index,
51684 - atomic_read(&ddb_entry->relogin_retry_count),
51685 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
51686 ddb_entry->default_time2wait + 4));
51687 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
51688 atomic_set(&ddb_entry->retry_relogin_timer,
51689 @@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
51690
51691 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
51692 atomic_set(&ddb_entry->relogin_timer, 0);
51693 - atomic_set(&ddb_entry->relogin_retry_count, 0);
51694 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
51695 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
51696 ddb_entry->default_relogin_timeout =
51697 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
51698 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
51699 index 79c77b4..ef6ec0b 100644
51700 --- a/drivers/scsi/scsi.c
51701 +++ b/drivers/scsi/scsi.c
51702 @@ -645,7 +645,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
51703 struct Scsi_Host *host = cmd->device->host;
51704 int rtn = 0;
51705
51706 - atomic_inc(&cmd->device->iorequest_cnt);
51707 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51708
51709 /* check if the device is still usable */
51710 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
51711 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
51712 index 50a6e1a..de5252e 100644
51713 --- a/drivers/scsi/scsi_lib.c
51714 +++ b/drivers/scsi/scsi_lib.c
51715 @@ -1583,7 +1583,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
51716 shost = sdev->host;
51717 scsi_init_cmd_errh(cmd);
51718 cmd->result = DID_NO_CONNECT << 16;
51719 - atomic_inc(&cmd->device->iorequest_cnt);
51720 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51721
51722 /*
51723 * SCSI request completion path will do scsi_device_unbusy(),
51724 @@ -1606,9 +1606,9 @@ static void scsi_softirq_done(struct request *rq)
51725
51726 INIT_LIST_HEAD(&cmd->eh_entry);
51727
51728 - atomic_inc(&cmd->device->iodone_cnt);
51729 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
51730 if (cmd->result)
51731 - atomic_inc(&cmd->device->ioerr_cnt);
51732 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
51733
51734 disposition = scsi_decide_disposition(cmd);
51735 if (disposition != SUCCESS &&
51736 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
51737 index f4cb7b3..dfa79c4 100644
51738 --- a/drivers/scsi/scsi_sysfs.c
51739 +++ b/drivers/scsi/scsi_sysfs.c
51740 @@ -805,7 +805,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
51741 char *buf) \
51742 { \
51743 struct scsi_device *sdev = to_scsi_device(dev); \
51744 - unsigned long long count = atomic_read(&sdev->field); \
51745 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
51746 return snprintf(buf, 20, "0x%llx\n", count); \
51747 } \
51748 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
51749 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
51750 index 5d6f348..18778a6b 100644
51751 --- a/drivers/scsi/scsi_transport_fc.c
51752 +++ b/drivers/scsi/scsi_transport_fc.c
51753 @@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
51754 * Netlink Infrastructure
51755 */
51756
51757 -static atomic_t fc_event_seq;
51758 +static atomic_unchecked_t fc_event_seq;
51759
51760 /**
51761 * fc_get_event_number - Obtain the next sequential FC event number
51762 @@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
51763 u32
51764 fc_get_event_number(void)
51765 {
51766 - return atomic_add_return(1, &fc_event_seq);
51767 + return atomic_add_return_unchecked(1, &fc_event_seq);
51768 }
51769 EXPORT_SYMBOL(fc_get_event_number);
51770
51771 @@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
51772 {
51773 int error;
51774
51775 - atomic_set(&fc_event_seq, 0);
51776 + atomic_set_unchecked(&fc_event_seq, 0);
51777
51778 error = transport_class_register(&fc_host_class);
51779 if (error)
51780 @@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
51781 char *cp;
51782
51783 *val = simple_strtoul(buf, &cp, 0);
51784 - if ((*cp && (*cp != '\n')) || (*val < 0))
51785 + if (*cp && (*cp != '\n'))
51786 return -EINVAL;
51787 /*
51788 * Check for overflow; dev_loss_tmo is u32
51789 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
51790 index 67d43e3..8cee73c 100644
51791 --- a/drivers/scsi/scsi_transport_iscsi.c
51792 +++ b/drivers/scsi/scsi_transport_iscsi.c
51793 @@ -79,7 +79,7 @@ struct iscsi_internal {
51794 struct transport_container session_cont;
51795 };
51796
51797 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
51798 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
51799 static struct workqueue_struct *iscsi_eh_timer_workq;
51800
51801 static DEFINE_IDA(iscsi_sess_ida);
51802 @@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
51803 int err;
51804
51805 ihost = shost->shost_data;
51806 - session->sid = atomic_add_return(1, &iscsi_session_nr);
51807 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
51808
51809 if (target_id == ISCSI_MAX_TARGET) {
51810 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
51811 @@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
51812 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
51813 ISCSI_TRANSPORT_VERSION);
51814
51815 - atomic_set(&iscsi_session_nr, 0);
51816 + atomic_set_unchecked(&iscsi_session_nr, 0);
51817
51818 err = class_register(&iscsi_transport_class);
51819 if (err)
51820 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
51821 index ae45bd9..c32a586 100644
51822 --- a/drivers/scsi/scsi_transport_srp.c
51823 +++ b/drivers/scsi/scsi_transport_srp.c
51824 @@ -35,7 +35,7 @@
51825 #include "scsi_priv.h"
51826
51827 struct srp_host_attrs {
51828 - atomic_t next_port_id;
51829 + atomic_unchecked_t next_port_id;
51830 };
51831 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
51832
51833 @@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
51834 struct Scsi_Host *shost = dev_to_shost(dev);
51835 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
51836
51837 - atomic_set(&srp_host->next_port_id, 0);
51838 + atomic_set_unchecked(&srp_host->next_port_id, 0);
51839 return 0;
51840 }
51841
51842 @@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
51843 rport_fast_io_fail_timedout);
51844 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
51845
51846 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
51847 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
51848 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
51849
51850 transport_setup_device(&rport->dev);
51851 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
51852 index cfba74c..415f09b 100644
51853 --- a/drivers/scsi/sd.c
51854 +++ b/drivers/scsi/sd.c
51855 @@ -3022,7 +3022,7 @@ static int sd_probe(struct device *dev)
51856 sdkp->disk = gd;
51857 sdkp->index = index;
51858 atomic_set(&sdkp->openers, 0);
51859 - atomic_set(&sdkp->device->ioerr_cnt, 0);
51860 + atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
51861
51862 if (!sdp->request_queue->rq_timeout) {
51863 if (sdp->type != TYPE_MOD)
51864 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
51865 index 6035444..c82edd4 100644
51866 --- a/drivers/scsi/sg.c
51867 +++ b/drivers/scsi/sg.c
51868 @@ -1138,7 +1138,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
51869 sdp->disk->disk_name,
51870 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
51871 NULL,
51872 - (char *)arg);
51873 + (char __user *)arg);
51874 case BLKTRACESTART:
51875 return blk_trace_startstop(sdp->device->request_queue, 1);
51876 case BLKTRACESTOP:
51877 diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
51878 index 11a5043..e36f04c 100644
51879 --- a/drivers/soc/tegra/fuse/fuse-tegra.c
51880 +++ b/drivers/soc/tegra/fuse/fuse-tegra.c
51881 @@ -70,7 +70,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
51882 return i;
51883 }
51884
51885 -static struct bin_attribute fuse_bin_attr = {
51886 +static bin_attribute_no_const fuse_bin_attr = {
51887 .attr = { .name = "fuse", .mode = S_IRUGO, },
51888 .read = fuse_read,
51889 };
51890 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
51891 index 50f20f2..6bd81e0 100644
51892 --- a/drivers/spi/spi.c
51893 +++ b/drivers/spi/spi.c
51894 @@ -2224,7 +2224,7 @@ int spi_bus_unlock(struct spi_master *master)
51895 EXPORT_SYMBOL_GPL(spi_bus_unlock);
51896
51897 /* portable code must never pass more than 32 bytes */
51898 -#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
51899 +#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
51900
51901 static u8 *buf;
51902
51903 diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
51904 index b41429f..2de5373 100644
51905 --- a/drivers/staging/android/timed_output.c
51906 +++ b/drivers/staging/android/timed_output.c
51907 @@ -25,7 +25,7 @@
51908 #include "timed_output.h"
51909
51910 static struct class *timed_output_class;
51911 -static atomic_t device_count;
51912 +static atomic_unchecked_t device_count;
51913
51914 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
51915 char *buf)
51916 @@ -65,7 +65,7 @@ static int create_timed_output_class(void)
51917 timed_output_class = class_create(THIS_MODULE, "timed_output");
51918 if (IS_ERR(timed_output_class))
51919 return PTR_ERR(timed_output_class);
51920 - atomic_set(&device_count, 0);
51921 + atomic_set_unchecked(&device_count, 0);
51922 timed_output_class->dev_groups = timed_output_groups;
51923 }
51924
51925 @@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
51926 if (ret < 0)
51927 return ret;
51928
51929 - tdev->index = atomic_inc_return(&device_count);
51930 + tdev->index = atomic_inc_return_unchecked(&device_count);
51931 tdev->dev = device_create(timed_output_class, NULL,
51932 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
51933 if (IS_ERR(tdev->dev))
51934 diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
51935 index 001348c..cfaac8a 100644
51936 --- a/drivers/staging/gdm724x/gdm_tty.c
51937 +++ b/drivers/staging/gdm724x/gdm_tty.c
51938 @@ -44,7 +44,7 @@
51939 #define gdm_tty_send_control(n, r, v, d, l) (\
51940 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
51941
51942 -#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
51943 +#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
51944
51945 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
51946 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
51947 diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
51948 index 9cb222e..8766f26 100644
51949 --- a/drivers/staging/imx-drm/imx-drm-core.c
51950 +++ b/drivers/staging/imx-drm/imx-drm-core.c
51951 @@ -357,7 +357,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
51952 if (imxdrm->pipes >= MAX_CRTC)
51953 return -EINVAL;
51954
51955 - if (imxdrm->drm->open_count)
51956 + if (local_read(&imxdrm->drm->open_count))
51957 return -EBUSY;
51958
51959 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
51960 diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
51961 index 503b2d7..c918745 100644
51962 --- a/drivers/staging/line6/driver.c
51963 +++ b/drivers/staging/line6/driver.c
51964 @@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51965 {
51966 struct usb_device *usbdev = line6->usbdev;
51967 int ret;
51968 - unsigned char len;
51969 + unsigned char *plen;
51970
51971 /* query the serial number: */
51972 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
51973 @@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51974 return ret;
51975 }
51976
51977 + plen = kmalloc(1, GFP_KERNEL);
51978 + if (plen == NULL)
51979 + return -ENOMEM;
51980 +
51981 /* Wait for data length. We'll get 0xff until length arrives. */
51982 do {
51983 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
51984 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
51985 USB_DIR_IN,
51986 - 0x0012, 0x0000, &len, 1,
51987 + 0x0012, 0x0000, plen, 1,
51988 LINE6_TIMEOUT * HZ);
51989 if (ret < 0) {
51990 dev_err(line6->ifcdev,
51991 "receive length failed (error %d)\n", ret);
51992 + kfree(plen);
51993 return ret;
51994 }
51995 - } while (len == 0xff);
51996 + } while (*plen == 0xff);
51997
51998 - if (len != datalen) {
51999 + if (*plen != datalen) {
52000 /* should be equal or something went wrong */
52001 dev_err(line6->ifcdev,
52002 "length mismatch (expected %d, got %d)\n",
52003 - (int)datalen, (int)len);
52004 + (int)datalen, (int)*plen);
52005 + kfree(plen);
52006 return -EINVAL;
52007 }
52008 + kfree(plen);
52009
52010 /* receive the result: */
52011 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52012 diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
52013 index a94f336..6a1924d 100644
52014 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c
52015 +++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
52016 @@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
52017 return 0;
52018 }
52019
52020 -sfw_test_client_ops_t brw_test_client;
52021 -void brw_init_test_client(void)
52022 -{
52023 - brw_test_client.tso_init = brw_client_init;
52024 - brw_test_client.tso_fini = brw_client_fini;
52025 - brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
52026 - brw_test_client.tso_done_rpc = brw_client_done_rpc;
52027 +sfw_test_client_ops_t brw_test_client = {
52028 + .tso_init = brw_client_init,
52029 + .tso_fini = brw_client_fini,
52030 + .tso_prep_rpc = brw_client_prep_rpc,
52031 + .tso_done_rpc = brw_client_done_rpc,
52032 };
52033
52034 srpc_service_t brw_test_service;
52035 diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
52036 index df04ab7..1deb1ac 100644
52037 --- a/drivers/staging/lustre/lnet/selftest/framework.c
52038 +++ b/drivers/staging/lustre/lnet/selftest/framework.c
52039 @@ -1632,12 +1632,10 @@ static srpc_service_t sfw_services[] = {
52040
52041 extern sfw_test_client_ops_t ping_test_client;
52042 extern srpc_service_t ping_test_service;
52043 -extern void ping_init_test_client(void);
52044 extern void ping_init_test_service(void);
52045
52046 extern sfw_test_client_ops_t brw_test_client;
52047 extern srpc_service_t brw_test_service;
52048 -extern void brw_init_test_client(void);
52049 extern void brw_init_test_service(void);
52050
52051
52052 @@ -1681,12 +1679,10 @@ sfw_startup (void)
52053 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52054 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52055
52056 - brw_init_test_client();
52057 brw_init_test_service();
52058 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52059 LASSERT (rc == 0);
52060
52061 - ping_init_test_client();
52062 ping_init_test_service();
52063 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52064 LASSERT (rc == 0);
52065 diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52066 index 750cac4..e4d751f 100644
52067 --- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52068 +++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52069 @@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52070 return 0;
52071 }
52072
52073 -sfw_test_client_ops_t ping_test_client;
52074 -void ping_init_test_client(void)
52075 -{
52076 - ping_test_client.tso_init = ping_client_init;
52077 - ping_test_client.tso_fini = ping_client_fini;
52078 - ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52079 - ping_test_client.tso_done_rpc = ping_client_done_rpc;
52080 -}
52081 +sfw_test_client_ops_t ping_test_client = {
52082 + .tso_init = ping_client_init,
52083 + .tso_fini = ping_client_fini,
52084 + .tso_prep_rpc = ping_client_prep_rpc,
52085 + .tso_done_rpc = ping_client_done_rpc,
52086 +};
52087
52088 srpc_service_t ping_test_service;
52089 void ping_init_test_service(void)
52090 diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52091 index 14ac46f..eca2c16 100644
52092 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52093 +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52094 @@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52095 ldlm_completion_callback lcs_completion;
52096 ldlm_blocking_callback lcs_blocking;
52097 ldlm_glimpse_callback lcs_glimpse;
52098 -};
52099 +} __no_const;
52100
52101 /* ldlm_lockd.c */
52102 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52103 diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52104 index 2a88b80..62e7e5f 100644
52105 --- a/drivers/staging/lustre/lustre/include/obd.h
52106 +++ b/drivers/staging/lustre/lustre/include/obd.h
52107 @@ -1362,7 +1362,7 @@ struct md_ops {
52108 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52109 * wrapper function in include/linux/obd_class.h.
52110 */
52111 -};
52112 +} __no_const;
52113
52114 struct lsm_operations {
52115 void (*lsm_free)(struct lov_stripe_md *);
52116 diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52117 index b798daa..b28ca8f 100644
52118 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52119 +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52120 @@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52121 int added = (mode == LCK_NL);
52122 int overlaps = 0;
52123 int splitted = 0;
52124 - const struct ldlm_callback_suite null_cbs = { NULL };
52125 + const struct ldlm_callback_suite null_cbs = { };
52126
52127 CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52128 *flags, new->l_policy_data.l_flock.owner,
52129 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52130 index bbe2c68..c6b4275 100644
52131 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52132 +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52133 @@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52134 void __user *buffer, size_t *lenp, loff_t *ppos)
52135 {
52136 int rc, max_delay_cs;
52137 - struct ctl_table dummy = *table;
52138 + ctl_table_no_const dummy = *table;
52139 long d;
52140
52141 dummy.data = &max_delay_cs;
52142 @@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52143 void __user *buffer, size_t *lenp, loff_t *ppos)
52144 {
52145 int rc, min_delay_cs;
52146 - struct ctl_table dummy = *table;
52147 + ctl_table_no_const dummy = *table;
52148 long d;
52149
52150 dummy.data = &min_delay_cs;
52151 @@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52152 void __user *buffer, size_t *lenp, loff_t *ppos)
52153 {
52154 int rc, backoff;
52155 - struct ctl_table dummy = *table;
52156 + ctl_table_no_const dummy = *table;
52157
52158 dummy.data = &backoff;
52159 dummy.proc_handler = &proc_dointvec;
52160 diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52161 index 2c4fc74..b04ca79 100644
52162 --- a/drivers/staging/lustre/lustre/libcfs/module.c
52163 +++ b/drivers/staging/lustre/lustre/libcfs/module.c
52164 @@ -315,11 +315,11 @@ out:
52165
52166
52167 struct cfs_psdev_ops libcfs_psdev_ops = {
52168 - libcfs_psdev_open,
52169 - libcfs_psdev_release,
52170 - NULL,
52171 - NULL,
52172 - libcfs_ioctl
52173 + .p_open = libcfs_psdev_open,
52174 + .p_close = libcfs_psdev_release,
52175 + .p_read = NULL,
52176 + .p_write = NULL,
52177 + .p_ioctl = libcfs_ioctl
52178 };
52179
52180 extern int insert_proc(void);
52181 diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
52182 index b0bb709..0117c96 100644
52183 --- a/drivers/staging/lustre/lustre/llite/dir.c
52184 +++ b/drivers/staging/lustre/lustre/llite/dir.c
52185 @@ -661,7 +661,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
52186 int mode;
52187 int err;
52188
52189 - mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
52190 + mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
52191 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
52192 strlen(filename), mode, LUSTRE_OPC_MKDIR,
52193 lump);
52194 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52195 index b2b6c3c..302e4e4 100644
52196 --- a/drivers/staging/octeon/ethernet-rx.c
52197 +++ b/drivers/staging/octeon/ethernet-rx.c
52198 @@ -416,11 +416,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52199 /* Increment RX stats for virtual ports */
52200 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52201 #ifdef CONFIG_64BIT
52202 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
52203 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
52204 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
52205 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
52206 #else
52207 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
52208 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
52209 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
52210 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
52211 #endif
52212 }
52213 netif_receive_skb(skb);
52214 @@ -431,9 +431,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52215 dev->name);
52216 */
52217 #ifdef CONFIG_64BIT
52218 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
52219 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52220 #else
52221 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
52222 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
52223 #endif
52224 dev_kfree_skb_irq(skb);
52225 }
52226 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52227 index 8f9e3fb..d283fb9 100644
52228 --- a/drivers/staging/octeon/ethernet.c
52229 +++ b/drivers/staging/octeon/ethernet.c
52230 @@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52231 * since the RX tasklet also increments it.
52232 */
52233 #ifdef CONFIG_64BIT
52234 - atomic64_add(rx_status.dropped_packets,
52235 - (atomic64_t *)&priv->stats.rx_dropped);
52236 + atomic64_add_unchecked(rx_status.dropped_packets,
52237 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52238 #else
52239 - atomic_add(rx_status.dropped_packets,
52240 - (atomic_t *)&priv->stats.rx_dropped);
52241 + atomic_add_unchecked(rx_status.dropped_packets,
52242 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
52243 #endif
52244 }
52245
52246 diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52247 index 9191993..30e9817 100644
52248 --- a/drivers/staging/rtl8188eu/include/hal_intf.h
52249 +++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52250 @@ -225,7 +225,7 @@ struct hal_ops {
52251
52252 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52253 void (*hal_reset_security_engine)(struct adapter *adapter);
52254 -};
52255 +} __no_const;
52256
52257 enum rt_eeprom_type {
52258 EEPROM_93C46,
52259 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52260 index 070cc03..6806e37 100644
52261 --- a/drivers/staging/rtl8712/rtl871x_io.h
52262 +++ b/drivers/staging/rtl8712/rtl871x_io.h
52263 @@ -108,7 +108,7 @@ struct _io_ops {
52264 u8 *pmem);
52265 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52266 u8 *pmem);
52267 -};
52268 +} __no_const;
52269
52270 struct io_req {
52271 struct list_head list;
52272 diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52273 index 2bf2e2f..84421c9 100644
52274 --- a/drivers/staging/unisys/visorchipset/visorchipset.h
52275 +++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52276 @@ -228,7 +228,7 @@ typedef struct {
52277 void (*device_resume)(ulong busNo, ulong devNo);
52278 int (*get_channel_info)(uuid_le typeGuid, ulong *minSize,
52279 ulong *maxSize);
52280 -} VISORCHIPSET_BUSDEV_NOTIFIERS;
52281 +} __no_const VISORCHIPSET_BUSDEV_NOTIFIERS;
52282
52283 /* These functions live inside visorchipset, and will be called to indicate
52284 * responses to specific events (by code outside of visorchipset).
52285 @@ -243,7 +243,7 @@ typedef struct {
52286 void (*device_destroy)(ulong busNo, ulong devNo, int response);
52287 void (*device_pause)(ulong busNo, ulong devNo, int response);
52288 void (*device_resume)(ulong busNo, ulong devNo, int response);
52289 -} VISORCHIPSET_BUSDEV_RESPONDERS;
52290 +} __no_const VISORCHIPSET_BUSDEV_RESPONDERS;
52291
52292 /** Register functions (in the bus driver) to get called by visorchipset
52293 * whenever a bus or device appears for which this service partition is
52294 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
52295 index ae0dade..803d53a 100644
52296 --- a/drivers/staging/vt6655/hostap.c
52297 +++ b/drivers/staging/vt6655/hostap.c
52298 @@ -65,14 +65,13 @@
52299 *
52300 */
52301
52302 +static net_device_ops_no_const apdev_netdev_ops;
52303 +
52304 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52305 {
52306 struct vnt_private *apdev_priv;
52307 struct net_device *dev = pDevice->dev;
52308 int ret;
52309 - const struct net_device_ops apdev_netdev_ops = {
52310 - .ndo_start_xmit = pDevice->tx_80211,
52311 - };
52312
52313 pr_debug("%s: Enabling hostapd mode\n", dev->name);
52314
52315 @@ -84,6 +83,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52316 *apdev_priv = *pDevice;
52317 eth_hw_addr_inherit(pDevice->apdev, dev);
52318
52319 + /* only half broken now */
52320 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
52321 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
52322
52323 pDevice->apdev->type = ARPHRD_IEEE80211;
52324 diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52325 index e7e9372..161f530 100644
52326 --- a/drivers/target/sbp/sbp_target.c
52327 +++ b/drivers/target/sbp/sbp_target.c
52328 @@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52329
52330 #define SESSION_MAINTENANCE_INTERVAL HZ
52331
52332 -static atomic_t login_id = ATOMIC_INIT(0);
52333 +static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52334
52335 static void session_maintenance_work(struct work_struct *);
52336 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52337 @@ -444,7 +444,7 @@ static void sbp_management_request_login(
52338 login->lun = se_lun;
52339 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52340 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52341 - login->login_id = atomic_inc_return(&login_id);
52342 + login->login_id = atomic_inc_return_unchecked(&login_id);
52343
52344 login->tgt_agt = sbp_target_agent_register(login);
52345 if (IS_ERR(login->tgt_agt)) {
52346 diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52347 index c45f9e9..00e85f0 100644
52348 --- a/drivers/target/target_core_device.c
52349 +++ b/drivers/target/target_core_device.c
52350 @@ -1532,7 +1532,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52351 spin_lock_init(&dev->se_tmr_lock);
52352 spin_lock_init(&dev->qf_cmd_lock);
52353 sema_init(&dev->caw_sem, 1);
52354 - atomic_set(&dev->dev_ordered_id, 0);
52355 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
52356 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52357 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52358 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52359 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52360 index be877bf..7be9cd4 100644
52361 --- a/drivers/target/target_core_transport.c
52362 +++ b/drivers/target/target_core_transport.c
52363 @@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52364 * Used to determine when ORDERED commands should go from
52365 * Dormant to Active status.
52366 */
52367 - cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52368 + cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52369 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52370 cmd->se_ordered_id, cmd->sam_task_attr,
52371 dev->transport->name);
52372 diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52373 index edc1cce..769e4cb 100644
52374 --- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52375 +++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52376 @@ -209,8 +209,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52377 platform_set_drvdata(pdev, priv);
52378
52379 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52380 - int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52381 - int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52382 + pax_open_kernel();
52383 + *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52384 + *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52385 + pax_close_kernel();
52386 }
52387 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52388 priv, &int3400_thermal_ops,
52389 diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52390 index 62143ba..ae21165 100644
52391 --- a/drivers/thermal/of-thermal.c
52392 +++ b/drivers/thermal/of-thermal.c
52393 @@ -30,6 +30,7 @@
52394 #include <linux/err.h>
52395 #include <linux/export.h>
52396 #include <linux/string.h>
52397 +#include <linux/mm.h>
52398
52399 #include "thermal_core.h"
52400
52401 @@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52402 tz->get_trend = get_trend;
52403 tz->sensor_data = data;
52404
52405 - tzd->ops->get_temp = of_thermal_get_temp;
52406 - tzd->ops->get_trend = of_thermal_get_trend;
52407 + pax_open_kernel();
52408 + *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52409 + *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52410 + pax_close_kernel();
52411 mutex_unlock(&tzd->lock);
52412
52413 return tzd;
52414 @@ -473,8 +476,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52415 return;
52416
52417 mutex_lock(&tzd->lock);
52418 - tzd->ops->get_temp = NULL;
52419 - tzd->ops->get_trend = NULL;
52420 + pax_open_kernel();
52421 + *(void **)&tzd->ops->get_temp = NULL;
52422 + *(void **)&tzd->ops->get_trend = NULL;
52423 + pax_close_kernel();
52424
52425 tz->get_temp = NULL;
52426 tz->get_trend = NULL;
52427 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52428 index fd66f57..48e6376 100644
52429 --- a/drivers/tty/cyclades.c
52430 +++ b/drivers/tty/cyclades.c
52431 @@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52432 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52433 info->port.count);
52434 #endif
52435 - info->port.count++;
52436 + atomic_inc(&info->port.count);
52437 #ifdef CY_DEBUG_COUNT
52438 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52439 - current->pid, info->port.count);
52440 + current->pid, atomic_read(&info->port.count));
52441 #endif
52442
52443 /*
52444 @@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52445 for (j = 0; j < cy_card[i].nports; j++) {
52446 info = &cy_card[i].ports[j];
52447
52448 - if (info->port.count) {
52449 + if (atomic_read(&info->port.count)) {
52450 /* XXX is the ldisc num worth this? */
52451 struct tty_struct *tty;
52452 struct tty_ldisc *ld;
52453 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52454 index 4fcec1d..5a036f7 100644
52455 --- a/drivers/tty/hvc/hvc_console.c
52456 +++ b/drivers/tty/hvc/hvc_console.c
52457 @@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52458
52459 spin_lock_irqsave(&hp->port.lock, flags);
52460 /* Check and then increment for fast path open. */
52461 - if (hp->port.count++ > 0) {
52462 + if (atomic_inc_return(&hp->port.count) > 1) {
52463 spin_unlock_irqrestore(&hp->port.lock, flags);
52464 hvc_kick();
52465 return 0;
52466 @@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52467
52468 spin_lock_irqsave(&hp->port.lock, flags);
52469
52470 - if (--hp->port.count == 0) {
52471 + if (atomic_dec_return(&hp->port.count) == 0) {
52472 spin_unlock_irqrestore(&hp->port.lock, flags);
52473 /* We are done with the tty pointer now. */
52474 tty_port_tty_set(&hp->port, NULL);
52475 @@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52476 */
52477 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52478 } else {
52479 - if (hp->port.count < 0)
52480 + if (atomic_read(&hp->port.count) < 0)
52481 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
52482 - hp->vtermno, hp->port.count);
52483 + hp->vtermno, atomic_read(&hp->port.count));
52484 spin_unlock_irqrestore(&hp->port.lock, flags);
52485 }
52486 }
52487 @@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
52488 * open->hangup case this can be called after the final close so prevent
52489 * that from happening for now.
52490 */
52491 - if (hp->port.count <= 0) {
52492 + if (atomic_read(&hp->port.count) <= 0) {
52493 spin_unlock_irqrestore(&hp->port.lock, flags);
52494 return;
52495 }
52496
52497 - hp->port.count = 0;
52498 + atomic_set(&hp->port.count, 0);
52499 spin_unlock_irqrestore(&hp->port.lock, flags);
52500 tty_port_tty_set(&hp->port, NULL);
52501
52502 @@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
52503 return -EPIPE;
52504
52505 /* FIXME what's this (unprotected) check for? */
52506 - if (hp->port.count <= 0)
52507 + if (atomic_read(&hp->port.count) <= 0)
52508 return -EIO;
52509
52510 spin_lock_irqsave(&hp->lock, flags);
52511 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
52512 index 81e939e..95ead10 100644
52513 --- a/drivers/tty/hvc/hvcs.c
52514 +++ b/drivers/tty/hvc/hvcs.c
52515 @@ -83,6 +83,7 @@
52516 #include <asm/hvcserver.h>
52517 #include <asm/uaccess.h>
52518 #include <asm/vio.h>
52519 +#include <asm/local.h>
52520
52521 /*
52522 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
52523 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
52524
52525 spin_lock_irqsave(&hvcsd->lock, flags);
52526
52527 - if (hvcsd->port.count > 0) {
52528 + if (atomic_read(&hvcsd->port.count) > 0) {
52529 spin_unlock_irqrestore(&hvcsd->lock, flags);
52530 printk(KERN_INFO "HVCS: vterm state unchanged. "
52531 "The hvcs device node is still in use.\n");
52532 @@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
52533 }
52534 }
52535
52536 - hvcsd->port.count = 0;
52537 + atomic_set(&hvcsd->port.count, 0);
52538 hvcsd->port.tty = tty;
52539 tty->driver_data = hvcsd;
52540
52541 @@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
52542 unsigned long flags;
52543
52544 spin_lock_irqsave(&hvcsd->lock, flags);
52545 - hvcsd->port.count++;
52546 + atomic_inc(&hvcsd->port.count);
52547 hvcsd->todo_mask |= HVCS_SCHED_READ;
52548 spin_unlock_irqrestore(&hvcsd->lock, flags);
52549
52550 @@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52551 hvcsd = tty->driver_data;
52552
52553 spin_lock_irqsave(&hvcsd->lock, flags);
52554 - if (--hvcsd->port.count == 0) {
52555 + if (atomic_dec_and_test(&hvcsd->port.count)) {
52556
52557 vio_disable_interrupts(hvcsd->vdev);
52558
52559 @@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52560
52561 free_irq(irq, hvcsd);
52562 return;
52563 - } else if (hvcsd->port.count < 0) {
52564 + } else if (atomic_read(&hvcsd->port.count) < 0) {
52565 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
52566 " is missmanaged.\n",
52567 - hvcsd->vdev->unit_address, hvcsd->port.count);
52568 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
52569 }
52570
52571 spin_unlock_irqrestore(&hvcsd->lock, flags);
52572 @@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52573
52574 spin_lock_irqsave(&hvcsd->lock, flags);
52575 /* Preserve this so that we know how many kref refs to put */
52576 - temp_open_count = hvcsd->port.count;
52577 + temp_open_count = atomic_read(&hvcsd->port.count);
52578
52579 /*
52580 * Don't kref put inside the spinlock because the destruction
52581 @@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52582 tty->driver_data = NULL;
52583 hvcsd->port.tty = NULL;
52584
52585 - hvcsd->port.count = 0;
52586 + atomic_set(&hvcsd->port.count, 0);
52587
52588 /* This will drop any buffered data on the floor which is OK in a hangup
52589 * scenario. */
52590 @@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
52591 * the middle of a write operation? This is a crummy place to do this
52592 * but we want to keep it all in the spinlock.
52593 */
52594 - if (hvcsd->port.count <= 0) {
52595 + if (atomic_read(&hvcsd->port.count) <= 0) {
52596 spin_unlock_irqrestore(&hvcsd->lock, flags);
52597 return -ENODEV;
52598 }
52599 @@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
52600 {
52601 struct hvcs_struct *hvcsd = tty->driver_data;
52602
52603 - if (!hvcsd || hvcsd->port.count <= 0)
52604 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
52605 return 0;
52606
52607 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
52608 diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
52609 index 4190199..06d5bfa 100644
52610 --- a/drivers/tty/hvc/hvsi.c
52611 +++ b/drivers/tty/hvc/hvsi.c
52612 @@ -85,7 +85,7 @@ struct hvsi_struct {
52613 int n_outbuf;
52614 uint32_t vtermno;
52615 uint32_t virq;
52616 - atomic_t seqno; /* HVSI packet sequence number */
52617 + atomic_unchecked_t seqno; /* HVSI packet sequence number */
52618 uint16_t mctrl;
52619 uint8_t state; /* HVSI protocol state */
52620 uint8_t flags;
52621 @@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
52622
52623 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
52624 packet.hdr.len = sizeof(struct hvsi_query_response);
52625 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52626 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52627 packet.verb = VSV_SEND_VERSION_NUMBER;
52628 packet.u.version = HVSI_VERSION;
52629 packet.query_seqno = query_seqno+1;
52630 @@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
52631
52632 packet.hdr.type = VS_QUERY_PACKET_HEADER;
52633 packet.hdr.len = sizeof(struct hvsi_query);
52634 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52635 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52636 packet.verb = verb;
52637
52638 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
52639 @@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
52640 int wrote;
52641
52642 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
52643 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52644 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52645 packet.hdr.len = sizeof(struct hvsi_control);
52646 packet.verb = VSV_SET_MODEM_CTL;
52647 packet.mask = HVSI_TSDTR;
52648 @@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
52649 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
52650
52651 packet.hdr.type = VS_DATA_PACKET_HEADER;
52652 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52653 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52654 packet.hdr.len = count + sizeof(struct hvsi_header);
52655 memcpy(&packet.data, buf, count);
52656
52657 @@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
52658 struct hvsi_control packet __ALIGNED__;
52659
52660 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
52661 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52662 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52663 packet.hdr.len = 6;
52664 packet.verb = VSV_CLOSE_PROTOCOL;
52665
52666 @@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
52667
52668 tty_port_tty_set(&hp->port, tty);
52669 spin_lock_irqsave(&hp->lock, flags);
52670 - hp->port.count++;
52671 + atomic_inc(&hp->port.count);
52672 atomic_set(&hp->seqno, 0);
52673 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
52674 spin_unlock_irqrestore(&hp->lock, flags);
52675 @@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52676
52677 spin_lock_irqsave(&hp->lock, flags);
52678
52679 - if (--hp->port.count == 0) {
52680 + if (atomic_dec_return(&hp->port.count) == 0) {
52681 tty_port_tty_set(&hp->port, NULL);
52682 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
52683
52684 @@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52685
52686 spin_lock_irqsave(&hp->lock, flags);
52687 }
52688 - } else if (hp->port.count < 0)
52689 + } else if (atomic_read(&hp->port.count) < 0)
52690 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
52691 - hp - hvsi_ports, hp->port.count);
52692 + hp - hvsi_ports, atomic_read(&hp->port.count));
52693
52694 spin_unlock_irqrestore(&hp->lock, flags);
52695 }
52696 @@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
52697 tty_port_tty_set(&hp->port, NULL);
52698
52699 spin_lock_irqsave(&hp->lock, flags);
52700 - hp->port.count = 0;
52701 + atomic_set(&hp->port.count, 0);
52702 hp->n_outbuf = 0;
52703 spin_unlock_irqrestore(&hp->lock, flags);
52704 }
52705 diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
52706 index 7ae6c29..05c6dba 100644
52707 --- a/drivers/tty/hvc/hvsi_lib.c
52708 +++ b/drivers/tty/hvc/hvsi_lib.c
52709 @@ -8,7 +8,7 @@
52710
52711 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
52712 {
52713 - packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
52714 + packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
52715
52716 /* Assumes that always succeeds, works in practice */
52717 return pv->put_chars(pv->termno, (char *)packet, packet->len);
52718 @@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
52719
52720 /* Reset state */
52721 pv->established = 0;
52722 - atomic_set(&pv->seqno, 0);
52723 + atomic_set_unchecked(&pv->seqno, 0);
52724
52725 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
52726
52727 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
52728 index 345cebb..d5a1e9e 100644
52729 --- a/drivers/tty/ipwireless/tty.c
52730 +++ b/drivers/tty/ipwireless/tty.c
52731 @@ -28,6 +28,7 @@
52732 #include <linux/tty_driver.h>
52733 #include <linux/tty_flip.h>
52734 #include <linux/uaccess.h>
52735 +#include <asm/local.h>
52736
52737 #include "tty.h"
52738 #include "network.h"
52739 @@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52740 return -ENODEV;
52741
52742 mutex_lock(&tty->ipw_tty_mutex);
52743 - if (tty->port.count == 0)
52744 + if (atomic_read(&tty->port.count) == 0)
52745 tty->tx_bytes_queued = 0;
52746
52747 - tty->port.count++;
52748 + atomic_inc(&tty->port.count);
52749
52750 tty->port.tty = linux_tty;
52751 linux_tty->driver_data = tty;
52752 @@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52753
52754 static void do_ipw_close(struct ipw_tty *tty)
52755 {
52756 - tty->port.count--;
52757 -
52758 - if (tty->port.count == 0) {
52759 + if (atomic_dec_return(&tty->port.count) == 0) {
52760 struct tty_struct *linux_tty = tty->port.tty;
52761
52762 if (linux_tty != NULL) {
52763 @@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
52764 return;
52765
52766 mutex_lock(&tty->ipw_tty_mutex);
52767 - if (tty->port.count == 0) {
52768 + if (atomic_read(&tty->port.count) == 0) {
52769 mutex_unlock(&tty->ipw_tty_mutex);
52770 return;
52771 }
52772 @@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
52773
52774 mutex_lock(&tty->ipw_tty_mutex);
52775
52776 - if (!tty->port.count) {
52777 + if (!atomic_read(&tty->port.count)) {
52778 mutex_unlock(&tty->ipw_tty_mutex);
52779 return;
52780 }
52781 @@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
52782 return -ENODEV;
52783
52784 mutex_lock(&tty->ipw_tty_mutex);
52785 - if (!tty->port.count) {
52786 + if (!atomic_read(&tty->port.count)) {
52787 mutex_unlock(&tty->ipw_tty_mutex);
52788 return -EINVAL;
52789 }
52790 @@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
52791 if (!tty)
52792 return -ENODEV;
52793
52794 - if (!tty->port.count)
52795 + if (!atomic_read(&tty->port.count))
52796 return -EINVAL;
52797
52798 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
52799 @@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
52800 if (!tty)
52801 return 0;
52802
52803 - if (!tty->port.count)
52804 + if (!atomic_read(&tty->port.count))
52805 return 0;
52806
52807 return tty->tx_bytes_queued;
52808 @@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
52809 if (!tty)
52810 return -ENODEV;
52811
52812 - if (!tty->port.count)
52813 + if (!atomic_read(&tty->port.count))
52814 return -EINVAL;
52815
52816 return get_control_lines(tty);
52817 @@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
52818 if (!tty)
52819 return -ENODEV;
52820
52821 - if (!tty->port.count)
52822 + if (!atomic_read(&tty->port.count))
52823 return -EINVAL;
52824
52825 return set_control_lines(tty, set, clear);
52826 @@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
52827 if (!tty)
52828 return -ENODEV;
52829
52830 - if (!tty->port.count)
52831 + if (!atomic_read(&tty->port.count))
52832 return -EINVAL;
52833
52834 /* FIXME: Exactly how is the tty object locked here .. */
52835 @@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
52836 * are gone */
52837 mutex_lock(&ttyj->ipw_tty_mutex);
52838 }
52839 - while (ttyj->port.count)
52840 + while (atomic_read(&ttyj->port.count))
52841 do_ipw_close(ttyj);
52842 ipwireless_disassociate_network_ttys(network,
52843 ttyj->channel_idx);
52844 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
52845 index 14c54e0..1efd4f2 100644
52846 --- a/drivers/tty/moxa.c
52847 +++ b/drivers/tty/moxa.c
52848 @@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
52849 }
52850
52851 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
52852 - ch->port.count++;
52853 + atomic_inc(&ch->port.count);
52854 tty->driver_data = ch;
52855 tty_port_tty_set(&ch->port, tty);
52856 mutex_lock(&ch->port.mutex);
52857 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
52858 index c434376..114ce13 100644
52859 --- a/drivers/tty/n_gsm.c
52860 +++ b/drivers/tty/n_gsm.c
52861 @@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
52862 spin_lock_init(&dlci->lock);
52863 mutex_init(&dlci->mutex);
52864 dlci->fifo = &dlci->_fifo;
52865 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
52866 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
52867 kfree(dlci);
52868 return NULL;
52869 }
52870 @@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
52871 struct gsm_dlci *dlci = tty->driver_data;
52872 struct tty_port *port = &dlci->port;
52873
52874 - port->count++;
52875 + atomic_inc(&port->count);
52876 tty_port_tty_set(port, tty);
52877
52878 dlci->modem_rx = 0;
52879 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
52880 index 2e900a9..576d216 100644
52881 --- a/drivers/tty/n_tty.c
52882 +++ b/drivers/tty/n_tty.c
52883 @@ -115,7 +115,7 @@ struct n_tty_data {
52884 int minimum_to_wake;
52885
52886 /* consumer-published */
52887 - size_t read_tail;
52888 + size_t read_tail __intentional_overflow(-1);
52889 size_t line_start;
52890
52891 /* protected by output lock */
52892 @@ -2522,6 +2522,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
52893 {
52894 *ops = tty_ldisc_N_TTY;
52895 ops->owner = NULL;
52896 - ops->refcount = ops->flags = 0;
52897 + atomic_set(&ops->refcount, 0);
52898 + ops->flags = 0;
52899 }
52900 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
52901 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
52902 index 7c4447a..70fbc1e 100644
52903 --- a/drivers/tty/pty.c
52904 +++ b/drivers/tty/pty.c
52905 @@ -830,8 +830,10 @@ static void __init unix98_pty_init(void)
52906 panic("Couldn't register Unix98 pts driver");
52907
52908 /* Now create the /dev/ptmx special device */
52909 + pax_open_kernel();
52910 tty_default_fops(&ptmx_fops);
52911 - ptmx_fops.open = ptmx_open;
52912 + *(void **)&ptmx_fops.open = ptmx_open;
52913 + pax_close_kernel();
52914
52915 cdev_init(&ptmx_cdev, &ptmx_fops);
52916 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
52917 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
52918 index 383c4c7..d408e21 100644
52919 --- a/drivers/tty/rocket.c
52920 +++ b/drivers/tty/rocket.c
52921 @@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52922 tty->driver_data = info;
52923 tty_port_tty_set(port, tty);
52924
52925 - if (port->count++ == 0) {
52926 + if (atomic_inc_return(&port->count) == 1) {
52927 atomic_inc(&rp_num_ports_open);
52928
52929 #ifdef ROCKET_DEBUG_OPEN
52930 @@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52931 #endif
52932 }
52933 #ifdef ROCKET_DEBUG_OPEN
52934 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
52935 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
52936 #endif
52937
52938 /*
52939 @@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
52940 spin_unlock_irqrestore(&info->port.lock, flags);
52941 return;
52942 }
52943 - if (info->port.count)
52944 + if (atomic_read(&info->port.count))
52945 atomic_dec(&rp_num_ports_open);
52946 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
52947 spin_unlock_irqrestore(&info->port.lock, flags);
52948 diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
52949 index aa28209..e08fb85 100644
52950 --- a/drivers/tty/serial/ioc4_serial.c
52951 +++ b/drivers/tty/serial/ioc4_serial.c
52952 @@ -437,7 +437,7 @@ struct ioc4_soft {
52953 } is_intr_info[MAX_IOC4_INTR_ENTS];
52954
52955 /* Number of entries active in the above array */
52956 - atomic_t is_num_intrs;
52957 + atomic_unchecked_t is_num_intrs;
52958 } is_intr_type[IOC4_NUM_INTR_TYPES];
52959
52960 /* is_ir_lock must be held while
52961 @@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
52962 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
52963 || (type == IOC4_OTHER_INTR_TYPE)));
52964
52965 - i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
52966 + i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
52967 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
52968
52969 /* Save off the lower level interrupt handler */
52970 @@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
52971
52972 soft = arg;
52973 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
52974 - num_intrs = (int)atomic_read(
52975 + num_intrs = (int)atomic_read_unchecked(
52976 &soft->is_intr_type[intr_type].is_num_intrs);
52977
52978 this_mir = this_ir = pending_intrs(soft, intr_type);
52979 diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
52980 index 129dc5b..1da5bb8 100644
52981 --- a/drivers/tty/serial/kgdb_nmi.c
52982 +++ b/drivers/tty/serial/kgdb_nmi.c
52983 @@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
52984 * I/O utilities that messages sent to the console will automatically
52985 * be displayed on the dbg_io.
52986 */
52987 - dbg_io_ops->is_console = true;
52988 + pax_open_kernel();
52989 + *(int *)&dbg_io_ops->is_console = true;
52990 + pax_close_kernel();
52991
52992 return 0;
52993 }
52994 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
52995 index a260cde..6b2b5ce 100644
52996 --- a/drivers/tty/serial/kgdboc.c
52997 +++ b/drivers/tty/serial/kgdboc.c
52998 @@ -24,8 +24,9 @@
52999 #define MAX_CONFIG_LEN 40
53000
53001 static struct kgdb_io kgdboc_io_ops;
53002 +static struct kgdb_io kgdboc_io_ops_console;
53003
53004 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
53005 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
53006 static int configured = -1;
53007
53008 static char config[MAX_CONFIG_LEN];
53009 @@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
53010 kgdboc_unregister_kbd();
53011 if (configured == 1)
53012 kgdb_unregister_io_module(&kgdboc_io_ops);
53013 + else if (configured == 2)
53014 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
53015 }
53016
53017 static int configure_kgdboc(void)
53018 @@ -160,13 +163,13 @@ static int configure_kgdboc(void)
53019 int err;
53020 char *cptr = config;
53021 struct console *cons;
53022 + int is_console = 0;
53023
53024 err = kgdboc_option_setup(config);
53025 if (err || !strlen(config) || isspace(config[0]))
53026 goto noconfig;
53027
53028 err = -ENODEV;
53029 - kgdboc_io_ops.is_console = 0;
53030 kgdb_tty_driver = NULL;
53031
53032 kgdboc_use_kms = 0;
53033 @@ -187,7 +190,7 @@ static int configure_kgdboc(void)
53034 int idx;
53035 if (cons->device && cons->device(cons, &idx) == p &&
53036 idx == tty_line) {
53037 - kgdboc_io_ops.is_console = 1;
53038 + is_console = 1;
53039 break;
53040 }
53041 cons = cons->next;
53042 @@ -197,7 +200,13 @@ static int configure_kgdboc(void)
53043 kgdb_tty_line = tty_line;
53044
53045 do_register:
53046 - err = kgdb_register_io_module(&kgdboc_io_ops);
53047 + if (is_console) {
53048 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
53049 + configured = 2;
53050 + } else {
53051 + err = kgdb_register_io_module(&kgdboc_io_ops);
53052 + configured = 1;
53053 + }
53054 if (err)
53055 goto noconfig;
53056
53057 @@ -205,8 +214,6 @@ do_register:
53058 if (err)
53059 goto nmi_con_failed;
53060
53061 - configured = 1;
53062 -
53063 return 0;
53064
53065 nmi_con_failed:
53066 @@ -223,7 +230,7 @@ noconfig:
53067 static int __init init_kgdboc(void)
53068 {
53069 /* Already configured? */
53070 - if (configured == 1)
53071 + if (configured >= 1)
53072 return 0;
53073
53074 return configure_kgdboc();
53075 @@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53076 if (config[len - 1] == '\n')
53077 config[len - 1] = '\0';
53078
53079 - if (configured == 1)
53080 + if (configured >= 1)
53081 cleanup_kgdboc();
53082
53083 /* Go and configure with the new params. */
53084 @@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53085 .post_exception = kgdboc_post_exp_handler,
53086 };
53087
53088 +static struct kgdb_io kgdboc_io_ops_console = {
53089 + .name = "kgdboc",
53090 + .read_char = kgdboc_get_char,
53091 + .write_char = kgdboc_put_char,
53092 + .pre_exception = kgdboc_pre_exp_handler,
53093 + .post_exception = kgdboc_post_exp_handler,
53094 + .is_console = 1
53095 +};
53096 +
53097 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53098 /* This is only available if kgdboc is a built in for early debugging */
53099 static int __init kgdboc_early_init(char *opt)
53100 diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53101 index 4b6c783..9a19db3 100644
53102 --- a/drivers/tty/serial/msm_serial.c
53103 +++ b/drivers/tty/serial/msm_serial.c
53104 @@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53105 .cons = MSM_CONSOLE,
53106 };
53107
53108 -static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53109 +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53110
53111 static const struct of_device_id msm_uartdm_table[] = {
53112 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53113 @@ -1047,7 +1047,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53114 int irq;
53115
53116 if (pdev->id == -1)
53117 - pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
53118 + pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53119
53120 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
53121 return -ENXIO;
53122 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53123 index c78f43a..22b1dab 100644
53124 --- a/drivers/tty/serial/samsung.c
53125 +++ b/drivers/tty/serial/samsung.c
53126 @@ -478,11 +478,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53127 }
53128 }
53129
53130 +static int s3c64xx_serial_startup(struct uart_port *port);
53131 static int s3c24xx_serial_startup(struct uart_port *port)
53132 {
53133 struct s3c24xx_uart_port *ourport = to_ourport(port);
53134 int ret;
53135
53136 + /* Startup sequence is different for s3c64xx and higher SoC's */
53137 + if (s3c24xx_serial_has_interrupt_mask(port))
53138 + return s3c64xx_serial_startup(port);
53139 +
53140 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53141 port, (unsigned long long)port->mapbase, port->membase);
53142
53143 @@ -1155,10 +1160,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53144 /* setup info for port */
53145 port->dev = &platdev->dev;
53146
53147 - /* Startup sequence is different for s3c64xx and higher SoC's */
53148 - if (s3c24xx_serial_has_interrupt_mask(port))
53149 - s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53150 -
53151 port->uartclk = 1;
53152
53153 if (cfg->uart_flags & UPF_CONS_FLOW) {
53154 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53155 index eaeb9a0..01a238c 100644
53156 --- a/drivers/tty/serial/serial_core.c
53157 +++ b/drivers/tty/serial/serial_core.c
53158 @@ -1339,7 +1339,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53159
53160 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53161
53162 - if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53163 + if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53164 return;
53165
53166 /*
53167 @@ -1466,7 +1466,7 @@ static void uart_hangup(struct tty_struct *tty)
53168 uart_flush_buffer(tty);
53169 uart_shutdown(tty, state);
53170 spin_lock_irqsave(&port->lock, flags);
53171 - port->count = 0;
53172 + atomic_set(&port->count, 0);
53173 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53174 spin_unlock_irqrestore(&port->lock, flags);
53175 tty_port_tty_set(port, NULL);
53176 @@ -1564,7 +1564,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53177 goto end;
53178 }
53179
53180 - port->count++;
53181 + atomic_inc(&port->count);
53182 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
53183 retval = -ENXIO;
53184 goto err_dec_count;
53185 @@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53186 end:
53187 return retval;
53188 err_dec_count:
53189 - port->count--;
53190 + atomic_dec(&port->count);
53191 mutex_unlock(&port->mutex);
53192 goto end;
53193 }
53194 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53195 index b799170..87dafd5 100644
53196 --- a/drivers/tty/synclink.c
53197 +++ b/drivers/tty/synclink.c
53198 @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53199
53200 if (debug_level >= DEBUG_LEVEL_INFO)
53201 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53202 - __FILE__,__LINE__, info->device_name, info->port.count);
53203 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53204
53205 if (tty_port_close_start(&info->port, tty, filp) == 0)
53206 goto cleanup;
53207 @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53208 cleanup:
53209 if (debug_level >= DEBUG_LEVEL_INFO)
53210 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53211 - tty->driver->name, info->port.count);
53212 + tty->driver->name, atomic_read(&info->port.count));
53213
53214 } /* end of mgsl_close() */
53215
53216 @@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53217
53218 mgsl_flush_buffer(tty);
53219 shutdown(info);
53220 -
53221 - info->port.count = 0;
53222 +
53223 + atomic_set(&info->port.count, 0);
53224 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53225 info->port.tty = NULL;
53226
53227 @@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53228
53229 if (debug_level >= DEBUG_LEVEL_INFO)
53230 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53231 - __FILE__,__LINE__, tty->driver->name, port->count );
53232 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53233
53234 spin_lock_irqsave(&info->irq_spinlock, flags);
53235 - port->count--;
53236 + atomic_dec(&port->count);
53237 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53238 port->blocked_open++;
53239
53240 @@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53241
53242 if (debug_level >= DEBUG_LEVEL_INFO)
53243 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53244 - __FILE__,__LINE__, tty->driver->name, port->count );
53245 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53246
53247 tty_unlock(tty);
53248 schedule();
53249 @@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53250
53251 /* FIXME: Racy on hangup during close wait */
53252 if (!tty_hung_up_p(filp))
53253 - port->count++;
53254 + atomic_inc(&port->count);
53255 port->blocked_open--;
53256
53257 if (debug_level >= DEBUG_LEVEL_INFO)
53258 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53259 - __FILE__,__LINE__, tty->driver->name, port->count );
53260 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53261
53262 if (!retval)
53263 port->flags |= ASYNC_NORMAL_ACTIVE;
53264 @@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53265
53266 if (debug_level >= DEBUG_LEVEL_INFO)
53267 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53268 - __FILE__,__LINE__,tty->driver->name, info->port.count);
53269 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53270
53271 /* If port is closing, signal caller to try again */
53272 if (info->port.flags & ASYNC_CLOSING){
53273 @@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53274 spin_unlock_irqrestore(&info->netlock, flags);
53275 goto cleanup;
53276 }
53277 - info->port.count++;
53278 + atomic_inc(&info->port.count);
53279 spin_unlock_irqrestore(&info->netlock, flags);
53280
53281 - if (info->port.count == 1) {
53282 + if (atomic_read(&info->port.count) == 1) {
53283 /* 1st open on this device, init hardware */
53284 retval = startup(info);
53285 if (retval < 0)
53286 @@ -3442,8 +3442,8 @@ cleanup:
53287 if (retval) {
53288 if (tty->count == 1)
53289 info->port.tty = NULL; /* tty layer will release tty struct */
53290 - if(info->port.count)
53291 - info->port.count--;
53292 + if (atomic_read(&info->port.count))
53293 + atomic_dec(&info->port.count);
53294 }
53295
53296 return retval;
53297 @@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53298 unsigned short new_crctype;
53299
53300 /* return error if TTY interface open */
53301 - if (info->port.count)
53302 + if (atomic_read(&info->port.count))
53303 return -EBUSY;
53304
53305 switch (encoding)
53306 @@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53307
53308 /* arbitrate between network and tty opens */
53309 spin_lock_irqsave(&info->netlock, flags);
53310 - if (info->port.count != 0 || info->netcount != 0) {
53311 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53312 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53313 spin_unlock_irqrestore(&info->netlock, flags);
53314 return -EBUSY;
53315 @@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53316 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53317
53318 /* return error if TTY interface open */
53319 - if (info->port.count)
53320 + if (atomic_read(&info->port.count))
53321 return -EBUSY;
53322
53323 if (cmd != SIOCWANDEV)
53324 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53325 index 0e8c39b..e0cb171 100644
53326 --- a/drivers/tty/synclink_gt.c
53327 +++ b/drivers/tty/synclink_gt.c
53328 @@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53329 tty->driver_data = info;
53330 info->port.tty = tty;
53331
53332 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53333 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53334
53335 /* If port is closing, signal caller to try again */
53336 if (info->port.flags & ASYNC_CLOSING){
53337 @@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53338 mutex_unlock(&info->port.mutex);
53339 goto cleanup;
53340 }
53341 - info->port.count++;
53342 + atomic_inc(&info->port.count);
53343 spin_unlock_irqrestore(&info->netlock, flags);
53344
53345 - if (info->port.count == 1) {
53346 + if (atomic_read(&info->port.count) == 1) {
53347 /* 1st open on this device, init hardware */
53348 retval = startup(info);
53349 if (retval < 0) {
53350 @@ -715,8 +715,8 @@ cleanup:
53351 if (retval) {
53352 if (tty->count == 1)
53353 info->port.tty = NULL; /* tty layer will release tty struct */
53354 - if(info->port.count)
53355 - info->port.count--;
53356 + if(atomic_read(&info->port.count))
53357 + atomic_dec(&info->port.count);
53358 }
53359
53360 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53361 @@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53362
53363 if (sanity_check(info, tty->name, "close"))
53364 return;
53365 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53366 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53367
53368 if (tty_port_close_start(&info->port, tty, filp) == 0)
53369 goto cleanup;
53370 @@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53371 tty_port_close_end(&info->port, tty);
53372 info->port.tty = NULL;
53373 cleanup:
53374 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53375 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53376 }
53377
53378 static void hangup(struct tty_struct *tty)
53379 @@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53380 shutdown(info);
53381
53382 spin_lock_irqsave(&info->port.lock, flags);
53383 - info->port.count = 0;
53384 + atomic_set(&info->port.count, 0);
53385 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53386 info->port.tty = NULL;
53387 spin_unlock_irqrestore(&info->port.lock, flags);
53388 @@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53389 unsigned short new_crctype;
53390
53391 /* return error if TTY interface open */
53392 - if (info->port.count)
53393 + if (atomic_read(&info->port.count))
53394 return -EBUSY;
53395
53396 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53397 @@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53398
53399 /* arbitrate between network and tty opens */
53400 spin_lock_irqsave(&info->netlock, flags);
53401 - if (info->port.count != 0 || info->netcount != 0) {
53402 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53403 DBGINFO(("%s hdlc_open busy\n", dev->name));
53404 spin_unlock_irqrestore(&info->netlock, flags);
53405 return -EBUSY;
53406 @@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53407 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53408
53409 /* return error if TTY interface open */
53410 - if (info->port.count)
53411 + if (atomic_read(&info->port.count))
53412 return -EBUSY;
53413
53414 if (cmd != SIOCWANDEV)
53415 @@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53416 if (port == NULL)
53417 continue;
53418 spin_lock(&port->lock);
53419 - if ((port->port.count || port->netcount) &&
53420 + if ((atomic_read(&port->port.count) || port->netcount) &&
53421 port->pending_bh && !port->bh_running &&
53422 !port->bh_requested) {
53423 DBGISR(("%s bh queued\n", port->device_name));
53424 @@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53425 add_wait_queue(&port->open_wait, &wait);
53426
53427 spin_lock_irqsave(&info->lock, flags);
53428 - port->count--;
53429 + atomic_dec(&port->count);
53430 spin_unlock_irqrestore(&info->lock, flags);
53431 port->blocked_open++;
53432
53433 @@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53434 remove_wait_queue(&port->open_wait, &wait);
53435
53436 if (!tty_hung_up_p(filp))
53437 - port->count++;
53438 + atomic_inc(&port->count);
53439 port->blocked_open--;
53440
53441 if (!retval)
53442 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53443 index c3f9091..abe4601 100644
53444 --- a/drivers/tty/synclinkmp.c
53445 +++ b/drivers/tty/synclinkmp.c
53446 @@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53447
53448 if (debug_level >= DEBUG_LEVEL_INFO)
53449 printk("%s(%d):%s open(), old ref count = %d\n",
53450 - __FILE__,__LINE__,tty->driver->name, info->port.count);
53451 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53452
53453 /* If port is closing, signal caller to try again */
53454 if (info->port.flags & ASYNC_CLOSING){
53455 @@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53456 spin_unlock_irqrestore(&info->netlock, flags);
53457 goto cleanup;
53458 }
53459 - info->port.count++;
53460 + atomic_inc(&info->port.count);
53461 spin_unlock_irqrestore(&info->netlock, flags);
53462
53463 - if (info->port.count == 1) {
53464 + if (atomic_read(&info->port.count) == 1) {
53465 /* 1st open on this device, init hardware */
53466 retval = startup(info);
53467 if (retval < 0)
53468 @@ -796,8 +796,8 @@ cleanup:
53469 if (retval) {
53470 if (tty->count == 1)
53471 info->port.tty = NULL; /* tty layer will release tty struct */
53472 - if(info->port.count)
53473 - info->port.count--;
53474 + if(atomic_read(&info->port.count))
53475 + atomic_dec(&info->port.count);
53476 }
53477
53478 return retval;
53479 @@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53480
53481 if (debug_level >= DEBUG_LEVEL_INFO)
53482 printk("%s(%d):%s close() entry, count=%d\n",
53483 - __FILE__,__LINE__, info->device_name, info->port.count);
53484 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53485
53486 if (tty_port_close_start(&info->port, tty, filp) == 0)
53487 goto cleanup;
53488 @@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53489 cleanup:
53490 if (debug_level >= DEBUG_LEVEL_INFO)
53491 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
53492 - tty->driver->name, info->port.count);
53493 + tty->driver->name, atomic_read(&info->port.count));
53494 }
53495
53496 /* Called by tty_hangup() when a hangup is signaled.
53497 @@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
53498 shutdown(info);
53499
53500 spin_lock_irqsave(&info->port.lock, flags);
53501 - info->port.count = 0;
53502 + atomic_set(&info->port.count, 0);
53503 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53504 info->port.tty = NULL;
53505 spin_unlock_irqrestore(&info->port.lock, flags);
53506 @@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53507 unsigned short new_crctype;
53508
53509 /* return error if TTY interface open */
53510 - if (info->port.count)
53511 + if (atomic_read(&info->port.count))
53512 return -EBUSY;
53513
53514 switch (encoding)
53515 @@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
53516
53517 /* arbitrate between network and tty opens */
53518 spin_lock_irqsave(&info->netlock, flags);
53519 - if (info->port.count != 0 || info->netcount != 0) {
53520 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53521 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53522 spin_unlock_irqrestore(&info->netlock, flags);
53523 return -EBUSY;
53524 @@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53525 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53526
53527 /* return error if TTY interface open */
53528 - if (info->port.count)
53529 + if (atomic_read(&info->port.count))
53530 return -EBUSY;
53531
53532 if (cmd != SIOCWANDEV)
53533 @@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
53534 * do not request bottom half processing if the
53535 * device is not open in a normal mode.
53536 */
53537 - if ( port && (port->port.count || port->netcount) &&
53538 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
53539 port->pending_bh && !port->bh_running &&
53540 !port->bh_requested ) {
53541 if ( debug_level >= DEBUG_LEVEL_ISR )
53542 @@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53543
53544 if (debug_level >= DEBUG_LEVEL_INFO)
53545 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
53546 - __FILE__,__LINE__, tty->driver->name, port->count );
53547 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53548
53549 spin_lock_irqsave(&info->lock, flags);
53550 - port->count--;
53551 + atomic_dec(&port->count);
53552 spin_unlock_irqrestore(&info->lock, flags);
53553 port->blocked_open++;
53554
53555 @@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53556
53557 if (debug_level >= DEBUG_LEVEL_INFO)
53558 printk("%s(%d):%s block_til_ready() count=%d\n",
53559 - __FILE__,__LINE__, tty->driver->name, port->count );
53560 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53561
53562 tty_unlock(tty);
53563 schedule();
53564 @@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53565 set_current_state(TASK_RUNNING);
53566 remove_wait_queue(&port->open_wait, &wait);
53567 if (!tty_hung_up_p(filp))
53568 - port->count++;
53569 + atomic_inc(&port->count);
53570 port->blocked_open--;
53571
53572 if (debug_level >= DEBUG_LEVEL_INFO)
53573 printk("%s(%d):%s block_til_ready() after, count=%d\n",
53574 - __FILE__,__LINE__, tty->driver->name, port->count );
53575 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53576
53577 if (!retval)
53578 port->flags |= ASYNC_NORMAL_ACTIVE;
53579 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
53580 index 42bad18..447d7a2 100644
53581 --- a/drivers/tty/sysrq.c
53582 +++ b/drivers/tty/sysrq.c
53583 @@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
53584 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
53585 size_t count, loff_t *ppos)
53586 {
53587 - if (count) {
53588 + if (count && capable(CAP_SYS_ADMIN)) {
53589 char c;
53590
53591 if (get_user(c, buf))
53592 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
53593 index 0508a1d..b610592 100644
53594 --- a/drivers/tty/tty_io.c
53595 +++ b/drivers/tty/tty_io.c
53596 @@ -3498,7 +3498,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
53597
53598 void tty_default_fops(struct file_operations *fops)
53599 {
53600 - *fops = tty_fops;
53601 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
53602 }
53603
53604 /*
53605 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
53606 index 2d822aa..a566234 100644
53607 --- a/drivers/tty/tty_ldisc.c
53608 +++ b/drivers/tty/tty_ldisc.c
53609 @@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
53610 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53611 tty_ldiscs[disc] = new_ldisc;
53612 new_ldisc->num = disc;
53613 - new_ldisc->refcount = 0;
53614 + atomic_set(&new_ldisc->refcount, 0);
53615 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53616
53617 return ret;
53618 @@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
53619 return -EINVAL;
53620
53621 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53622 - if (tty_ldiscs[disc]->refcount)
53623 + if (atomic_read(&tty_ldiscs[disc]->refcount))
53624 ret = -EBUSY;
53625 else
53626 tty_ldiscs[disc] = NULL;
53627 @@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
53628 if (ldops) {
53629 ret = ERR_PTR(-EAGAIN);
53630 if (try_module_get(ldops->owner)) {
53631 - ldops->refcount++;
53632 + atomic_inc(&ldops->refcount);
53633 ret = ldops;
53634 }
53635 }
53636 @@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
53637 unsigned long flags;
53638
53639 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53640 - ldops->refcount--;
53641 + atomic_dec(&ldops->refcount);
53642 module_put(ldops->owner);
53643 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53644 }
53645 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
53646 index 1b93357..ea9f82c 100644
53647 --- a/drivers/tty/tty_port.c
53648 +++ b/drivers/tty/tty_port.c
53649 @@ -237,7 +237,7 @@ void tty_port_hangup(struct tty_port *port)
53650 unsigned long flags;
53651
53652 spin_lock_irqsave(&port->lock, flags);
53653 - port->count = 0;
53654 + atomic_set(&port->count, 0);
53655 port->flags &= ~ASYNC_NORMAL_ACTIVE;
53656 tty = port->tty;
53657 if (tty)
53658 @@ -399,7 +399,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53659
53660 /* The port lock protects the port counts */
53661 spin_lock_irqsave(&port->lock, flags);
53662 - port->count--;
53663 + atomic_dec(&port->count);
53664 port->blocked_open++;
53665 spin_unlock_irqrestore(&port->lock, flags);
53666
53667 @@ -441,7 +441,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53668 we must not mess that up further */
53669 spin_lock_irqsave(&port->lock, flags);
53670 if (!tty_hung_up_p(filp))
53671 - port->count++;
53672 + atomic_inc(&port->count);
53673 port->blocked_open--;
53674 if (retval == 0)
53675 port->flags |= ASYNC_NORMAL_ACTIVE;
53676 @@ -479,19 +479,19 @@ int tty_port_close_start(struct tty_port *port,
53677 return 0;
53678 }
53679
53680 - if (tty->count == 1 && port->count != 1) {
53681 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
53682 printk(KERN_WARNING
53683 "tty_port_close_start: tty->count = 1 port count = %d.\n",
53684 - port->count);
53685 - port->count = 1;
53686 + atomic_read(&port->count));
53687 + atomic_set(&port->count, 1);
53688 }
53689 - if (--port->count < 0) {
53690 + if (atomic_dec_return(&port->count) < 0) {
53691 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
53692 - port->count);
53693 - port->count = 0;
53694 + atomic_read(&port->count));
53695 + atomic_set(&port->count, 0);
53696 }
53697
53698 - if (port->count) {
53699 + if (atomic_read(&port->count)) {
53700 spin_unlock_irqrestore(&port->lock, flags);
53701 return 0;
53702 }
53703 @@ -592,7 +592,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
53704 struct file *filp)
53705 {
53706 spin_lock_irq(&port->lock);
53707 - ++port->count;
53708 + atomic_inc(&port->count);
53709 spin_unlock_irq(&port->lock);
53710 tty_port_tty_set(port, tty);
53711
53712 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
53713 index c039cfe..0b463b0 100644
53714 --- a/drivers/tty/vt/keyboard.c
53715 +++ b/drivers/tty/vt/keyboard.c
53716 @@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
53717 kbd->kbdmode == VC_OFF) &&
53718 value != KVAL(K_SAK))
53719 return; /* SAK is allowed even in raw mode */
53720 +
53721 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53722 + {
53723 + void *func = fn_handler[value];
53724 + if (func == fn_show_state || func == fn_show_ptregs ||
53725 + func == fn_show_mem)
53726 + return;
53727 + }
53728 +#endif
53729 +
53730 fn_handler[value](vc);
53731 }
53732
53733 @@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53734 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
53735 return -EFAULT;
53736
53737 - if (!capable(CAP_SYS_TTY_CONFIG))
53738 - perm = 0;
53739 -
53740 switch (cmd) {
53741 case KDGKBENT:
53742 /* Ensure another thread doesn't free it under us */
53743 @@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53744 spin_unlock_irqrestore(&kbd_event_lock, flags);
53745 return put_user(val, &user_kbe->kb_value);
53746 case KDSKBENT:
53747 + if (!capable(CAP_SYS_TTY_CONFIG))
53748 + perm = 0;
53749 +
53750 if (!perm)
53751 return -EPERM;
53752 if (!i && v == K_NOSUCHMAP) {
53753 @@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53754 int i, j, k;
53755 int ret;
53756
53757 - if (!capable(CAP_SYS_TTY_CONFIG))
53758 - perm = 0;
53759 -
53760 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
53761 if (!kbs) {
53762 ret = -ENOMEM;
53763 @@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53764 kfree(kbs);
53765 return ((p && *p) ? -EOVERFLOW : 0);
53766 case KDSKBSENT:
53767 + if (!capable(CAP_SYS_TTY_CONFIG))
53768 + perm = 0;
53769 +
53770 if (!perm) {
53771 ret = -EPERM;
53772 goto reterr;
53773 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
53774 index 60fa627..7214965 100644
53775 --- a/drivers/uio/uio.c
53776 +++ b/drivers/uio/uio.c
53777 @@ -25,6 +25,7 @@
53778 #include <linux/kobject.h>
53779 #include <linux/cdev.h>
53780 #include <linux/uio_driver.h>
53781 +#include <asm/local.h>
53782
53783 #define UIO_MAX_DEVICES (1U << MINORBITS)
53784
53785 @@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
53786 struct device_attribute *attr, char *buf)
53787 {
53788 struct uio_device *idev = dev_get_drvdata(dev);
53789 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
53790 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
53791 }
53792 static DEVICE_ATTR_RO(event);
53793
53794 @@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
53795 {
53796 struct uio_device *idev = info->uio_dev;
53797
53798 - atomic_inc(&idev->event);
53799 + atomic_inc_unchecked(&idev->event);
53800 wake_up_interruptible(&idev->wait);
53801 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
53802 }
53803 @@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
53804 }
53805
53806 listener->dev = idev;
53807 - listener->event_count = atomic_read(&idev->event);
53808 + listener->event_count = atomic_read_unchecked(&idev->event);
53809 filep->private_data = listener;
53810
53811 if (idev->info->open) {
53812 @@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
53813 return -EIO;
53814
53815 poll_wait(filep, &idev->wait, wait);
53816 - if (listener->event_count != atomic_read(&idev->event))
53817 + if (listener->event_count != atomic_read_unchecked(&idev->event))
53818 return POLLIN | POLLRDNORM;
53819 return 0;
53820 }
53821 @@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
53822 do {
53823 set_current_state(TASK_INTERRUPTIBLE);
53824
53825 - event_count = atomic_read(&idev->event);
53826 + event_count = atomic_read_unchecked(&idev->event);
53827 if (event_count != listener->event_count) {
53828 if (copy_to_user(buf, &event_count, count))
53829 retval = -EFAULT;
53830 @@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
53831 static int uio_find_mem_index(struct vm_area_struct *vma)
53832 {
53833 struct uio_device *idev = vma->vm_private_data;
53834 + unsigned long size;
53835
53836 if (vma->vm_pgoff < MAX_UIO_MAPS) {
53837 - if (idev->info->mem[vma->vm_pgoff].size == 0)
53838 + size = idev->info->mem[vma->vm_pgoff].size;
53839 + if (size == 0)
53840 + return -1;
53841 + if (vma->vm_end - vma->vm_start > size)
53842 return -1;
53843 return (int)vma->vm_pgoff;
53844 }
53845 @@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
53846 idev->owner = owner;
53847 idev->info = info;
53848 init_waitqueue_head(&idev->wait);
53849 - atomic_set(&idev->event, 0);
53850 + atomic_set_unchecked(&idev->event, 0);
53851
53852 ret = uio_get_minor(idev);
53853 if (ret)
53854 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
53855 index 813d4d3..a71934f 100644
53856 --- a/drivers/usb/atm/cxacru.c
53857 +++ b/drivers/usb/atm/cxacru.c
53858 @@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
53859 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
53860 if (ret < 2)
53861 return -EINVAL;
53862 - if (index < 0 || index > 0x7f)
53863 + if (index > 0x7f)
53864 return -EINVAL;
53865 pos += tmp;
53866
53867 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
53868 index dada014..1d0d517 100644
53869 --- a/drivers/usb/atm/usbatm.c
53870 +++ b/drivers/usb/atm/usbatm.c
53871 @@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53872 if (printk_ratelimit())
53873 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
53874 __func__, vpi, vci);
53875 - atomic_inc(&vcc->stats->rx_err);
53876 + atomic_inc_unchecked(&vcc->stats->rx_err);
53877 return;
53878 }
53879
53880 @@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53881 if (length > ATM_MAX_AAL5_PDU) {
53882 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
53883 __func__, length, vcc);
53884 - atomic_inc(&vcc->stats->rx_err);
53885 + atomic_inc_unchecked(&vcc->stats->rx_err);
53886 goto out;
53887 }
53888
53889 @@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53890 if (sarb->len < pdu_length) {
53891 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
53892 __func__, pdu_length, sarb->len, vcc);
53893 - atomic_inc(&vcc->stats->rx_err);
53894 + atomic_inc_unchecked(&vcc->stats->rx_err);
53895 goto out;
53896 }
53897
53898 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
53899 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
53900 __func__, vcc);
53901 - atomic_inc(&vcc->stats->rx_err);
53902 + atomic_inc_unchecked(&vcc->stats->rx_err);
53903 goto out;
53904 }
53905
53906 @@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53907 if (printk_ratelimit())
53908 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
53909 __func__, length);
53910 - atomic_inc(&vcc->stats->rx_drop);
53911 + atomic_inc_unchecked(&vcc->stats->rx_drop);
53912 goto out;
53913 }
53914
53915 @@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53916
53917 vcc->push(vcc, skb);
53918
53919 - atomic_inc(&vcc->stats->rx);
53920 + atomic_inc_unchecked(&vcc->stats->rx);
53921 out:
53922 skb_trim(sarb, 0);
53923 }
53924 @@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
53925 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
53926
53927 usbatm_pop(vcc, skb);
53928 - atomic_inc(&vcc->stats->tx);
53929 + atomic_inc_unchecked(&vcc->stats->tx);
53930
53931 skb = skb_dequeue(&instance->sndqueue);
53932 }
53933 @@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
53934 if (!left--)
53935 return sprintf(page,
53936 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
53937 - atomic_read(&atm_dev->stats.aal5.tx),
53938 - atomic_read(&atm_dev->stats.aal5.tx_err),
53939 - atomic_read(&atm_dev->stats.aal5.rx),
53940 - atomic_read(&atm_dev->stats.aal5.rx_err),
53941 - atomic_read(&atm_dev->stats.aal5.rx_drop));
53942 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
53943 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
53944 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
53945 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
53946 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
53947
53948 if (!left--) {
53949 if (instance->disconnected)
53950 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
53951 index 2a3bbdf..91d72cf 100644
53952 --- a/drivers/usb/core/devices.c
53953 +++ b/drivers/usb/core/devices.c
53954 @@ -126,7 +126,7 @@ static const char format_endpt[] =
53955 * time it gets called.
53956 */
53957 static struct device_connect_event {
53958 - atomic_t count;
53959 + atomic_unchecked_t count;
53960 wait_queue_head_t wait;
53961 } device_event = {
53962 .count = ATOMIC_INIT(1),
53963 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
53964
53965 void usbfs_conn_disc_event(void)
53966 {
53967 - atomic_add(2, &device_event.count);
53968 + atomic_add_unchecked(2, &device_event.count);
53969 wake_up(&device_event.wait);
53970 }
53971
53972 @@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
53973
53974 poll_wait(file, &device_event.wait, wait);
53975
53976 - event_count = atomic_read(&device_event.count);
53977 + event_count = atomic_read_unchecked(&device_event.count);
53978 if (file->f_version != event_count) {
53979 file->f_version = event_count;
53980 return POLLIN | POLLRDNORM;
53981 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
53982 index 0b59731..46ee7d1 100644
53983 --- a/drivers/usb/core/devio.c
53984 +++ b/drivers/usb/core/devio.c
53985 @@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
53986 struct usb_dev_state *ps = file->private_data;
53987 struct usb_device *dev = ps->dev;
53988 ssize_t ret = 0;
53989 - unsigned len;
53990 + size_t len;
53991 loff_t pos;
53992 int i;
53993
53994 @@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
53995 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
53996 struct usb_config_descriptor *config =
53997 (struct usb_config_descriptor *)dev->rawdescriptors[i];
53998 - unsigned int length = le16_to_cpu(config->wTotalLength);
53999 + size_t length = le16_to_cpu(config->wTotalLength);
54000
54001 if (*ppos < pos + length) {
54002
54003 /* The descriptor may claim to be longer than it
54004 * really is. Here is the actual allocated length. */
54005 - unsigned alloclen =
54006 + size_t alloclen =
54007 le16_to_cpu(dev->config[i].desc.wTotalLength);
54008
54009 - len = length - (*ppos - pos);
54010 + len = length + pos - *ppos;
54011 if (len > nbytes)
54012 len = nbytes;
54013
54014 /* Simply don't write (skip over) unallocated parts */
54015 if (alloclen > (*ppos - pos)) {
54016 - alloclen -= (*ppos - pos);
54017 + alloclen = alloclen + pos - *ppos;
54018 if (copy_to_user(buf,
54019 dev->rawdescriptors[i] + (*ppos - pos),
54020 min(len, alloclen))) {
54021 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
54022 index a6efb41..6f72549b 100644
54023 --- a/drivers/usb/core/hcd.c
54024 +++ b/drivers/usb/core/hcd.c
54025 @@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54026 */
54027 usb_get_urb(urb);
54028 atomic_inc(&urb->use_count);
54029 - atomic_inc(&urb->dev->urbnum);
54030 + atomic_inc_unchecked(&urb->dev->urbnum);
54031 usbmon_urb_submit(&hcd->self, urb);
54032
54033 /* NOTE requirements on root-hub callers (usbfs and the hub
54034 @@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54035 urb->hcpriv = NULL;
54036 INIT_LIST_HEAD(&urb->urb_list);
54037 atomic_dec(&urb->use_count);
54038 - atomic_dec(&urb->dev->urbnum);
54039 + atomic_dec_unchecked(&urb->dev->urbnum);
54040 if (atomic_read(&urb->reject))
54041 wake_up(&usb_kill_urb_queue);
54042 usb_put_urb(urb);
54043 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
54044 index b649fef..c7107a0 100644
54045 --- a/drivers/usb/core/hub.c
54046 +++ b/drivers/usb/core/hub.c
54047 @@ -26,6 +26,7 @@
54048 #include <linux/mutex.h>
54049 #include <linux/random.h>
54050 #include <linux/pm_qos.h>
54051 +#include <linux/grsecurity.h>
54052
54053 #include <asm/uaccess.h>
54054 #include <asm/byteorder.h>
54055 @@ -4666,6 +4667,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54056 goto done;
54057 return;
54058 }
54059 +
54060 + if (gr_handle_new_usb())
54061 + goto done;
54062 +
54063 if (hub_is_superspeed(hub->hdev))
54064 unit_load = 150;
54065 else
54066 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54067 index f7b7713..23d07ec 100644
54068 --- a/drivers/usb/core/message.c
54069 +++ b/drivers/usb/core/message.c
54070 @@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54071 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54072 * error number.
54073 */
54074 -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54075 +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54076 __u8 requesttype, __u16 value, __u16 index, void *data,
54077 __u16 size, int timeout)
54078 {
54079 @@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54080 * If successful, 0. Otherwise a negative error number. The number of actual
54081 * bytes transferred will be stored in the @actual_length parameter.
54082 */
54083 -int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54084 +int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54085 void *data, int len, int *actual_length, int timeout)
54086 {
54087 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54088 @@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54089 * bytes transferred will be stored in the @actual_length parameter.
54090 *
54091 */
54092 -int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54093 +int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54094 void *data, int len, int *actual_length, int timeout)
54095 {
54096 struct urb *urb;
54097 diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54098 index 1236c60..d47a51c 100644
54099 --- a/drivers/usb/core/sysfs.c
54100 +++ b/drivers/usb/core/sysfs.c
54101 @@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54102 struct usb_device *udev;
54103
54104 udev = to_usb_device(dev);
54105 - return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54106 + return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54107 }
54108 static DEVICE_ATTR_RO(urbnum);
54109
54110 diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54111 index 2dd2362..1135437 100644
54112 --- a/drivers/usb/core/usb.c
54113 +++ b/drivers/usb/core/usb.c
54114 @@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54115 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54116 dev->state = USB_STATE_ATTACHED;
54117 dev->lpm_disable_count = 1;
54118 - atomic_set(&dev->urbnum, 0);
54119 + atomic_set_unchecked(&dev->urbnum, 0);
54120
54121 INIT_LIST_HEAD(&dev->ep0.urb_list);
54122 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54123 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54124 index 8cfc319..4868255 100644
54125 --- a/drivers/usb/early/ehci-dbgp.c
54126 +++ b/drivers/usb/early/ehci-dbgp.c
54127 @@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54128
54129 #ifdef CONFIG_KGDB
54130 static struct kgdb_io kgdbdbgp_io_ops;
54131 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54132 +static struct kgdb_io kgdbdbgp_io_ops_console;
54133 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54134 #else
54135 #define dbgp_kgdb_mode (0)
54136 #endif
54137 @@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54138 .write_char = kgdbdbgp_write_char,
54139 };
54140
54141 +static struct kgdb_io kgdbdbgp_io_ops_console = {
54142 + .name = "kgdbdbgp",
54143 + .read_char = kgdbdbgp_read_char,
54144 + .write_char = kgdbdbgp_write_char,
54145 + .is_console = 1
54146 +};
54147 +
54148 static int kgdbdbgp_wait_time;
54149
54150 static int __init kgdbdbgp_parse_config(char *str)
54151 @@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54152 ptr++;
54153 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54154 }
54155 - kgdb_register_io_module(&kgdbdbgp_io_ops);
54156 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54157 + if (early_dbgp_console.index != -1)
54158 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54159 + else
54160 + kgdb_register_io_module(&kgdbdbgp_io_ops);
54161
54162 return 0;
54163 }
54164 diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54165 index f7b2032..fbb340c 100644
54166 --- a/drivers/usb/gadget/function/f_uac1.c
54167 +++ b/drivers/usb/gadget/function/f_uac1.c
54168 @@ -14,6 +14,7 @@
54169 #include <linux/module.h>
54170 #include <linux/device.h>
54171 #include <linux/atomic.h>
54172 +#include <linux/module.h>
54173
54174 #include "u_uac1.h"
54175
54176 diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54177 index 491082a..dfd7d17 100644
54178 --- a/drivers/usb/gadget/function/u_serial.c
54179 +++ b/drivers/usb/gadget/function/u_serial.c
54180 @@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54181 spin_lock_irq(&port->port_lock);
54182
54183 /* already open? Great. */
54184 - if (port->port.count) {
54185 + if (atomic_read(&port->port.count)) {
54186 status = 0;
54187 - port->port.count++;
54188 + atomic_inc(&port->port.count);
54189
54190 /* currently opening/closing? wait ... */
54191 } else if (port->openclose) {
54192 @@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54193 tty->driver_data = port;
54194 port->port.tty = tty;
54195
54196 - port->port.count = 1;
54197 + atomic_set(&port->port.count, 1);
54198 port->openclose = false;
54199
54200 /* if connected, start the I/O stream */
54201 @@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54202
54203 spin_lock_irq(&port->port_lock);
54204
54205 - if (port->port.count != 1) {
54206 - if (port->port.count == 0)
54207 + if (atomic_read(&port->port.count) != 1) {
54208 + if (atomic_read(&port->port.count) == 0)
54209 WARN_ON(1);
54210 else
54211 - --port->port.count;
54212 + atomic_dec(&port->port.count);
54213 goto exit;
54214 }
54215
54216 @@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54217 * and sleep if necessary
54218 */
54219 port->openclose = true;
54220 - port->port.count = 0;
54221 + atomic_set(&port->port.count, 0);
54222
54223 gser = port->port_usb;
54224 if (gser && gser->disconnect)
54225 @@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54226 int cond;
54227
54228 spin_lock_irq(&port->port_lock);
54229 - cond = (port->port.count == 0) && !port->openclose;
54230 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54231 spin_unlock_irq(&port->port_lock);
54232 return cond;
54233 }
54234 @@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54235 /* if it's already open, start I/O ... and notify the serial
54236 * protocol about open/close status (connect/disconnect).
54237 */
54238 - if (port->port.count) {
54239 + if (atomic_read(&port->port.count)) {
54240 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54241 gs_start_io(port);
54242 if (gser->connect)
54243 @@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54244
54245 port->port_usb = NULL;
54246 gser->ioport = NULL;
54247 - if (port->port.count > 0 || port->openclose) {
54248 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
54249 wake_up_interruptible(&port->drain_wait);
54250 if (port->port.tty)
54251 tty_hangup(port->port.tty);
54252 @@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54253
54254 /* finally, free any unused/unusable I/O buffers */
54255 spin_lock_irqsave(&port->port_lock, flags);
54256 - if (port->port.count == 0 && !port->openclose)
54257 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
54258 gs_buf_free(&port->port_write_buf);
54259 gs_free_requests(gser->out, &port->read_pool, NULL);
54260 gs_free_requests(gser->out, &port->read_queue, NULL);
54261 diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54262 index a44a07f..ecea924 100644
54263 --- a/drivers/usb/gadget/function/u_uac1.c
54264 +++ b/drivers/usb/gadget/function/u_uac1.c
54265 @@ -17,6 +17,7 @@
54266 #include <linux/ctype.h>
54267 #include <linux/random.h>
54268 #include <linux/syscalls.h>
54269 +#include <linux/module.h>
54270
54271 #include "u_uac1.h"
54272
54273 diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54274 index 5728829..fefc6bf 100644
54275 --- a/drivers/usb/host/ehci-hub.c
54276 +++ b/drivers/usb/host/ehci-hub.c
54277 @@ -771,7 +771,7 @@ static struct urb *request_single_step_set_feature_urb(
54278 urb->transfer_flags = URB_DIR_IN;
54279 usb_get_urb(urb);
54280 atomic_inc(&urb->use_count);
54281 - atomic_inc(&urb->dev->urbnum);
54282 + atomic_inc_unchecked(&urb->dev->urbnum);
54283 urb->setup_dma = dma_map_single(
54284 hcd->self.controller,
54285 urb->setup_packet,
54286 @@ -838,7 +838,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54287 urb->status = -EINPROGRESS;
54288 usb_get_urb(urb);
54289 atomic_inc(&urb->use_count);
54290 - atomic_inc(&urb->dev->urbnum);
54291 + atomic_inc_unchecked(&urb->dev->urbnum);
54292 retval = submit_single_step_set_feature(hcd, urb, 0);
54293 if (!retval && !wait_for_completion_timeout(&done,
54294 msecs_to_jiffies(2000))) {
54295 diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54296 index 1db0626..4948782 100644
54297 --- a/drivers/usb/host/hwa-hc.c
54298 +++ b/drivers/usb/host/hwa-hc.c
54299 @@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54300 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54301 struct wahc *wa = &hwahc->wa;
54302 struct device *dev = &wa->usb_iface->dev;
54303 - u8 mas_le[UWB_NUM_MAS/8];
54304 + u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54305 +
54306 + if (mas_le == NULL)
54307 + return -ENOMEM;
54308
54309 /* Set the stream index */
54310 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54311 @@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54312 WUSB_REQ_SET_WUSB_MAS,
54313 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54314 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54315 - mas_le, 32, USB_CTRL_SET_TIMEOUT);
54316 + mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54317 if (result < 0)
54318 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54319 out:
54320 + kfree(mas_le);
54321 +
54322 return result;
54323 }
54324
54325 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54326 index b3d245e..99549ed 100644
54327 --- a/drivers/usb/misc/appledisplay.c
54328 +++ b/drivers/usb/misc/appledisplay.c
54329 @@ -84,7 +84,7 @@ struct appledisplay {
54330 struct mutex sysfslock; /* concurrent read and write */
54331 };
54332
54333 -static atomic_t count_displays = ATOMIC_INIT(0);
54334 +static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54335 static struct workqueue_struct *wq;
54336
54337 static void appledisplay_complete(struct urb *urb)
54338 @@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54339
54340 /* Register backlight device */
54341 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54342 - atomic_inc_return(&count_displays) - 1);
54343 + atomic_inc_return_unchecked(&count_displays) - 1);
54344 memset(&props, 0, sizeof(struct backlight_properties));
54345 props.type = BACKLIGHT_RAW;
54346 props.max_brightness = 0xff;
54347 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54348 index 8d7fc48..01c4986 100644
54349 --- a/drivers/usb/serial/console.c
54350 +++ b/drivers/usb/serial/console.c
54351 @@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
54352
54353 info->port = port;
54354
54355 - ++port->port.count;
54356 + atomic_inc(&port->port.count);
54357 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54358 if (serial->type->set_termios) {
54359 /*
54360 @@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
54361 }
54362 /* Now that any required fake tty operations are completed restore
54363 * the tty port count */
54364 - --port->port.count;
54365 + atomic_dec(&port->port.count);
54366 /* The console is special in terms of closing the device so
54367 * indicate this port is now acting as a system console. */
54368 port->port.console = 1;
54369 @@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
54370 free_tty:
54371 kfree(tty);
54372 reset_open_count:
54373 - port->port.count = 0;
54374 + atomic_set(&port->port.count, 0);
54375 usb_autopm_put_interface(serial->interface);
54376 error_get_interface:
54377 usb_serial_put(serial);
54378 @@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
54379 static void usb_console_write(struct console *co,
54380 const char *buf, unsigned count)
54381 {
54382 - static struct usbcons_info *info = &usbcons_info;
54383 + struct usbcons_info *info = &usbcons_info;
54384 struct usb_serial_port *port = info->port;
54385 struct usb_serial *serial;
54386 int retval = -ENODEV;
54387 diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54388 index 307e339..6aa97cb 100644
54389 --- a/drivers/usb/storage/usb.h
54390 +++ b/drivers/usb/storage/usb.h
54391 @@ -63,7 +63,7 @@ struct us_unusual_dev {
54392 __u8 useProtocol;
54393 __u8 useTransport;
54394 int (*initFunction)(struct us_data *);
54395 -};
54396 +} __do_const;
54397
54398
54399 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54400 diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54401 index a863a98..d272795 100644
54402 --- a/drivers/usb/usbip/vhci.h
54403 +++ b/drivers/usb/usbip/vhci.h
54404 @@ -83,7 +83,7 @@ struct vhci_hcd {
54405 unsigned resuming:1;
54406 unsigned long re_timeout;
54407
54408 - atomic_t seqnum;
54409 + atomic_unchecked_t seqnum;
54410
54411 /*
54412 * NOTE:
54413 diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54414 index c02374b..32d47a9 100644
54415 --- a/drivers/usb/usbip/vhci_hcd.c
54416 +++ b/drivers/usb/usbip/vhci_hcd.c
54417 @@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54418
54419 spin_lock(&vdev->priv_lock);
54420
54421 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54422 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54423 if (priv->seqnum == 0xffff)
54424 dev_info(&urb->dev->dev, "seqnum max\n");
54425
54426 @@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54427 return -ENOMEM;
54428 }
54429
54430 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54431 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54432 if (unlink->seqnum == 0xffff)
54433 pr_info("seqnum max\n");
54434
54435 @@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
54436 vdev->rhport = rhport;
54437 }
54438
54439 - atomic_set(&vhci->seqnum, 0);
54440 + atomic_set_unchecked(&vhci->seqnum, 0);
54441 spin_lock_init(&vhci->lock);
54442
54443 hcd->power_budget = 0; /* no limit */
54444 diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54445 index 00e4a54..d676f85 100644
54446 --- a/drivers/usb/usbip/vhci_rx.c
54447 +++ b/drivers/usb/usbip/vhci_rx.c
54448 @@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54449 if (!urb) {
54450 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54451 pr_info("max seqnum %d\n",
54452 - atomic_read(&the_controller->seqnum));
54453 + atomic_read_unchecked(&the_controller->seqnum));
54454 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54455 return;
54456 }
54457 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54458 index edc7267..9f65ce2 100644
54459 --- a/drivers/usb/wusbcore/wa-hc.h
54460 +++ b/drivers/usb/wusbcore/wa-hc.h
54461 @@ -240,7 +240,7 @@ struct wahc {
54462 spinlock_t xfer_list_lock;
54463 struct work_struct xfer_enqueue_work;
54464 struct work_struct xfer_error_work;
54465 - atomic_t xfer_id_count;
54466 + atomic_unchecked_t xfer_id_count;
54467
54468 kernel_ulong_t quirks;
54469 };
54470 @@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54471 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54472 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54473 wa->dto_in_use = 0;
54474 - atomic_set(&wa->xfer_id_count, 1);
54475 + atomic_set_unchecked(&wa->xfer_id_count, 1);
54476 /* init the buf in URBs */
54477 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54478 usb_init_urb(&(wa->buf_in_urbs[index]));
54479 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54480 index 69af4fd..da390d7 100644
54481 --- a/drivers/usb/wusbcore/wa-xfer.c
54482 +++ b/drivers/usb/wusbcore/wa-xfer.c
54483 @@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
54484 */
54485 static void wa_xfer_id_init(struct wa_xfer *xfer)
54486 {
54487 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
54488 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
54489 }
54490
54491 /* Return the xfer's ID. */
54492 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
54493 index f018d8d..ccab63f 100644
54494 --- a/drivers/vfio/vfio.c
54495 +++ b/drivers/vfio/vfio.c
54496 @@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
54497 return 0;
54498
54499 /* TODO Prevent device auto probing */
54500 - WARN("Device %s added to live group %d!\n", dev_name(dev),
54501 + WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
54502 iommu_group_id(group->iommu_group));
54503
54504 return 0;
54505 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
54506 index 5174eba..451e6bc 100644
54507 --- a/drivers/vhost/vringh.c
54508 +++ b/drivers/vhost/vringh.c
54509 @@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
54510 /* Userspace access helpers: in this case, addresses are really userspace. */
54511 static inline int getu16_user(u16 *val, const u16 *p)
54512 {
54513 - return get_user(*val, (__force u16 __user *)p);
54514 + return get_user(*val, (u16 __force_user *)p);
54515 }
54516
54517 static inline int putu16_user(u16 *p, u16 val)
54518 {
54519 - return put_user(val, (__force u16 __user *)p);
54520 + return put_user(val, (u16 __force_user *)p);
54521 }
54522
54523 static inline int copydesc_user(void *dst, const void *src, size_t len)
54524 {
54525 - return copy_from_user(dst, (__force void __user *)src, len) ?
54526 + return copy_from_user(dst, (void __force_user *)src, len) ?
54527 -EFAULT : 0;
54528 }
54529
54530 @@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
54531 const struct vring_used_elem *src,
54532 unsigned int num)
54533 {
54534 - return copy_to_user((__force void __user *)dst, src,
54535 + return copy_to_user((void __force_user *)dst, src,
54536 sizeof(*dst) * num) ? -EFAULT : 0;
54537 }
54538
54539 static inline int xfer_from_user(void *src, void *dst, size_t len)
54540 {
54541 - return copy_from_user(dst, (__force void __user *)src, len) ?
54542 + return copy_from_user(dst, (void __force_user *)src, len) ?
54543 -EFAULT : 0;
54544 }
54545
54546 static inline int xfer_to_user(void *dst, void *src, size_t len)
54547 {
54548 - return copy_to_user((__force void __user *)dst, src, len) ?
54549 + return copy_to_user((void __force_user *)dst, src, len) ?
54550 -EFAULT : 0;
54551 }
54552
54553 @@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
54554 vrh->last_used_idx = 0;
54555 vrh->vring.num = num;
54556 /* vring expects kernel addresses, but only used via accessors. */
54557 - vrh->vring.desc = (__force struct vring_desc *)desc;
54558 - vrh->vring.avail = (__force struct vring_avail *)avail;
54559 - vrh->vring.used = (__force struct vring_used *)used;
54560 + vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
54561 + vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
54562 + vrh->vring.used = (__force_kernel struct vring_used *)used;
54563 return 0;
54564 }
54565 EXPORT_SYMBOL(vringh_init_user);
54566 @@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
54567
54568 static inline int putu16_kern(u16 *p, u16 val)
54569 {
54570 - ACCESS_ONCE(*p) = val;
54571 + ACCESS_ONCE_RW(*p) = val;
54572 return 0;
54573 }
54574
54575 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
54576 index 84a110a..96312c3 100644
54577 --- a/drivers/video/backlight/kb3886_bl.c
54578 +++ b/drivers/video/backlight/kb3886_bl.c
54579 @@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
54580 static unsigned long kb3886bl_flags;
54581 #define KB3886BL_SUSPENDED 0x01
54582
54583 -static struct dmi_system_id kb3886bl_device_table[] __initdata = {
54584 +static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
54585 {
54586 .ident = "Sahara Touch-iT",
54587 .matches = {
54588 diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
54589 index 1b0b233..6f34c2c 100644
54590 --- a/drivers/video/fbdev/arcfb.c
54591 +++ b/drivers/video/fbdev/arcfb.c
54592 @@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
54593 return -ENOSPC;
54594
54595 err = 0;
54596 - if ((count + p) > fbmemlength) {
54597 + if (count > (fbmemlength - p)) {
54598 count = fbmemlength - p;
54599 err = -ENOSPC;
54600 }
54601 diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
54602 index aedf2fb..47c9aca 100644
54603 --- a/drivers/video/fbdev/aty/aty128fb.c
54604 +++ b/drivers/video/fbdev/aty/aty128fb.c
54605 @@ -149,7 +149,7 @@ enum {
54606 };
54607
54608 /* Must match above enum */
54609 -static char * const r128_family[] = {
54610 +static const char * const r128_family[] = {
54611 "AGP",
54612 "PCI",
54613 "PRO AGP",
54614 diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
54615 index 37ec09b..98f8862 100644
54616 --- a/drivers/video/fbdev/aty/atyfb_base.c
54617 +++ b/drivers/video/fbdev/aty/atyfb_base.c
54618 @@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
54619 par->accel_flags = var->accel_flags; /* hack */
54620
54621 if (var->accel_flags) {
54622 - info->fbops->fb_sync = atyfb_sync;
54623 + pax_open_kernel();
54624 + *(void **)&info->fbops->fb_sync = atyfb_sync;
54625 + pax_close_kernel();
54626 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54627 } else {
54628 - info->fbops->fb_sync = NULL;
54629 + pax_open_kernel();
54630 + *(void **)&info->fbops->fb_sync = NULL;
54631 + pax_close_kernel();
54632 info->flags |= FBINFO_HWACCEL_DISABLED;
54633 }
54634
54635 diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
54636 index 2fa0317..4983f2a 100644
54637 --- a/drivers/video/fbdev/aty/mach64_cursor.c
54638 +++ b/drivers/video/fbdev/aty/mach64_cursor.c
54639 @@ -8,6 +8,7 @@
54640 #include "../core/fb_draw.h"
54641
54642 #include <asm/io.h>
54643 +#include <asm/pgtable.h>
54644
54645 #ifdef __sparc__
54646 #include <asm/fbio.h>
54647 @@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
54648 info->sprite.buf_align = 16; /* and 64 lines tall. */
54649 info->sprite.flags = FB_PIXMAP_IO;
54650
54651 - info->fbops->fb_cursor = atyfb_cursor;
54652 + pax_open_kernel();
54653 + *(void **)&info->fbops->fb_cursor = atyfb_cursor;
54654 + pax_close_kernel();
54655
54656 return 0;
54657 }
54658 diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
54659 index 900aa4e..6d49418 100644
54660 --- a/drivers/video/fbdev/core/fb_defio.c
54661 +++ b/drivers/video/fbdev/core/fb_defio.c
54662 @@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
54663
54664 BUG_ON(!fbdefio);
54665 mutex_init(&fbdefio->lock);
54666 - info->fbops->fb_mmap = fb_deferred_io_mmap;
54667 + pax_open_kernel();
54668 + *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
54669 + pax_close_kernel();
54670 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
54671 INIT_LIST_HEAD(&fbdefio->pagelist);
54672 if (fbdefio->delay == 0) /* set a default of 1 s */
54673 @@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
54674 page->mapping = NULL;
54675 }
54676
54677 - info->fbops->fb_mmap = NULL;
54678 + *(void **)&info->fbops->fb_mmap = NULL;
54679 mutex_destroy(&fbdefio->lock);
54680 }
54681 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
54682 diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
54683 index 0705d88..d9429bf 100644
54684 --- a/drivers/video/fbdev/core/fbmem.c
54685 +++ b/drivers/video/fbdev/core/fbmem.c
54686 @@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
54687 __u32 data;
54688 int err;
54689
54690 - err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
54691 + err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
54692
54693 data = (__u32) (unsigned long) fix->smem_start;
54694 err |= put_user(data, &fix32->smem_start);
54695 diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
54696 index 4254336..282567e 100644
54697 --- a/drivers/video/fbdev/hyperv_fb.c
54698 +++ b/drivers/video/fbdev/hyperv_fb.c
54699 @@ -240,7 +240,7 @@ static uint screen_fb_size;
54700 static inline int synthvid_send(struct hv_device *hdev,
54701 struct synthvid_msg *msg)
54702 {
54703 - static atomic64_t request_id = ATOMIC64_INIT(0);
54704 + static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
54705 int ret;
54706
54707 msg->pipe_hdr.type = PIPE_MSG_DATA;
54708 @@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
54709
54710 ret = vmbus_sendpacket(hdev->channel, msg,
54711 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
54712 - atomic64_inc_return(&request_id),
54713 + atomic64_inc_return_unchecked(&request_id),
54714 VM_PKT_DATA_INBAND, 0);
54715
54716 if (ret)
54717 diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
54718 index 7672d2e..b56437f 100644
54719 --- a/drivers/video/fbdev/i810/i810_accel.c
54720 +++ b/drivers/video/fbdev/i810/i810_accel.c
54721 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
54722 }
54723 }
54724 printk("ringbuffer lockup!!!\n");
54725 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
54726 i810_report_error(mmio);
54727 par->dev_flags |= LOCKUP;
54728 info->pixmap.scan_align = 1;
54729 diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54730 index a01147f..5d896f8 100644
54731 --- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54732 +++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54733 @@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
54734
54735 #ifdef CONFIG_FB_MATROX_MYSTIQUE
54736 struct matrox_switch matrox_mystique = {
54737 - MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
54738 + .preinit = MGA1064_preinit,
54739 + .reset = MGA1064_reset,
54740 + .init = MGA1064_init,
54741 + .restore = MGA1064_restore,
54742 };
54743 EXPORT_SYMBOL(matrox_mystique);
54744 #endif
54745
54746 #ifdef CONFIG_FB_MATROX_G
54747 struct matrox_switch matrox_G100 = {
54748 - MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
54749 + .preinit = MGAG100_preinit,
54750 + .reset = MGAG100_reset,
54751 + .init = MGAG100_init,
54752 + .restore = MGAG100_restore,
54753 };
54754 EXPORT_SYMBOL(matrox_G100);
54755 #endif
54756 diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54757 index 195ad7c..09743fc 100644
54758 --- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54759 +++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54760 @@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
54761 }
54762
54763 struct matrox_switch matrox_millennium = {
54764 - Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
54765 + .preinit = Ti3026_preinit,
54766 + .reset = Ti3026_reset,
54767 + .init = Ti3026_init,
54768 + .restore = Ti3026_restore
54769 };
54770 EXPORT_SYMBOL(matrox_millennium);
54771 #endif
54772 diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54773 index fe92eed..106e085 100644
54774 --- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54775 +++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54776 @@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
54777 struct mb862xxfb_par *par = info->par;
54778
54779 if (info->var.bits_per_pixel == 32) {
54780 - info->fbops->fb_fillrect = cfb_fillrect;
54781 - info->fbops->fb_copyarea = cfb_copyarea;
54782 - info->fbops->fb_imageblit = cfb_imageblit;
54783 + pax_open_kernel();
54784 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54785 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54786 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54787 + pax_close_kernel();
54788 } else {
54789 outreg(disp, GC_L0EM, 3);
54790 - info->fbops->fb_fillrect = mb86290fb_fillrect;
54791 - info->fbops->fb_copyarea = mb86290fb_copyarea;
54792 - info->fbops->fb_imageblit = mb86290fb_imageblit;
54793 + pax_open_kernel();
54794 + *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
54795 + *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
54796 + *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
54797 + pax_close_kernel();
54798 }
54799 outreg(draw, GDC_REG_DRAW_BASE, 0);
54800 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
54801 diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
54802 index def0412..fed6529 100644
54803 --- a/drivers/video/fbdev/nvidia/nvidia.c
54804 +++ b/drivers/video/fbdev/nvidia/nvidia.c
54805 @@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
54806 info->fix.line_length = (info->var.xres_virtual *
54807 info->var.bits_per_pixel) >> 3;
54808 if (info->var.accel_flags) {
54809 - info->fbops->fb_imageblit = nvidiafb_imageblit;
54810 - info->fbops->fb_fillrect = nvidiafb_fillrect;
54811 - info->fbops->fb_copyarea = nvidiafb_copyarea;
54812 - info->fbops->fb_sync = nvidiafb_sync;
54813 + pax_open_kernel();
54814 + *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
54815 + *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
54816 + *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
54817 + *(void **)&info->fbops->fb_sync = nvidiafb_sync;
54818 + pax_close_kernel();
54819 info->pixmap.scan_align = 4;
54820 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54821 info->flags |= FBINFO_READS_FAST;
54822 NVResetGraphics(info);
54823 } else {
54824 - info->fbops->fb_imageblit = cfb_imageblit;
54825 - info->fbops->fb_fillrect = cfb_fillrect;
54826 - info->fbops->fb_copyarea = cfb_copyarea;
54827 - info->fbops->fb_sync = NULL;
54828 + pax_open_kernel();
54829 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54830 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54831 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54832 + *(void **)&info->fbops->fb_sync = NULL;
54833 + pax_close_kernel();
54834 info->pixmap.scan_align = 1;
54835 info->flags |= FBINFO_HWACCEL_DISABLED;
54836 info->flags &= ~FBINFO_READS_FAST;
54837 @@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
54838 info->pixmap.size = 8 * 1024;
54839 info->pixmap.flags = FB_PIXMAP_SYSTEM;
54840
54841 - if (!hwcur)
54842 - info->fbops->fb_cursor = NULL;
54843 + if (!hwcur) {
54844 + pax_open_kernel();
54845 + *(void **)&info->fbops->fb_cursor = NULL;
54846 + pax_close_kernel();
54847 + }
54848
54849 info->var.accel_flags = (!noaccel);
54850
54851 diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
54852 index 2412a0d..294215b 100644
54853 --- a/drivers/video/fbdev/omap2/dss/display.c
54854 +++ b/drivers/video/fbdev/omap2/dss/display.c
54855 @@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
54856 if (dssdev->name == NULL)
54857 dssdev->name = dssdev->alias;
54858
54859 + pax_open_kernel();
54860 if (drv && drv->get_resolution == NULL)
54861 - drv->get_resolution = omapdss_default_get_resolution;
54862 + *(void **)&drv->get_resolution = omapdss_default_get_resolution;
54863 if (drv && drv->get_recommended_bpp == NULL)
54864 - drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54865 + *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54866 if (drv && drv->get_timings == NULL)
54867 - drv->get_timings = omapdss_default_get_timings;
54868 + *(void **)&drv->get_timings = omapdss_default_get_timings;
54869 + pax_close_kernel();
54870
54871 mutex_lock(&panel_list_mutex);
54872 list_add_tail(&dssdev->panel_list, &panel_list);
54873 diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
54874 index 83433cb..71e9b98 100644
54875 --- a/drivers/video/fbdev/s1d13xxxfb.c
54876 +++ b/drivers/video/fbdev/s1d13xxxfb.c
54877 @@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
54878
54879 switch(prod_id) {
54880 case S1D13506_PROD_ID: /* activate acceleration */
54881 - s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54882 - s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54883 + pax_open_kernel();
54884 + *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54885 + *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54886 + pax_close_kernel();
54887 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
54888 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
54889 break;
54890 diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54891 index 2bcc84a..29dd1ea 100644
54892 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
54893 +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54894 @@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
54895 }
54896
54897 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
54898 - lcdc_sys_write_index,
54899 - lcdc_sys_write_data,
54900 - lcdc_sys_read_data,
54901 + .write_index = lcdc_sys_write_index,
54902 + .write_data = lcdc_sys_write_data,
54903 + .read_data = lcdc_sys_read_data,
54904 };
54905
54906 static int sh_mobile_lcdc_sginit(struct fb_info *info,
54907 diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
54908 index d513ed6..90b0de9 100644
54909 --- a/drivers/video/fbdev/smscufx.c
54910 +++ b/drivers/video/fbdev/smscufx.c
54911 @@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
54912 fb_deferred_io_cleanup(info);
54913 kfree(info->fbdefio);
54914 info->fbdefio = NULL;
54915 - info->fbops->fb_mmap = ufx_ops_mmap;
54916 + pax_open_kernel();
54917 + *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
54918 + pax_close_kernel();
54919 }
54920
54921 pr_debug("released /dev/fb%d user=%d count=%d",
54922 diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
54923 index 046d51d..be564da 100644
54924 --- a/drivers/video/fbdev/udlfb.c
54925 +++ b/drivers/video/fbdev/udlfb.c
54926 @@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
54927 dlfb_urb_completion(urb);
54928
54929 error:
54930 - atomic_add(bytes_sent, &dev->bytes_sent);
54931 - atomic_add(bytes_identical, &dev->bytes_identical);
54932 - atomic_add(width*height*2, &dev->bytes_rendered);
54933 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
54934 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
54935 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
54936 end_cycles = get_cycles();
54937 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
54938 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
54939 >> 10)), /* Kcycles */
54940 &dev->cpu_kcycles_used);
54941
54942 @@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
54943 dlfb_urb_completion(urb);
54944
54945 error:
54946 - atomic_add(bytes_sent, &dev->bytes_sent);
54947 - atomic_add(bytes_identical, &dev->bytes_identical);
54948 - atomic_add(bytes_rendered, &dev->bytes_rendered);
54949 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
54950 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
54951 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
54952 end_cycles = get_cycles();
54953 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
54954 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
54955 >> 10)), /* Kcycles */
54956 &dev->cpu_kcycles_used);
54957 }
54958 @@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
54959 fb_deferred_io_cleanup(info);
54960 kfree(info->fbdefio);
54961 info->fbdefio = NULL;
54962 - info->fbops->fb_mmap = dlfb_ops_mmap;
54963 + pax_open_kernel();
54964 + *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
54965 + pax_close_kernel();
54966 }
54967
54968 pr_warn("released /dev/fb%d user=%d count=%d\n",
54969 @@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
54970 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54971 struct dlfb_data *dev = fb_info->par;
54972 return snprintf(buf, PAGE_SIZE, "%u\n",
54973 - atomic_read(&dev->bytes_rendered));
54974 + atomic_read_unchecked(&dev->bytes_rendered));
54975 }
54976
54977 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
54978 @@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
54979 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54980 struct dlfb_data *dev = fb_info->par;
54981 return snprintf(buf, PAGE_SIZE, "%u\n",
54982 - atomic_read(&dev->bytes_identical));
54983 + atomic_read_unchecked(&dev->bytes_identical));
54984 }
54985
54986 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
54987 @@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
54988 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54989 struct dlfb_data *dev = fb_info->par;
54990 return snprintf(buf, PAGE_SIZE, "%u\n",
54991 - atomic_read(&dev->bytes_sent));
54992 + atomic_read_unchecked(&dev->bytes_sent));
54993 }
54994
54995 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
54996 @@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
54997 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54998 struct dlfb_data *dev = fb_info->par;
54999 return snprintf(buf, PAGE_SIZE, "%u\n",
55000 - atomic_read(&dev->cpu_kcycles_used));
55001 + atomic_read_unchecked(&dev->cpu_kcycles_used));
55002 }
55003
55004 static ssize_t edid_show(
55005 @@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55006 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55007 struct dlfb_data *dev = fb_info->par;
55008
55009 - atomic_set(&dev->bytes_rendered, 0);
55010 - atomic_set(&dev->bytes_identical, 0);
55011 - atomic_set(&dev->bytes_sent, 0);
55012 - atomic_set(&dev->cpu_kcycles_used, 0);
55013 + atomic_set_unchecked(&dev->bytes_rendered, 0);
55014 + atomic_set_unchecked(&dev->bytes_identical, 0);
55015 + atomic_set_unchecked(&dev->bytes_sent, 0);
55016 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55017
55018 return count;
55019 }
55020 diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
55021 index 509d452..7c9d2de 100644
55022 --- a/drivers/video/fbdev/uvesafb.c
55023 +++ b/drivers/video/fbdev/uvesafb.c
55024 @@ -19,6 +19,7 @@
55025 #include <linux/io.h>
55026 #include <linux/mutex.h>
55027 #include <linux/slab.h>
55028 +#include <linux/moduleloader.h>
55029 #include <video/edid.h>
55030 #include <video/uvesafb.h>
55031 #ifdef CONFIG_X86
55032 @@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55033 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55034 par->pmi_setpal = par->ypan = 0;
55035 } else {
55036 +
55037 +#ifdef CONFIG_PAX_KERNEXEC
55038 +#ifdef CONFIG_MODULES
55039 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55040 +#endif
55041 + if (!par->pmi_code) {
55042 + par->pmi_setpal = par->ypan = 0;
55043 + return 0;
55044 + }
55045 +#endif
55046 +
55047 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55048 + task->t.regs.edi);
55049 +
55050 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55051 + pax_open_kernel();
55052 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55053 + pax_close_kernel();
55054 +
55055 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55056 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55057 +#else
55058 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55059 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55060 +#endif
55061 +
55062 printk(KERN_INFO "uvesafb: protected mode interface info at "
55063 "%04x:%04x\n",
55064 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55065 @@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55066 par->ypan = ypan;
55067
55068 if (par->pmi_setpal || par->ypan) {
55069 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55070 if (__supported_pte_mask & _PAGE_NX) {
55071 par->pmi_setpal = par->ypan = 0;
55072 printk(KERN_WARNING "uvesafb: NX protection is active, "
55073 "better not use the PMI.\n");
55074 - } else {
55075 + } else
55076 +#endif
55077 uvesafb_vbe_getpmi(task, par);
55078 - }
55079 }
55080 #else
55081 /* The protected mode interface is not available on non-x86. */
55082 @@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55083 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55084
55085 /* Disable blanking if the user requested so. */
55086 - if (!blank)
55087 - info->fbops->fb_blank = NULL;
55088 + if (!blank) {
55089 + pax_open_kernel();
55090 + *(void **)&info->fbops->fb_blank = NULL;
55091 + pax_close_kernel();
55092 + }
55093
55094 /*
55095 * Find out how much IO memory is required for the mode with
55096 @@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55097 info->flags = FBINFO_FLAG_DEFAULT |
55098 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55099
55100 - if (!par->ypan)
55101 - info->fbops->fb_pan_display = NULL;
55102 + if (!par->ypan) {
55103 + pax_open_kernel();
55104 + *(void **)&info->fbops->fb_pan_display = NULL;
55105 + pax_close_kernel();
55106 + }
55107 }
55108
55109 static void uvesafb_init_mtrr(struct fb_info *info)
55110 @@ -1787,6 +1817,11 @@ out_mode:
55111 out:
55112 kfree(par->vbe_modes);
55113
55114 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55115 + if (par->pmi_code)
55116 + module_free_exec(NULL, par->pmi_code);
55117 +#endif
55118 +
55119 framebuffer_release(info);
55120 return err;
55121 }
55122 @@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
55123 kfree(par->vbe_state_orig);
55124 kfree(par->vbe_state_saved);
55125
55126 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55127 + if (par->pmi_code)
55128 + module_free_exec(NULL, par->pmi_code);
55129 +#endif
55130 +
55131 framebuffer_release(info);
55132 }
55133 return 0;
55134 diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55135 index 6170e7f..dd63031 100644
55136 --- a/drivers/video/fbdev/vesafb.c
55137 +++ b/drivers/video/fbdev/vesafb.c
55138 @@ -9,6 +9,7 @@
55139 */
55140
55141 #include <linux/module.h>
55142 +#include <linux/moduleloader.h>
55143 #include <linux/kernel.h>
55144 #include <linux/errno.h>
55145 #include <linux/string.h>
55146 @@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55147 static int vram_total; /* Set total amount of memory */
55148 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55149 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55150 -static void (*pmi_start)(void) __read_mostly;
55151 -static void (*pmi_pal) (void) __read_mostly;
55152 +static void (*pmi_start)(void) __read_only;
55153 +static void (*pmi_pal) (void) __read_only;
55154 static int depth __read_mostly;
55155 static int vga_compat __read_mostly;
55156 /* --------------------------------------------------------------------- */
55157 @@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55158 unsigned int size_remap;
55159 unsigned int size_total;
55160 char *option = NULL;
55161 + void *pmi_code = NULL;
55162
55163 /* ignore error return of fb_get_options */
55164 fb_get_options("vesafb", &option);
55165 @@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55166 size_remap = size_total;
55167 vesafb_fix.smem_len = size_remap;
55168
55169 -#ifndef __i386__
55170 - screen_info.vesapm_seg = 0;
55171 -#endif
55172 -
55173 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55174 printk(KERN_WARNING
55175 "vesafb: cannot reserve video memory at 0x%lx\n",
55176 @@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55177 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55178 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55179
55180 +#ifdef __i386__
55181 +
55182 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55183 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
55184 + if (!pmi_code)
55185 +#elif !defined(CONFIG_PAX_KERNEXEC)
55186 + if (0)
55187 +#endif
55188 +
55189 +#endif
55190 + screen_info.vesapm_seg = 0;
55191 +
55192 if (screen_info.vesapm_seg) {
55193 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55194 - screen_info.vesapm_seg,screen_info.vesapm_off);
55195 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55196 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55197 }
55198
55199 if (screen_info.vesapm_seg < 0xc000)
55200 @@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55201
55202 if (ypan || pmi_setpal) {
55203 unsigned short *pmi_base;
55204 +
55205 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55206 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55207 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55208 +
55209 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55210 + pax_open_kernel();
55211 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55212 +#else
55213 + pmi_code = pmi_base;
55214 +#endif
55215 +
55216 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55217 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55218 +
55219 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55220 + pmi_start = ktva_ktla(pmi_start);
55221 + pmi_pal = ktva_ktla(pmi_pal);
55222 + pax_close_kernel();
55223 +#endif
55224 +
55225 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55226 if (pmi_base[3]) {
55227 printk(KERN_INFO "vesafb: pmi: ports = ");
55228 @@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55229 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55230 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55231
55232 - if (!ypan)
55233 - info->fbops->fb_pan_display = NULL;
55234 + if (!ypan) {
55235 + pax_open_kernel();
55236 + *(void **)&info->fbops->fb_pan_display = NULL;
55237 + pax_close_kernel();
55238 + }
55239
55240 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55241 err = -ENOMEM;
55242 @@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55243 fb_info(info, "%s frame buffer device\n", info->fix.id);
55244 return 0;
55245 err:
55246 +
55247 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55248 + module_free_exec(NULL, pmi_code);
55249 +#endif
55250 +
55251 if (info->screen_base)
55252 iounmap(info->screen_base);
55253 framebuffer_release(info);
55254 diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55255 index 88714ae..16c2e11 100644
55256 --- a/drivers/video/fbdev/via/via_clock.h
55257 +++ b/drivers/video/fbdev/via/via_clock.h
55258 @@ -56,7 +56,7 @@ struct via_clock {
55259
55260 void (*set_engine_pll_state)(u8 state);
55261 void (*set_engine_pll)(struct via_pll_config config);
55262 -};
55263 +} __no_const;
55264
55265
55266 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55267 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55268 index 3c14e43..2630570 100644
55269 --- a/drivers/video/logo/logo_linux_clut224.ppm
55270 +++ b/drivers/video/logo/logo_linux_clut224.ppm
55271 @@ -2,1603 +2,1123 @@ P3
55272 # Standard 224-color Linux logo
55273 80 80
55274 255
55275 - 0 0 0 0 0 0 0 0 0 0 0 0
55276 - 0 0 0 0 0 0 0 0 0 0 0 0
55277 - 0 0 0 0 0 0 0 0 0 0 0 0
55278 - 0 0 0 0 0 0 0 0 0 0 0 0
55279 - 0 0 0 0 0 0 0 0 0 0 0 0
55280 - 0 0 0 0 0 0 0 0 0 0 0 0
55281 - 0 0 0 0 0 0 0 0 0 0 0 0
55282 - 0 0 0 0 0 0 0 0 0 0 0 0
55283 - 0 0 0 0 0 0 0 0 0 0 0 0
55284 - 6 6 6 6 6 6 10 10 10 10 10 10
55285 - 10 10 10 6 6 6 6 6 6 6 6 6
55286 - 0 0 0 0 0 0 0 0 0 0 0 0
55287 - 0 0 0 0 0 0 0 0 0 0 0 0
55288 - 0 0 0 0 0 0 0 0 0 0 0 0
55289 - 0 0 0 0 0 0 0 0 0 0 0 0
55290 - 0 0 0 0 0 0 0 0 0 0 0 0
55291 - 0 0 0 0 0 0 0 0 0 0 0 0
55292 - 0 0 0 0 0 0 0 0 0 0 0 0
55293 - 0 0 0 0 0 0 0 0 0 0 0 0
55294 - 0 0 0 0 0 0 0 0 0 0 0 0
55295 - 0 0 0 0 0 0 0 0 0 0 0 0
55296 - 0 0 0 0 0 0 0 0 0 0 0 0
55297 - 0 0 0 0 0 0 0 0 0 0 0 0
55298 - 0 0 0 0 0 0 0 0 0 0 0 0
55299 - 0 0 0 0 0 0 0 0 0 0 0 0
55300 - 0 0 0 0 0 0 0 0 0 0 0 0
55301 - 0 0 0 0 0 0 0 0 0 0 0 0
55302 - 0 0 0 0 0 0 0 0 0 0 0 0
55303 - 0 0 0 6 6 6 10 10 10 14 14 14
55304 - 22 22 22 26 26 26 30 30 30 34 34 34
55305 - 30 30 30 30 30 30 26 26 26 18 18 18
55306 - 14 14 14 10 10 10 6 6 6 0 0 0
55307 - 0 0 0 0 0 0 0 0 0 0 0 0
55308 - 0 0 0 0 0 0 0 0 0 0 0 0
55309 - 0 0 0 0 0 0 0 0 0 0 0 0
55310 - 0 0 0 0 0 0 0 0 0 0 0 0
55311 - 0 0 0 0 0 0 0 0 0 0 0 0
55312 - 0 0 0 0 0 0 0 0 0 0 0 0
55313 - 0 0 0 0 0 0 0 0 0 0 0 0
55314 - 0 0 0 0 0 0 0 0 0 0 0 0
55315 - 0 0 0 0 0 0 0 0 0 0 0 0
55316 - 0 0 0 0 0 1 0 0 1 0 0 0
55317 - 0 0 0 0 0 0 0 0 0 0 0 0
55318 - 0 0 0 0 0 0 0 0 0 0 0 0
55319 - 0 0 0 0 0 0 0 0 0 0 0 0
55320 - 0 0 0 0 0 0 0 0 0 0 0 0
55321 - 0 0 0 0 0 0 0 0 0 0 0 0
55322 - 0 0 0 0 0 0 0 0 0 0 0 0
55323 - 6 6 6 14 14 14 26 26 26 42 42 42
55324 - 54 54 54 66 66 66 78 78 78 78 78 78
55325 - 78 78 78 74 74 74 66 66 66 54 54 54
55326 - 42 42 42 26 26 26 18 18 18 10 10 10
55327 - 6 6 6 0 0 0 0 0 0 0 0 0
55328 - 0 0 0 0 0 0 0 0 0 0 0 0
55329 - 0 0 0 0 0 0 0 0 0 0 0 0
55330 - 0 0 0 0 0 0 0 0 0 0 0 0
55331 - 0 0 0 0 0 0 0 0 0 0 0 0
55332 - 0 0 0 0 0 0 0 0 0 0 0 0
55333 - 0 0 0 0 0 0 0 0 0 0 0 0
55334 - 0 0 0 0 0 0 0 0 0 0 0 0
55335 - 0 0 0 0 0 0 0 0 0 0 0 0
55336 - 0 0 1 0 0 0 0 0 0 0 0 0
55337 - 0 0 0 0 0 0 0 0 0 0 0 0
55338 - 0 0 0 0 0 0 0 0 0 0 0 0
55339 - 0 0 0 0 0 0 0 0 0 0 0 0
55340 - 0 0 0 0 0 0 0 0 0 0 0 0
55341 - 0 0 0 0 0 0 0 0 0 0 0 0
55342 - 0 0 0 0 0 0 0 0 0 10 10 10
55343 - 22 22 22 42 42 42 66 66 66 86 86 86
55344 - 66 66 66 38 38 38 38 38 38 22 22 22
55345 - 26 26 26 34 34 34 54 54 54 66 66 66
55346 - 86 86 86 70 70 70 46 46 46 26 26 26
55347 - 14 14 14 6 6 6 0 0 0 0 0 0
55348 - 0 0 0 0 0 0 0 0 0 0 0 0
55349 - 0 0 0 0 0 0 0 0 0 0 0 0
55350 - 0 0 0 0 0 0 0 0 0 0 0 0
55351 - 0 0 0 0 0 0 0 0 0 0 0 0
55352 - 0 0 0 0 0 0 0 0 0 0 0 0
55353 - 0 0 0 0 0 0 0 0 0 0 0 0
55354 - 0 0 0 0 0 0 0 0 0 0 0 0
55355 - 0 0 0 0 0 0 0 0 0 0 0 0
55356 - 0 0 1 0 0 1 0 0 1 0 0 0
55357 - 0 0 0 0 0 0 0 0 0 0 0 0
55358 - 0 0 0 0 0 0 0 0 0 0 0 0
55359 - 0 0 0 0 0 0 0 0 0 0 0 0
55360 - 0 0 0 0 0 0 0 0 0 0 0 0
55361 - 0 0 0 0 0 0 0 0 0 0 0 0
55362 - 0 0 0 0 0 0 10 10 10 26 26 26
55363 - 50 50 50 82 82 82 58 58 58 6 6 6
55364 - 2 2 6 2 2 6 2 2 6 2 2 6
55365 - 2 2 6 2 2 6 2 2 6 2 2 6
55366 - 6 6 6 54 54 54 86 86 86 66 66 66
55367 - 38 38 38 18 18 18 6 6 6 0 0 0
55368 - 0 0 0 0 0 0 0 0 0 0 0 0
55369 - 0 0 0 0 0 0 0 0 0 0 0 0
55370 - 0 0 0 0 0 0 0 0 0 0 0 0
55371 - 0 0 0 0 0 0 0 0 0 0 0 0
55372 - 0 0 0 0 0 0 0 0 0 0 0 0
55373 - 0 0 0 0 0 0 0 0 0 0 0 0
55374 - 0 0 0 0 0 0 0 0 0 0 0 0
55375 - 0 0 0 0 0 0 0 0 0 0 0 0
55376 - 0 0 0 0 0 0 0 0 0 0 0 0
55377 - 0 0 0 0 0 0 0 0 0 0 0 0
55378 - 0 0 0 0 0 0 0 0 0 0 0 0
55379 - 0 0 0 0 0 0 0 0 0 0 0 0
55380 - 0 0 0 0 0 0 0 0 0 0 0 0
55381 - 0 0 0 0 0 0 0 0 0 0 0 0
55382 - 0 0 0 6 6 6 22 22 22 50 50 50
55383 - 78 78 78 34 34 34 2 2 6 2 2 6
55384 - 2 2 6 2 2 6 2 2 6 2 2 6
55385 - 2 2 6 2 2 6 2 2 6 2 2 6
55386 - 2 2 6 2 2 6 6 6 6 70 70 70
55387 - 78 78 78 46 46 46 22 22 22 6 6 6
55388 - 0 0 0 0 0 0 0 0 0 0 0 0
55389 - 0 0 0 0 0 0 0 0 0 0 0 0
55390 - 0 0 0 0 0 0 0 0 0 0 0 0
55391 - 0 0 0 0 0 0 0 0 0 0 0 0
55392 - 0 0 0 0 0 0 0 0 0 0 0 0
55393 - 0 0 0 0 0 0 0 0 0 0 0 0
55394 - 0 0 0 0 0 0 0 0 0 0 0 0
55395 - 0 0 0 0 0 0 0 0 0 0 0 0
55396 - 0 0 1 0 0 1 0 0 1 0 0 0
55397 - 0 0 0 0 0 0 0 0 0 0 0 0
55398 - 0 0 0 0 0 0 0 0 0 0 0 0
55399 - 0 0 0 0 0 0 0 0 0 0 0 0
55400 - 0 0 0 0 0 0 0 0 0 0 0 0
55401 - 0 0 0 0 0 0 0 0 0 0 0 0
55402 - 6 6 6 18 18 18 42 42 42 82 82 82
55403 - 26 26 26 2 2 6 2 2 6 2 2 6
55404 - 2 2 6 2 2 6 2 2 6 2 2 6
55405 - 2 2 6 2 2 6 2 2 6 14 14 14
55406 - 46 46 46 34 34 34 6 6 6 2 2 6
55407 - 42 42 42 78 78 78 42 42 42 18 18 18
55408 - 6 6 6 0 0 0 0 0 0 0 0 0
55409 - 0 0 0 0 0 0 0 0 0 0 0 0
55410 - 0 0 0 0 0 0 0 0 0 0 0 0
55411 - 0 0 0 0 0 0 0 0 0 0 0 0
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 1 0 0 0 0 0 1 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 - 10 10 10 30 30 30 66 66 66 58 58 58
55423 - 2 2 6 2 2 6 2 2 6 2 2 6
55424 - 2 2 6 2 2 6 2 2 6 2 2 6
55425 - 2 2 6 2 2 6 2 2 6 26 26 26
55426 - 86 86 86 101 101 101 46 46 46 10 10 10
55427 - 2 2 6 58 58 58 70 70 70 34 34 34
55428 - 10 10 10 0 0 0 0 0 0 0 0 0
55429 - 0 0 0 0 0 0 0 0 0 0 0 0
55430 - 0 0 0 0 0 0 0 0 0 0 0 0
55431 - 0 0 0 0 0 0 0 0 0 0 0 0
55432 - 0 0 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 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 - 14 14 14 42 42 42 86 86 86 10 10 10
55443 - 2 2 6 2 2 6 2 2 6 2 2 6
55444 - 2 2 6 2 2 6 2 2 6 2 2 6
55445 - 2 2 6 2 2 6 2 2 6 30 30 30
55446 - 94 94 94 94 94 94 58 58 58 26 26 26
55447 - 2 2 6 6 6 6 78 78 78 54 54 54
55448 - 22 22 22 6 6 6 0 0 0 0 0 0
55449 - 0 0 0 0 0 0 0 0 0 0 0 0
55450 - 0 0 0 0 0 0 0 0 0 0 0 0
55451 - 0 0 0 0 0 0 0 0 0 0 0 0
55452 - 0 0 0 0 0 0 0 0 0 0 0 0
55453 - 0 0 0 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 6 6 6
55462 - 22 22 22 62 62 62 62 62 62 2 2 6
55463 - 2 2 6 2 2 6 2 2 6 2 2 6
55464 - 2 2 6 2 2 6 2 2 6 2 2 6
55465 - 2 2 6 2 2 6 2 2 6 26 26 26
55466 - 54 54 54 38 38 38 18 18 18 10 10 10
55467 - 2 2 6 2 2 6 34 34 34 82 82 82
55468 - 38 38 38 14 14 14 0 0 0 0 0 0
55469 - 0 0 0 0 0 0 0 0 0 0 0 0
55470 - 0 0 0 0 0 0 0 0 0 0 0 0
55471 - 0 0 0 0 0 0 0 0 0 0 0 0
55472 - 0 0 0 0 0 0 0 0 0 0 0 0
55473 - 0 0 0 0 0 0 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 1 0 0 1 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 6 6 6
55482 - 30 30 30 78 78 78 30 30 30 2 2 6
55483 - 2 2 6 2 2 6 2 2 6 2 2 6
55484 - 2 2 6 2 2 6 2 2 6 2 2 6
55485 - 2 2 6 2 2 6 2 2 6 10 10 10
55486 - 10 10 10 2 2 6 2 2 6 2 2 6
55487 - 2 2 6 2 2 6 2 2 6 78 78 78
55488 - 50 50 50 18 18 18 6 6 6 0 0 0
55489 - 0 0 0 0 0 0 0 0 0 0 0 0
55490 - 0 0 0 0 0 0 0 0 0 0 0 0
55491 - 0 0 0 0 0 0 0 0 0 0 0 0
55492 - 0 0 0 0 0 0 0 0 0 0 0 0
55493 - 0 0 0 0 0 0 0 0 0 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 1 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 10 10 10
55502 - 38 38 38 86 86 86 14 14 14 2 2 6
55503 - 2 2 6 2 2 6 2 2 6 2 2 6
55504 - 2 2 6 2 2 6 2 2 6 2 2 6
55505 - 2 2 6 2 2 6 2 2 6 2 2 6
55506 - 2 2 6 2 2 6 2 2 6 2 2 6
55507 - 2 2 6 2 2 6 2 2 6 54 54 54
55508 - 66 66 66 26 26 26 6 6 6 0 0 0
55509 - 0 0 0 0 0 0 0 0 0 0 0 0
55510 - 0 0 0 0 0 0 0 0 0 0 0 0
55511 - 0 0 0 0 0 0 0 0 0 0 0 0
55512 - 0 0 0 0 0 0 0 0 0 0 0 0
55513 - 0 0 0 0 0 0 0 0 0 0 0 0
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 1 0 0 1 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 14 14 14
55522 - 42 42 42 82 82 82 2 2 6 2 2 6
55523 - 2 2 6 6 6 6 10 10 10 2 2 6
55524 - 2 2 6 2 2 6 2 2 6 2 2 6
55525 - 2 2 6 2 2 6 2 2 6 6 6 6
55526 - 14 14 14 10 10 10 2 2 6 2 2 6
55527 - 2 2 6 2 2 6 2 2 6 18 18 18
55528 - 82 82 82 34 34 34 10 10 10 0 0 0
55529 - 0 0 0 0 0 0 0 0 0 0 0 0
55530 - 0 0 0 0 0 0 0 0 0 0 0 0
55531 - 0 0 0 0 0 0 0 0 0 0 0 0
55532 - 0 0 0 0 0 0 0 0 0 0 0 0
55533 - 0 0 0 0 0 0 0 0 0 0 0 0
55534 - 0 0 0 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 1 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 14 14 14
55542 - 46 46 46 86 86 86 2 2 6 2 2 6
55543 - 6 6 6 6 6 6 22 22 22 34 34 34
55544 - 6 6 6 2 2 6 2 2 6 2 2 6
55545 - 2 2 6 2 2 6 18 18 18 34 34 34
55546 - 10 10 10 50 50 50 22 22 22 2 2 6
55547 - 2 2 6 2 2 6 2 2 6 10 10 10
55548 - 86 86 86 42 42 42 14 14 14 0 0 0
55549 - 0 0 0 0 0 0 0 0 0 0 0 0
55550 - 0 0 0 0 0 0 0 0 0 0 0 0
55551 - 0 0 0 0 0 0 0 0 0 0 0 0
55552 - 0 0 0 0 0 0 0 0 0 0 0 0
55553 - 0 0 0 0 0 0 0 0 0 0 0 0
55554 - 0 0 0 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 1 0 0 1 0 0 1 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 14 14 14
55562 - 46 46 46 86 86 86 2 2 6 2 2 6
55563 - 38 38 38 116 116 116 94 94 94 22 22 22
55564 - 22 22 22 2 2 6 2 2 6 2 2 6
55565 - 14 14 14 86 86 86 138 138 138 162 162 162
55566 -154 154 154 38 38 38 26 26 26 6 6 6
55567 - 2 2 6 2 2 6 2 2 6 2 2 6
55568 - 86 86 86 46 46 46 14 14 14 0 0 0
55569 - 0 0 0 0 0 0 0 0 0 0 0 0
55570 - 0 0 0 0 0 0 0 0 0 0 0 0
55571 - 0 0 0 0 0 0 0 0 0 0 0 0
55572 - 0 0 0 0 0 0 0 0 0 0 0 0
55573 - 0 0 0 0 0 0 0 0 0 0 0 0
55574 - 0 0 0 0 0 0 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 14 14 14
55582 - 46 46 46 86 86 86 2 2 6 14 14 14
55583 -134 134 134 198 198 198 195 195 195 116 116 116
55584 - 10 10 10 2 2 6 2 2 6 6 6 6
55585 -101 98 89 187 187 187 210 210 210 218 218 218
55586 -214 214 214 134 134 134 14 14 14 6 6 6
55587 - 2 2 6 2 2 6 2 2 6 2 2 6
55588 - 86 86 86 50 50 50 18 18 18 6 6 6
55589 - 0 0 0 0 0 0 0 0 0 0 0 0
55590 - 0 0 0 0 0 0 0 0 0 0 0 0
55591 - 0 0 0 0 0 0 0 0 0 0 0 0
55592 - 0 0 0 0 0 0 0 0 0 0 0 0
55593 - 0 0 0 0 0 0 0 0 0 0 0 0
55594 - 0 0 0 0 0 0 0 0 0 0 0 0
55595 - 0 0 0 0 0 0 0 0 1 0 0 0
55596 - 0 0 1 0 0 1 0 0 1 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 14 14 14
55602 - 46 46 46 86 86 86 2 2 6 54 54 54
55603 -218 218 218 195 195 195 226 226 226 246 246 246
55604 - 58 58 58 2 2 6 2 2 6 30 30 30
55605 -210 210 210 253 253 253 174 174 174 123 123 123
55606 -221 221 221 234 234 234 74 74 74 2 2 6
55607 - 2 2 6 2 2 6 2 2 6 2 2 6
55608 - 70 70 70 58 58 58 22 22 22 6 6 6
55609 - 0 0 0 0 0 0 0 0 0 0 0 0
55610 - 0 0 0 0 0 0 0 0 0 0 0 0
55611 - 0 0 0 0 0 0 0 0 0 0 0 0
55612 - 0 0 0 0 0 0 0 0 0 0 0 0
55613 - 0 0 0 0 0 0 0 0 0 0 0 0
55614 - 0 0 0 0 0 0 0 0 0 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 14 14 14
55622 - 46 46 46 82 82 82 2 2 6 106 106 106
55623 -170 170 170 26 26 26 86 86 86 226 226 226
55624 -123 123 123 10 10 10 14 14 14 46 46 46
55625 -231 231 231 190 190 190 6 6 6 70 70 70
55626 - 90 90 90 238 238 238 158 158 158 2 2 6
55627 - 2 2 6 2 2 6 2 2 6 2 2 6
55628 - 70 70 70 58 58 58 22 22 22 6 6 6
55629 - 0 0 0 0 0 0 0 0 0 0 0 0
55630 - 0 0 0 0 0 0 0 0 0 0 0 0
55631 - 0 0 0 0 0 0 0 0 0 0 0 0
55632 - 0 0 0 0 0 0 0 0 0 0 0 0
55633 - 0 0 0 0 0 0 0 0 0 0 0 0
55634 - 0 0 0 0 0 0 0 0 0 0 0 0
55635 - 0 0 0 0 0 0 0 0 1 0 0 0
55636 - 0 0 1 0 0 1 0 0 1 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 14 14 14
55642 - 42 42 42 86 86 86 6 6 6 116 116 116
55643 -106 106 106 6 6 6 70 70 70 149 149 149
55644 -128 128 128 18 18 18 38 38 38 54 54 54
55645 -221 221 221 106 106 106 2 2 6 14 14 14
55646 - 46 46 46 190 190 190 198 198 198 2 2 6
55647 - 2 2 6 2 2 6 2 2 6 2 2 6
55648 - 74 74 74 62 62 62 22 22 22 6 6 6
55649 - 0 0 0 0 0 0 0 0 0 0 0 0
55650 - 0 0 0 0 0 0 0 0 0 0 0 0
55651 - 0 0 0 0 0 0 0 0 0 0 0 0
55652 - 0 0 0 0 0 0 0 0 0 0 0 0
55653 - 0 0 0 0 0 0 0 0 0 0 0 0
55654 - 0 0 0 0 0 0 0 0 0 0 0 0
55655 - 0 0 0 0 0 0 0 0 1 0 0 0
55656 - 0 0 1 0 0 0 0 0 1 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 14 14 14
55662 - 42 42 42 94 94 94 14 14 14 101 101 101
55663 -128 128 128 2 2 6 18 18 18 116 116 116
55664 -118 98 46 121 92 8 121 92 8 98 78 10
55665 -162 162 162 106 106 106 2 2 6 2 2 6
55666 - 2 2 6 195 195 195 195 195 195 6 6 6
55667 - 2 2 6 2 2 6 2 2 6 2 2 6
55668 - 74 74 74 62 62 62 22 22 22 6 6 6
55669 - 0 0 0 0 0 0 0 0 0 0 0 0
55670 - 0 0 0 0 0 0 0 0 0 0 0 0
55671 - 0 0 0 0 0 0 0 0 0 0 0 0
55672 - 0 0 0 0 0 0 0 0 0 0 0 0
55673 - 0 0 0 0 0 0 0 0 0 0 0 0
55674 - 0 0 0 0 0 0 0 0 0 0 0 0
55675 - 0 0 0 0 0 0 0 0 1 0 0 1
55676 - 0 0 1 0 0 0 0 0 1 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 10 10 10
55682 - 38 38 38 90 90 90 14 14 14 58 58 58
55683 -210 210 210 26 26 26 54 38 6 154 114 10
55684 -226 170 11 236 186 11 225 175 15 184 144 12
55685 -215 174 15 175 146 61 37 26 9 2 2 6
55686 - 70 70 70 246 246 246 138 138 138 2 2 6
55687 - 2 2 6 2 2 6 2 2 6 2 2 6
55688 - 70 70 70 66 66 66 26 26 26 6 6 6
55689 - 0 0 0 0 0 0 0 0 0 0 0 0
55690 - 0 0 0 0 0 0 0 0 0 0 0 0
55691 - 0 0 0 0 0 0 0 0 0 0 0 0
55692 - 0 0 0 0 0 0 0 0 0 0 0 0
55693 - 0 0 0 0 0 0 0 0 0 0 0 0
55694 - 0 0 0 0 0 0 0 0 0 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 10 10 10
55702 - 38 38 38 86 86 86 14 14 14 10 10 10
55703 -195 195 195 188 164 115 192 133 9 225 175 15
55704 -239 182 13 234 190 10 232 195 16 232 200 30
55705 -245 207 45 241 208 19 232 195 16 184 144 12
55706 -218 194 134 211 206 186 42 42 42 2 2 6
55707 - 2 2 6 2 2 6 2 2 6 2 2 6
55708 - 50 50 50 74 74 74 30 30 30 6 6 6
55709 - 0 0 0 0 0 0 0 0 0 0 0 0
55710 - 0 0 0 0 0 0 0 0 0 0 0 0
55711 - 0 0 0 0 0 0 0 0 0 0 0 0
55712 - 0 0 0 0 0 0 0 0 0 0 0 0
55713 - 0 0 0 0 0 0 0 0 0 0 0 0
55714 - 0 0 0 0 0 0 0 0 0 0 0 0
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 0 10 10 10
55722 - 34 34 34 86 86 86 14 14 14 2 2 6
55723 -121 87 25 192 133 9 219 162 10 239 182 13
55724 -236 186 11 232 195 16 241 208 19 244 214 54
55725 -246 218 60 246 218 38 246 215 20 241 208 19
55726 -241 208 19 226 184 13 121 87 25 2 2 6
55727 - 2 2 6 2 2 6 2 2 6 2 2 6
55728 - 50 50 50 82 82 82 34 34 34 10 10 10
55729 - 0 0 0 0 0 0 0 0 0 0 0 0
55730 - 0 0 0 0 0 0 0 0 0 0 0 0
55731 - 0 0 0 0 0 0 0 0 0 0 0 0
55732 - 0 0 0 0 0 0 0 0 0 0 0 0
55733 - 0 0 0 0 0 0 0 0 0 0 0 0
55734 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55742 - 34 34 34 82 82 82 30 30 30 61 42 6
55743 -180 123 7 206 145 10 230 174 11 239 182 13
55744 -234 190 10 238 202 15 241 208 19 246 218 74
55745 -246 218 38 246 215 20 246 215 20 246 215 20
55746 -226 184 13 215 174 15 184 144 12 6 6 6
55747 - 2 2 6 2 2 6 2 2 6 2 2 6
55748 - 26 26 26 94 94 94 42 42 42 14 14 14
55749 - 0 0 0 0 0 0 0 0 0 0 0 0
55750 - 0 0 0 0 0 0 0 0 0 0 0 0
55751 - 0 0 0 0 0 0 0 0 0 0 0 0
55752 - 0 0 0 0 0 0 0 0 0 0 0 0
55753 - 0 0 0 0 0 0 0 0 0 0 0 0
55754 - 0 0 0 0 0 0 0 0 0 0 0 0
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 0 10 10 10
55762 - 30 30 30 78 78 78 50 50 50 104 69 6
55763 -192 133 9 216 158 10 236 178 12 236 186 11
55764 -232 195 16 241 208 19 244 214 54 245 215 43
55765 -246 215 20 246 215 20 241 208 19 198 155 10
55766 -200 144 11 216 158 10 156 118 10 2 2 6
55767 - 2 2 6 2 2 6 2 2 6 2 2 6
55768 - 6 6 6 90 90 90 54 54 54 18 18 18
55769 - 6 6 6 0 0 0 0 0 0 0 0 0
55770 - 0 0 0 0 0 0 0 0 0 0 0 0
55771 - 0 0 0 0 0 0 0 0 0 0 0 0
55772 - 0 0 0 0 0 0 0 0 0 0 0 0
55773 - 0 0 0 0 0 0 0 0 0 0 0 0
55774 - 0 0 0 0 0 0 0 0 0 0 0 0
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 0 10 10 10
55782 - 30 30 30 78 78 78 46 46 46 22 22 22
55783 -137 92 6 210 162 10 239 182 13 238 190 10
55784 -238 202 15 241 208 19 246 215 20 246 215 20
55785 -241 208 19 203 166 17 185 133 11 210 150 10
55786 -216 158 10 210 150 10 102 78 10 2 2 6
55787 - 6 6 6 54 54 54 14 14 14 2 2 6
55788 - 2 2 6 62 62 62 74 74 74 30 30 30
55789 - 10 10 10 0 0 0 0 0 0 0 0 0
55790 - 0 0 0 0 0 0 0 0 0 0 0 0
55791 - 0 0 0 0 0 0 0 0 0 0 0 0
55792 - 0 0 0 0 0 0 0 0 0 0 0 0
55793 - 0 0 0 0 0 0 0 0 0 0 0 0
55794 - 0 0 0 0 0 0 0 0 0 0 0 0
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 0 10 10 10
55802 - 34 34 34 78 78 78 50 50 50 6 6 6
55803 - 94 70 30 139 102 15 190 146 13 226 184 13
55804 -232 200 30 232 195 16 215 174 15 190 146 13
55805 -168 122 10 192 133 9 210 150 10 213 154 11
55806 -202 150 34 182 157 106 101 98 89 2 2 6
55807 - 2 2 6 78 78 78 116 116 116 58 58 58
55808 - 2 2 6 22 22 22 90 90 90 46 46 46
55809 - 18 18 18 6 6 6 0 0 0 0 0 0
55810 - 0 0 0 0 0 0 0 0 0 0 0 0
55811 - 0 0 0 0 0 0 0 0 0 0 0 0
55812 - 0 0 0 0 0 0 0 0 0 0 0 0
55813 - 0 0 0 0 0 0 0 0 0 0 0 0
55814 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55822 - 38 38 38 86 86 86 50 50 50 6 6 6
55823 -128 128 128 174 154 114 156 107 11 168 122 10
55824 -198 155 10 184 144 12 197 138 11 200 144 11
55825 -206 145 10 206 145 10 197 138 11 188 164 115
55826 -195 195 195 198 198 198 174 174 174 14 14 14
55827 - 2 2 6 22 22 22 116 116 116 116 116 116
55828 - 22 22 22 2 2 6 74 74 74 70 70 70
55829 - 30 30 30 10 10 10 0 0 0 0 0 0
55830 - 0 0 0 0 0 0 0 0 0 0 0 0
55831 - 0 0 0 0 0 0 0 0 0 0 0 0
55832 - 0 0 0 0 0 0 0 0 0 0 0 0
55833 - 0 0 0 0 0 0 0 0 0 0 0 0
55834 - 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 18 18 18
55842 - 50 50 50 101 101 101 26 26 26 10 10 10
55843 -138 138 138 190 190 190 174 154 114 156 107 11
55844 -197 138 11 200 144 11 197 138 11 192 133 9
55845 -180 123 7 190 142 34 190 178 144 187 187 187
55846 -202 202 202 221 221 221 214 214 214 66 66 66
55847 - 2 2 6 2 2 6 50 50 50 62 62 62
55848 - 6 6 6 2 2 6 10 10 10 90 90 90
55849 - 50 50 50 18 18 18 6 6 6 0 0 0
55850 - 0 0 0 0 0 0 0 0 0 0 0 0
55851 - 0 0 0 0 0 0 0 0 0 0 0 0
55852 - 0 0 0 0 0 0 0 0 0 0 0 0
55853 - 0 0 0 0 0 0 0 0 0 0 0 0
55854 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10 34 34 34
55862 - 74 74 74 74 74 74 2 2 6 6 6 6
55863 -144 144 144 198 198 198 190 190 190 178 166 146
55864 -154 121 60 156 107 11 156 107 11 168 124 44
55865 -174 154 114 187 187 187 190 190 190 210 210 210
55866 -246 246 246 253 253 253 253 253 253 182 182 182
55867 - 6 6 6 2 2 6 2 2 6 2 2 6
55868 - 2 2 6 2 2 6 2 2 6 62 62 62
55869 - 74 74 74 34 34 34 14 14 14 0 0 0
55870 - 0 0 0 0 0 0 0 0 0 0 0 0
55871 - 0 0 0 0 0 0 0 0 0 0 0 0
55872 - 0 0 0 0 0 0 0 0 0 0 0 0
55873 - 0 0 0 0 0 0 0 0 0 0 0 0
55874 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10 22 22 22 54 54 54
55882 - 94 94 94 18 18 18 2 2 6 46 46 46
55883 -234 234 234 221 221 221 190 190 190 190 190 190
55884 -190 190 190 187 187 187 187 187 187 190 190 190
55885 -190 190 190 195 195 195 214 214 214 242 242 242
55886 -253 253 253 253 253 253 253 253 253 253 253 253
55887 - 82 82 82 2 2 6 2 2 6 2 2 6
55888 - 2 2 6 2 2 6 2 2 6 14 14 14
55889 - 86 86 86 54 54 54 22 22 22 6 6 6
55890 - 0 0 0 0 0 0 0 0 0 0 0 0
55891 - 0 0 0 0 0 0 0 0 0 0 0 0
55892 - 0 0 0 0 0 0 0 0 0 0 0 0
55893 - 0 0 0 0 0 0 0 0 0 0 0 0
55894 - 0 0 0 0 0 0 0 0 0 0 0 0
55895 - 0 0 0 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 - 6 6 6 18 18 18 46 46 46 90 90 90
55902 - 46 46 46 18 18 18 6 6 6 182 182 182
55903 -253 253 253 246 246 246 206 206 206 190 190 190
55904 -190 190 190 190 190 190 190 190 190 190 190 190
55905 -206 206 206 231 231 231 250 250 250 253 253 253
55906 -253 253 253 253 253 253 253 253 253 253 253 253
55907 -202 202 202 14 14 14 2 2 6 2 2 6
55908 - 2 2 6 2 2 6 2 2 6 2 2 6
55909 - 42 42 42 86 86 86 42 42 42 18 18 18
55910 - 6 6 6 0 0 0 0 0 0 0 0 0
55911 - 0 0 0 0 0 0 0 0 0 0 0 0
55912 - 0 0 0 0 0 0 0 0 0 0 0 0
55913 - 0 0 0 0 0 0 0 0 0 0 0 0
55914 - 0 0 0 0 0 0 0 0 0 0 0 0
55915 - 0 0 0 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 6 6 6
55921 - 14 14 14 38 38 38 74 74 74 66 66 66
55922 - 2 2 6 6 6 6 90 90 90 250 250 250
55923 -253 253 253 253 253 253 238 238 238 198 198 198
55924 -190 190 190 190 190 190 195 195 195 221 221 221
55925 -246 246 246 253 253 253 253 253 253 253 253 253
55926 -253 253 253 253 253 253 253 253 253 253 253 253
55927 -253 253 253 82 82 82 2 2 6 2 2 6
55928 - 2 2 6 2 2 6 2 2 6 2 2 6
55929 - 2 2 6 78 78 78 70 70 70 34 34 34
55930 - 14 14 14 6 6 6 0 0 0 0 0 0
55931 - 0 0 0 0 0 0 0 0 0 0 0 0
55932 - 0 0 0 0 0 0 0 0 0 0 0 0
55933 - 0 0 0 0 0 0 0 0 0 0 0 0
55934 - 0 0 0 0 0 0 0 0 0 0 0 0
55935 - 0 0 0 0 0 0 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 14 14 14
55941 - 34 34 34 66 66 66 78 78 78 6 6 6
55942 - 2 2 6 18 18 18 218 218 218 253 253 253
55943 -253 253 253 253 253 253 253 253 253 246 246 246
55944 -226 226 226 231 231 231 246 246 246 253 253 253
55945 -253 253 253 253 253 253 253 253 253 253 253 253
55946 -253 253 253 253 253 253 253 253 253 253 253 253
55947 -253 253 253 178 178 178 2 2 6 2 2 6
55948 - 2 2 6 2 2 6 2 2 6 2 2 6
55949 - 2 2 6 18 18 18 90 90 90 62 62 62
55950 - 30 30 30 10 10 10 0 0 0 0 0 0
55951 - 0 0 0 0 0 0 0 0 0 0 0 0
55952 - 0 0 0 0 0 0 0 0 0 0 0 0
55953 - 0 0 0 0 0 0 0 0 0 0 0 0
55954 - 0 0 0 0 0 0 0 0 0 0 0 0
55955 - 0 0 0 0 0 0 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 10 10 10 26 26 26
55961 - 58 58 58 90 90 90 18 18 18 2 2 6
55962 - 2 2 6 110 110 110 253 253 253 253 253 253
55963 -253 253 253 253 253 253 253 253 253 253 253 253
55964 -250 250 250 253 253 253 253 253 253 253 253 253
55965 -253 253 253 253 253 253 253 253 253 253 253 253
55966 -253 253 253 253 253 253 253 253 253 253 253 253
55967 -253 253 253 231 231 231 18 18 18 2 2 6
55968 - 2 2 6 2 2 6 2 2 6 2 2 6
55969 - 2 2 6 2 2 6 18 18 18 94 94 94
55970 - 54 54 54 26 26 26 10 10 10 0 0 0
55971 - 0 0 0 0 0 0 0 0 0 0 0 0
55972 - 0 0 0 0 0 0 0 0 0 0 0 0
55973 - 0 0 0 0 0 0 0 0 0 0 0 0
55974 - 0 0 0 0 0 0 0 0 0 0 0 0
55975 - 0 0 0 0 0 0 0 0 0 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 6 6 6 22 22 22 50 50 50
55981 - 90 90 90 26 26 26 2 2 6 2 2 6
55982 - 14 14 14 195 195 195 250 250 250 253 253 253
55983 -253 253 253 253 253 253 253 253 253 253 253 253
55984 -253 253 253 253 253 253 253 253 253 253 253 253
55985 -253 253 253 253 253 253 253 253 253 253 253 253
55986 -253 253 253 253 253 253 253 253 253 253 253 253
55987 -250 250 250 242 242 242 54 54 54 2 2 6
55988 - 2 2 6 2 2 6 2 2 6 2 2 6
55989 - 2 2 6 2 2 6 2 2 6 38 38 38
55990 - 86 86 86 50 50 50 22 22 22 6 6 6
55991 - 0 0 0 0 0 0 0 0 0 0 0 0
55992 - 0 0 0 0 0 0 0 0 0 0 0 0
55993 - 0 0 0 0 0 0 0 0 0 0 0 0
55994 - 0 0 0 0 0 0 0 0 0 0 0 0
55995 - 0 0 0 0 0 0 0 0 0 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 - 6 6 6 14 14 14 38 38 38 82 82 82
56001 - 34 34 34 2 2 6 2 2 6 2 2 6
56002 - 42 42 42 195 195 195 246 246 246 253 253 253
56003 -253 253 253 253 253 253 253 253 253 250 250 250
56004 -242 242 242 242 242 242 250 250 250 253 253 253
56005 -253 253 253 253 253 253 253 253 253 253 253 253
56006 -253 253 253 250 250 250 246 246 246 238 238 238
56007 -226 226 226 231 231 231 101 101 101 6 6 6
56008 - 2 2 6 2 2 6 2 2 6 2 2 6
56009 - 2 2 6 2 2 6 2 2 6 2 2 6
56010 - 38 38 38 82 82 82 42 42 42 14 14 14
56011 - 6 6 6 0 0 0 0 0 0 0 0 0
56012 - 0 0 0 0 0 0 0 0 0 0 0 0
56013 - 0 0 0 0 0 0 0 0 0 0 0 0
56014 - 0 0 0 0 0 0 0 0 0 0 0 0
56015 - 0 0 0 0 0 0 0 0 0 0 0 0
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 - 10 10 10 26 26 26 62 62 62 66 66 66
56021 - 2 2 6 2 2 6 2 2 6 6 6 6
56022 - 70 70 70 170 170 170 206 206 206 234 234 234
56023 -246 246 246 250 250 250 250 250 250 238 238 238
56024 -226 226 226 231 231 231 238 238 238 250 250 250
56025 -250 250 250 250 250 250 246 246 246 231 231 231
56026 -214 214 214 206 206 206 202 202 202 202 202 202
56027 -198 198 198 202 202 202 182 182 182 18 18 18
56028 - 2 2 6 2 2 6 2 2 6 2 2 6
56029 - 2 2 6 2 2 6 2 2 6 2 2 6
56030 - 2 2 6 62 62 62 66 66 66 30 30 30
56031 - 10 10 10 0 0 0 0 0 0 0 0 0
56032 - 0 0 0 0 0 0 0 0 0 0 0 0
56033 - 0 0 0 0 0 0 0 0 0 0 0 0
56034 - 0 0 0 0 0 0 0 0 0 0 0 0
56035 - 0 0 0 0 0 0 0 0 0 0 0 0
56036 - 0 0 0 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 - 14 14 14 42 42 42 82 82 82 18 18 18
56041 - 2 2 6 2 2 6 2 2 6 10 10 10
56042 - 94 94 94 182 182 182 218 218 218 242 242 242
56043 -250 250 250 253 253 253 253 253 253 250 250 250
56044 -234 234 234 253 253 253 253 253 253 253 253 253
56045 -253 253 253 253 253 253 253 253 253 246 246 246
56046 -238 238 238 226 226 226 210 210 210 202 202 202
56047 -195 195 195 195 195 195 210 210 210 158 158 158
56048 - 6 6 6 14 14 14 50 50 50 14 14 14
56049 - 2 2 6 2 2 6 2 2 6 2 2 6
56050 - 2 2 6 6 6 6 86 86 86 46 46 46
56051 - 18 18 18 6 6 6 0 0 0 0 0 0
56052 - 0 0 0 0 0 0 0 0 0 0 0 0
56053 - 0 0 0 0 0 0 0 0 0 0 0 0
56054 - 0 0 0 0 0 0 0 0 0 0 0 0
56055 - 0 0 0 0 0 0 0 0 0 0 0 0
56056 - 0 0 0 0 0 0 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 6 6 6
56060 - 22 22 22 54 54 54 70 70 70 2 2 6
56061 - 2 2 6 10 10 10 2 2 6 22 22 22
56062 -166 166 166 231 231 231 250 250 250 253 253 253
56063 -253 253 253 253 253 253 253 253 253 250 250 250
56064 -242 242 242 253 253 253 253 253 253 253 253 253
56065 -253 253 253 253 253 253 253 253 253 253 253 253
56066 -253 253 253 253 253 253 253 253 253 246 246 246
56067 -231 231 231 206 206 206 198 198 198 226 226 226
56068 - 94 94 94 2 2 6 6 6 6 38 38 38
56069 - 30 30 30 2 2 6 2 2 6 2 2 6
56070 - 2 2 6 2 2 6 62 62 62 66 66 66
56071 - 26 26 26 10 10 10 0 0 0 0 0 0
56072 - 0 0 0 0 0 0 0 0 0 0 0 0
56073 - 0 0 0 0 0 0 0 0 0 0 0 0
56074 - 0 0 0 0 0 0 0 0 0 0 0 0
56075 - 0 0 0 0 0 0 0 0 0 0 0 0
56076 - 0 0 0 0 0 0 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 10 10 10
56080 - 30 30 30 74 74 74 50 50 50 2 2 6
56081 - 26 26 26 26 26 26 2 2 6 106 106 106
56082 -238 238 238 253 253 253 253 253 253 253 253 253
56083 -253 253 253 253 253 253 253 253 253 253 253 253
56084 -253 253 253 253 253 253 253 253 253 253 253 253
56085 -253 253 253 253 253 253 253 253 253 253 253 253
56086 -253 253 253 253 253 253 253 253 253 253 253 253
56087 -253 253 253 246 246 246 218 218 218 202 202 202
56088 -210 210 210 14 14 14 2 2 6 2 2 6
56089 - 30 30 30 22 22 22 2 2 6 2 2 6
56090 - 2 2 6 2 2 6 18 18 18 86 86 86
56091 - 42 42 42 14 14 14 0 0 0 0 0 0
56092 - 0 0 0 0 0 0 0 0 0 0 0 0
56093 - 0 0 0 0 0 0 0 0 0 0 0 0
56094 - 0 0 0 0 0 0 0 0 0 0 0 0
56095 - 0 0 0 0 0 0 0 0 0 0 0 0
56096 - 0 0 0 0 0 0 0 0 0 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 14 14 14
56100 - 42 42 42 90 90 90 22 22 22 2 2 6
56101 - 42 42 42 2 2 6 18 18 18 218 218 218
56102 -253 253 253 253 253 253 253 253 253 253 253 253
56103 -253 253 253 253 253 253 253 253 253 253 253 253
56104 -253 253 253 253 253 253 253 253 253 253 253 253
56105 -253 253 253 253 253 253 253 253 253 253 253 253
56106 -253 253 253 253 253 253 253 253 253 253 253 253
56107 -253 253 253 253 253 253 250 250 250 221 221 221
56108 -218 218 218 101 101 101 2 2 6 14 14 14
56109 - 18 18 18 38 38 38 10 10 10 2 2 6
56110 - 2 2 6 2 2 6 2 2 6 78 78 78
56111 - 58 58 58 22 22 22 6 6 6 0 0 0
56112 - 0 0 0 0 0 0 0 0 0 0 0 0
56113 - 0 0 0 0 0 0 0 0 0 0 0 0
56114 - 0 0 0 0 0 0 0 0 0 0 0 0
56115 - 0 0 0 0 0 0 0 0 0 0 0 0
56116 - 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6 18 18 18
56120 - 54 54 54 82 82 82 2 2 6 26 26 26
56121 - 22 22 22 2 2 6 123 123 123 253 253 253
56122 -253 253 253 253 253 253 253 253 253 253 253 253
56123 -253 253 253 253 253 253 253 253 253 253 253 253
56124 -253 253 253 253 253 253 253 253 253 253 253 253
56125 -253 253 253 253 253 253 253 253 253 253 253 253
56126 -253 253 253 253 253 253 253 253 253 253 253 253
56127 -253 253 253 253 253 253 253 253 253 250 250 250
56128 -238 238 238 198 198 198 6 6 6 38 38 38
56129 - 58 58 58 26 26 26 38 38 38 2 2 6
56130 - 2 2 6 2 2 6 2 2 6 46 46 46
56131 - 78 78 78 30 30 30 10 10 10 0 0 0
56132 - 0 0 0 0 0 0 0 0 0 0 0 0
56133 - 0 0 0 0 0 0 0 0 0 0 0 0
56134 - 0 0 0 0 0 0 0 0 0 0 0 0
56135 - 0 0 0 0 0 0 0 0 0 0 0 0
56136 - 0 0 0 0 0 0 0 0 0 0 0 0
56137 - 0 0 0 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 10 10 10 30 30 30
56140 - 74 74 74 58 58 58 2 2 6 42 42 42
56141 - 2 2 6 22 22 22 231 231 231 253 253 253
56142 -253 253 253 253 253 253 253 253 253 253 253 253
56143 -253 253 253 253 253 253 253 253 253 250 250 250
56144 -253 253 253 253 253 253 253 253 253 253 253 253
56145 -253 253 253 253 253 253 253 253 253 253 253 253
56146 -253 253 253 253 253 253 253 253 253 253 253 253
56147 -253 253 253 253 253 253 253 253 253 253 253 253
56148 -253 253 253 246 246 246 46 46 46 38 38 38
56149 - 42 42 42 14 14 14 38 38 38 14 14 14
56150 - 2 2 6 2 2 6 2 2 6 6 6 6
56151 - 86 86 86 46 46 46 14 14 14 0 0 0
56152 - 0 0 0 0 0 0 0 0 0 0 0 0
56153 - 0 0 0 0 0 0 0 0 0 0 0 0
56154 - 0 0 0 0 0 0 0 0 0 0 0 0
56155 - 0 0 0 0 0 0 0 0 0 0 0 0
56156 - 0 0 0 0 0 0 0 0 0 0 0 0
56157 - 0 0 0 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 6 6 6 14 14 14 42 42 42
56160 - 90 90 90 18 18 18 18 18 18 26 26 26
56161 - 2 2 6 116 116 116 253 253 253 253 253 253
56162 -253 253 253 253 253 253 253 253 253 253 253 253
56163 -253 253 253 253 253 253 250 250 250 238 238 238
56164 -253 253 253 253 253 253 253 253 253 253 253 253
56165 -253 253 253 253 253 253 253 253 253 253 253 253
56166 -253 253 253 253 253 253 253 253 253 253 253 253
56167 -253 253 253 253 253 253 253 253 253 253 253 253
56168 -253 253 253 253 253 253 94 94 94 6 6 6
56169 - 2 2 6 2 2 6 10 10 10 34 34 34
56170 - 2 2 6 2 2 6 2 2 6 2 2 6
56171 - 74 74 74 58 58 58 22 22 22 6 6 6
56172 - 0 0 0 0 0 0 0 0 0 0 0 0
56173 - 0 0 0 0 0 0 0 0 0 0 0 0
56174 - 0 0 0 0 0 0 0 0 0 0 0 0
56175 - 0 0 0 0 0 0 0 0 0 0 0 0
56176 - 0 0 0 0 0 0 0 0 0 0 0 0
56177 - 0 0 0 0 0 0 0 0 0 0 0 0
56178 - 0 0 0 0 0 0 0 0 0 0 0 0
56179 - 0 0 0 10 10 10 26 26 26 66 66 66
56180 - 82 82 82 2 2 6 38 38 38 6 6 6
56181 - 14 14 14 210 210 210 253 253 253 253 253 253
56182 -253 253 253 253 253 253 253 253 253 253 253 253
56183 -253 253 253 253 253 253 246 246 246 242 242 242
56184 -253 253 253 253 253 253 253 253 253 253 253 253
56185 -253 253 253 253 253 253 253 253 253 253 253 253
56186 -253 253 253 253 253 253 253 253 253 253 253 253
56187 -253 253 253 253 253 253 253 253 253 253 253 253
56188 -253 253 253 253 253 253 144 144 144 2 2 6
56189 - 2 2 6 2 2 6 2 2 6 46 46 46
56190 - 2 2 6 2 2 6 2 2 6 2 2 6
56191 - 42 42 42 74 74 74 30 30 30 10 10 10
56192 - 0 0 0 0 0 0 0 0 0 0 0 0
56193 - 0 0 0 0 0 0 0 0 0 0 0 0
56194 - 0 0 0 0 0 0 0 0 0 0 0 0
56195 - 0 0 0 0 0 0 0 0 0 0 0 0
56196 - 0 0 0 0 0 0 0 0 0 0 0 0
56197 - 0 0 0 0 0 0 0 0 0 0 0 0
56198 - 0 0 0 0 0 0 0 0 0 0 0 0
56199 - 6 6 6 14 14 14 42 42 42 90 90 90
56200 - 26 26 26 6 6 6 42 42 42 2 2 6
56201 - 74 74 74 250 250 250 253 253 253 253 253 253
56202 -253 253 253 253 253 253 253 253 253 253 253 253
56203 -253 253 253 253 253 253 242 242 242 242 242 242
56204 -253 253 253 253 253 253 253 253 253 253 253 253
56205 -253 253 253 253 253 253 253 253 253 253 253 253
56206 -253 253 253 253 253 253 253 253 253 253 253 253
56207 -253 253 253 253 253 253 253 253 253 253 253 253
56208 -253 253 253 253 253 253 182 182 182 2 2 6
56209 - 2 2 6 2 2 6 2 2 6 46 46 46
56210 - 2 2 6 2 2 6 2 2 6 2 2 6
56211 - 10 10 10 86 86 86 38 38 38 10 10 10
56212 - 0 0 0 0 0 0 0 0 0 0 0 0
56213 - 0 0 0 0 0 0 0 0 0 0 0 0
56214 - 0 0 0 0 0 0 0 0 0 0 0 0
56215 - 0 0 0 0 0 0 0 0 0 0 0 0
56216 - 0 0 0 0 0 0 0 0 0 0 0 0
56217 - 0 0 0 0 0 0 0 0 0 0 0 0
56218 - 0 0 0 0 0 0 0 0 0 0 0 0
56219 - 10 10 10 26 26 26 66 66 66 82 82 82
56220 - 2 2 6 22 22 22 18 18 18 2 2 6
56221 -149 149 149 253 253 253 253 253 253 253 253 253
56222 -253 253 253 253 253 253 253 253 253 253 253 253
56223 -253 253 253 253 253 253 234 234 234 242 242 242
56224 -253 253 253 253 253 253 253 253 253 253 253 253
56225 -253 253 253 253 253 253 253 253 253 253 253 253
56226 -253 253 253 253 253 253 253 253 253 253 253 253
56227 -253 253 253 253 253 253 253 253 253 253 253 253
56228 -253 253 253 253 253 253 206 206 206 2 2 6
56229 - 2 2 6 2 2 6 2 2 6 38 38 38
56230 - 2 2 6 2 2 6 2 2 6 2 2 6
56231 - 6 6 6 86 86 86 46 46 46 14 14 14
56232 - 0 0 0 0 0 0 0 0 0 0 0 0
56233 - 0 0 0 0 0 0 0 0 0 0 0 0
56234 - 0 0 0 0 0 0 0 0 0 0 0 0
56235 - 0 0 0 0 0 0 0 0 0 0 0 0
56236 - 0 0 0 0 0 0 0 0 0 0 0 0
56237 - 0 0 0 0 0 0 0 0 0 0 0 0
56238 - 0 0 0 0 0 0 0 0 0 6 6 6
56239 - 18 18 18 46 46 46 86 86 86 18 18 18
56240 - 2 2 6 34 34 34 10 10 10 6 6 6
56241 -210 210 210 253 253 253 253 253 253 253 253 253
56242 -253 253 253 253 253 253 253 253 253 253 253 253
56243 -253 253 253 253 253 253 234 234 234 242 242 242
56244 -253 253 253 253 253 253 253 253 253 253 253 253
56245 -253 253 253 253 253 253 253 253 253 253 253 253
56246 -253 253 253 253 253 253 253 253 253 253 253 253
56247 -253 253 253 253 253 253 253 253 253 253 253 253
56248 -253 253 253 253 253 253 221 221 221 6 6 6
56249 - 2 2 6 2 2 6 6 6 6 30 30 30
56250 - 2 2 6 2 2 6 2 2 6 2 2 6
56251 - 2 2 6 82 82 82 54 54 54 18 18 18
56252 - 6 6 6 0 0 0 0 0 0 0 0 0
56253 - 0 0 0 0 0 0 0 0 0 0 0 0
56254 - 0 0 0 0 0 0 0 0 0 0 0 0
56255 - 0 0 0 0 0 0 0 0 0 0 0 0
56256 - 0 0 0 0 0 0 0 0 0 0 0 0
56257 - 0 0 0 0 0 0 0 0 0 0 0 0
56258 - 0 0 0 0 0 0 0 0 0 10 10 10
56259 - 26 26 26 66 66 66 62 62 62 2 2 6
56260 - 2 2 6 38 38 38 10 10 10 26 26 26
56261 -238 238 238 253 253 253 253 253 253 253 253 253
56262 -253 253 253 253 253 253 253 253 253 253 253 253
56263 -253 253 253 253 253 253 231 231 231 238 238 238
56264 -253 253 253 253 253 253 253 253 253 253 253 253
56265 -253 253 253 253 253 253 253 253 253 253 253 253
56266 -253 253 253 253 253 253 253 253 253 253 253 253
56267 -253 253 253 253 253 253 253 253 253 253 253 253
56268 -253 253 253 253 253 253 231 231 231 6 6 6
56269 - 2 2 6 2 2 6 10 10 10 30 30 30
56270 - 2 2 6 2 2 6 2 2 6 2 2 6
56271 - 2 2 6 66 66 66 58 58 58 22 22 22
56272 - 6 6 6 0 0 0 0 0 0 0 0 0
56273 - 0 0 0 0 0 0 0 0 0 0 0 0
56274 - 0 0 0 0 0 0 0 0 0 0 0 0
56275 - 0 0 0 0 0 0 0 0 0 0 0 0
56276 - 0 0 0 0 0 0 0 0 0 0 0 0
56277 - 0 0 0 0 0 0 0 0 0 0 0 0
56278 - 0 0 0 0 0 0 0 0 0 10 10 10
56279 - 38 38 38 78 78 78 6 6 6 2 2 6
56280 - 2 2 6 46 46 46 14 14 14 42 42 42
56281 -246 246 246 253 253 253 253 253 253 253 253 253
56282 -253 253 253 253 253 253 253 253 253 253 253 253
56283 -253 253 253 253 253 253 231 231 231 242 242 242
56284 -253 253 253 253 253 253 253 253 253 253 253 253
56285 -253 253 253 253 253 253 253 253 253 253 253 253
56286 -253 253 253 253 253 253 253 253 253 253 253 253
56287 -253 253 253 253 253 253 253 253 253 253 253 253
56288 -253 253 253 253 253 253 234 234 234 10 10 10
56289 - 2 2 6 2 2 6 22 22 22 14 14 14
56290 - 2 2 6 2 2 6 2 2 6 2 2 6
56291 - 2 2 6 66 66 66 62 62 62 22 22 22
56292 - 6 6 6 0 0 0 0 0 0 0 0 0
56293 - 0 0 0 0 0 0 0 0 0 0 0 0
56294 - 0 0 0 0 0 0 0 0 0 0 0 0
56295 - 0 0 0 0 0 0 0 0 0 0 0 0
56296 - 0 0 0 0 0 0 0 0 0 0 0 0
56297 - 0 0 0 0 0 0 0 0 0 0 0 0
56298 - 0 0 0 0 0 0 6 6 6 18 18 18
56299 - 50 50 50 74 74 74 2 2 6 2 2 6
56300 - 14 14 14 70 70 70 34 34 34 62 62 62
56301 -250 250 250 253 253 253 253 253 253 253 253 253
56302 -253 253 253 253 253 253 253 253 253 253 253 253
56303 -253 253 253 253 253 253 231 231 231 246 246 246
56304 -253 253 253 253 253 253 253 253 253 253 253 253
56305 -253 253 253 253 253 253 253 253 253 253 253 253
56306 -253 253 253 253 253 253 253 253 253 253 253 253
56307 -253 253 253 253 253 253 253 253 253 253 253 253
56308 -253 253 253 253 253 253 234 234 234 14 14 14
56309 - 2 2 6 2 2 6 30 30 30 2 2 6
56310 - 2 2 6 2 2 6 2 2 6 2 2 6
56311 - 2 2 6 66 66 66 62 62 62 22 22 22
56312 - 6 6 6 0 0 0 0 0 0 0 0 0
56313 - 0 0 0 0 0 0 0 0 0 0 0 0
56314 - 0 0 0 0 0 0 0 0 0 0 0 0
56315 - 0 0 0 0 0 0 0 0 0 0 0 0
56316 - 0 0 0 0 0 0 0 0 0 0 0 0
56317 - 0 0 0 0 0 0 0 0 0 0 0 0
56318 - 0 0 0 0 0 0 6 6 6 18 18 18
56319 - 54 54 54 62 62 62 2 2 6 2 2 6
56320 - 2 2 6 30 30 30 46 46 46 70 70 70
56321 -250 250 250 253 253 253 253 253 253 253 253 253
56322 -253 253 253 253 253 253 253 253 253 253 253 253
56323 -253 253 253 253 253 253 231 231 231 246 246 246
56324 -253 253 253 253 253 253 253 253 253 253 253 253
56325 -253 253 253 253 253 253 253 253 253 253 253 253
56326 -253 253 253 253 253 253 253 253 253 253 253 253
56327 -253 253 253 253 253 253 253 253 253 253 253 253
56328 -253 253 253 253 253 253 226 226 226 10 10 10
56329 - 2 2 6 6 6 6 30 30 30 2 2 6
56330 - 2 2 6 2 2 6 2 2 6 2 2 6
56331 - 2 2 6 66 66 66 58 58 58 22 22 22
56332 - 6 6 6 0 0 0 0 0 0 0 0 0
56333 - 0 0 0 0 0 0 0 0 0 0 0 0
56334 - 0 0 0 0 0 0 0 0 0 0 0 0
56335 - 0 0 0 0 0 0 0 0 0 0 0 0
56336 - 0 0 0 0 0 0 0 0 0 0 0 0
56337 - 0 0 0 0 0 0 0 0 0 0 0 0
56338 - 0 0 0 0 0 0 6 6 6 22 22 22
56339 - 58 58 58 62 62 62 2 2 6 2 2 6
56340 - 2 2 6 2 2 6 30 30 30 78 78 78
56341 -250 250 250 253 253 253 253 253 253 253 253 253
56342 -253 253 253 253 253 253 253 253 253 253 253 253
56343 -253 253 253 253 253 253 231 231 231 246 246 246
56344 -253 253 253 253 253 253 253 253 253 253 253 253
56345 -253 253 253 253 253 253 253 253 253 253 253 253
56346 -253 253 253 253 253 253 253 253 253 253 253 253
56347 -253 253 253 253 253 253 253 253 253 253 253 253
56348 -253 253 253 253 253 253 206 206 206 2 2 6
56349 - 22 22 22 34 34 34 18 14 6 22 22 22
56350 - 26 26 26 18 18 18 6 6 6 2 2 6
56351 - 2 2 6 82 82 82 54 54 54 18 18 18
56352 - 6 6 6 0 0 0 0 0 0 0 0 0
56353 - 0 0 0 0 0 0 0 0 0 0 0 0
56354 - 0 0 0 0 0 0 0 0 0 0 0 0
56355 - 0 0 0 0 0 0 0 0 0 0 0 0
56356 - 0 0 0 0 0 0 0 0 0 0 0 0
56357 - 0 0 0 0 0 0 0 0 0 0 0 0
56358 - 0 0 0 0 0 0 6 6 6 26 26 26
56359 - 62 62 62 106 106 106 74 54 14 185 133 11
56360 -210 162 10 121 92 8 6 6 6 62 62 62
56361 -238 238 238 253 253 253 253 253 253 253 253 253
56362 -253 253 253 253 253 253 253 253 253 253 253 253
56363 -253 253 253 253 253 253 231 231 231 246 246 246
56364 -253 253 253 253 253 253 253 253 253 253 253 253
56365 -253 253 253 253 253 253 253 253 253 253 253 253
56366 -253 253 253 253 253 253 253 253 253 253 253 253
56367 -253 253 253 253 253 253 253 253 253 253 253 253
56368 -253 253 253 253 253 253 158 158 158 18 18 18
56369 - 14 14 14 2 2 6 2 2 6 2 2 6
56370 - 6 6 6 18 18 18 66 66 66 38 38 38
56371 - 6 6 6 94 94 94 50 50 50 18 18 18
56372 - 6 6 6 0 0 0 0 0 0 0 0 0
56373 - 0 0 0 0 0 0 0 0 0 0 0 0
56374 - 0 0 0 0 0 0 0 0 0 0 0 0
56375 - 0 0 0 0 0 0 0 0 0 0 0 0
56376 - 0 0 0 0 0 0 0 0 0 0 0 0
56377 - 0 0 0 0 0 0 0 0 0 6 6 6
56378 - 10 10 10 10 10 10 18 18 18 38 38 38
56379 - 78 78 78 142 134 106 216 158 10 242 186 14
56380 -246 190 14 246 190 14 156 118 10 10 10 10
56381 - 90 90 90 238 238 238 253 253 253 253 253 253
56382 -253 253 253 253 253 253 253 253 253 253 253 253
56383 -253 253 253 253 253 253 231 231 231 250 250 250
56384 -253 253 253 253 253 253 253 253 253 253 253 253
56385 -253 253 253 253 253 253 253 253 253 253 253 253
56386 -253 253 253 253 253 253 253 253 253 253 253 253
56387 -253 253 253 253 253 253 253 253 253 246 230 190
56388 -238 204 91 238 204 91 181 142 44 37 26 9
56389 - 2 2 6 2 2 6 2 2 6 2 2 6
56390 - 2 2 6 2 2 6 38 38 38 46 46 46
56391 - 26 26 26 106 106 106 54 54 54 18 18 18
56392 - 6 6 6 0 0 0 0 0 0 0 0 0
56393 - 0 0 0 0 0 0 0 0 0 0 0 0
56394 - 0 0 0 0 0 0 0 0 0 0 0 0
56395 - 0 0 0 0 0 0 0 0 0 0 0 0
56396 - 0 0 0 0 0 0 0 0 0 0 0 0
56397 - 0 0 0 6 6 6 14 14 14 22 22 22
56398 - 30 30 30 38 38 38 50 50 50 70 70 70
56399 -106 106 106 190 142 34 226 170 11 242 186 14
56400 -246 190 14 246 190 14 246 190 14 154 114 10
56401 - 6 6 6 74 74 74 226 226 226 253 253 253
56402 -253 253 253 253 253 253 253 253 253 253 253 253
56403 -253 253 253 253 253 253 231 231 231 250 250 250
56404 -253 253 253 253 253 253 253 253 253 253 253 253
56405 -253 253 253 253 253 253 253 253 253 253 253 253
56406 -253 253 253 253 253 253 253 253 253 253 253 253
56407 -253 253 253 253 253 253 253 253 253 228 184 62
56408 -241 196 14 241 208 19 232 195 16 38 30 10
56409 - 2 2 6 2 2 6 2 2 6 2 2 6
56410 - 2 2 6 6 6 6 30 30 30 26 26 26
56411 -203 166 17 154 142 90 66 66 66 26 26 26
56412 - 6 6 6 0 0 0 0 0 0 0 0 0
56413 - 0 0 0 0 0 0 0 0 0 0 0 0
56414 - 0 0 0 0 0 0 0 0 0 0 0 0
56415 - 0 0 0 0 0 0 0 0 0 0 0 0
56416 - 0 0 0 0 0 0 0 0 0 0 0 0
56417 - 6 6 6 18 18 18 38 38 38 58 58 58
56418 - 78 78 78 86 86 86 101 101 101 123 123 123
56419 -175 146 61 210 150 10 234 174 13 246 186 14
56420 -246 190 14 246 190 14 246 190 14 238 190 10
56421 -102 78 10 2 2 6 46 46 46 198 198 198
56422 -253 253 253 253 253 253 253 253 253 253 253 253
56423 -253 253 253 253 253 253 234 234 234 242 242 242
56424 -253 253 253 253 253 253 253 253 253 253 253 253
56425 -253 253 253 253 253 253 253 253 253 253 253 253
56426 -253 253 253 253 253 253 253 253 253 253 253 253
56427 -253 253 253 253 253 253 253 253 253 224 178 62
56428 -242 186 14 241 196 14 210 166 10 22 18 6
56429 - 2 2 6 2 2 6 2 2 6 2 2 6
56430 - 2 2 6 2 2 6 6 6 6 121 92 8
56431 -238 202 15 232 195 16 82 82 82 34 34 34
56432 - 10 10 10 0 0 0 0 0 0 0 0 0
56433 - 0 0 0 0 0 0 0 0 0 0 0 0
56434 - 0 0 0 0 0 0 0 0 0 0 0 0
56435 - 0 0 0 0 0 0 0 0 0 0 0 0
56436 - 0 0 0 0 0 0 0 0 0 0 0 0
56437 - 14 14 14 38 38 38 70 70 70 154 122 46
56438 -190 142 34 200 144 11 197 138 11 197 138 11
56439 -213 154 11 226 170 11 242 186 14 246 190 14
56440 -246 190 14 246 190 14 246 190 14 246 190 14
56441 -225 175 15 46 32 6 2 2 6 22 22 22
56442 -158 158 158 250 250 250 253 253 253 253 253 253
56443 -253 253 253 253 253 253 253 253 253 253 253 253
56444 -253 253 253 253 253 253 253 253 253 253 253 253
56445 -253 253 253 253 253 253 253 253 253 253 253 253
56446 -253 253 253 253 253 253 253 253 253 253 253 253
56447 -253 253 253 250 250 250 242 242 242 224 178 62
56448 -239 182 13 236 186 11 213 154 11 46 32 6
56449 - 2 2 6 2 2 6 2 2 6 2 2 6
56450 - 2 2 6 2 2 6 61 42 6 225 175 15
56451 -238 190 10 236 186 11 112 100 78 42 42 42
56452 - 14 14 14 0 0 0 0 0 0 0 0 0
56453 - 0 0 0 0 0 0 0 0 0 0 0 0
56454 - 0 0 0 0 0 0 0 0 0 0 0 0
56455 - 0 0 0 0 0 0 0 0 0 0 0 0
56456 - 0 0 0 0 0 0 0 0 0 6 6 6
56457 - 22 22 22 54 54 54 154 122 46 213 154 11
56458 -226 170 11 230 174 11 226 170 11 226 170 11
56459 -236 178 12 242 186 14 246 190 14 246 190 14
56460 -246 190 14 246 190 14 246 190 14 246 190 14
56461 -241 196 14 184 144 12 10 10 10 2 2 6
56462 - 6 6 6 116 116 116 242 242 242 253 253 253
56463 -253 253 253 253 253 253 253 253 253 253 253 253
56464 -253 253 253 253 253 253 253 253 253 253 253 253
56465 -253 253 253 253 253 253 253 253 253 253 253 253
56466 -253 253 253 253 253 253 253 253 253 253 253 253
56467 -253 253 253 231 231 231 198 198 198 214 170 54
56468 -236 178 12 236 178 12 210 150 10 137 92 6
56469 - 18 14 6 2 2 6 2 2 6 2 2 6
56470 - 6 6 6 70 47 6 200 144 11 236 178 12
56471 -239 182 13 239 182 13 124 112 88 58 58 58
56472 - 22 22 22 6 6 6 0 0 0 0 0 0
56473 - 0 0 0 0 0 0 0 0 0 0 0 0
56474 - 0 0 0 0 0 0 0 0 0 0 0 0
56475 - 0 0 0 0 0 0 0 0 0 0 0 0
56476 - 0 0 0 0 0 0 0 0 0 10 10 10
56477 - 30 30 30 70 70 70 180 133 36 226 170 11
56478 -239 182 13 242 186 14 242 186 14 246 186 14
56479 -246 190 14 246 190 14 246 190 14 246 190 14
56480 -246 190 14 246 190 14 246 190 14 246 190 14
56481 -246 190 14 232 195 16 98 70 6 2 2 6
56482 - 2 2 6 2 2 6 66 66 66 221 221 221
56483 -253 253 253 253 253 253 253 253 253 253 253 253
56484 -253 253 253 253 253 253 253 253 253 253 253 253
56485 -253 253 253 253 253 253 253 253 253 253 253 253
56486 -253 253 253 253 253 253 253 253 253 253 253 253
56487 -253 253 253 206 206 206 198 198 198 214 166 58
56488 -230 174 11 230 174 11 216 158 10 192 133 9
56489 -163 110 8 116 81 8 102 78 10 116 81 8
56490 -167 114 7 197 138 11 226 170 11 239 182 13
56491 -242 186 14 242 186 14 162 146 94 78 78 78
56492 - 34 34 34 14 14 14 6 6 6 0 0 0
56493 - 0 0 0 0 0 0 0 0 0 0 0 0
56494 - 0 0 0 0 0 0 0 0 0 0 0 0
56495 - 0 0 0 0 0 0 0 0 0 0 0 0
56496 - 0 0 0 0 0 0 0 0 0 6 6 6
56497 - 30 30 30 78 78 78 190 142 34 226 170 11
56498 -239 182 13 246 190 14 246 190 14 246 190 14
56499 -246 190 14 246 190 14 246 190 14 246 190 14
56500 -246 190 14 246 190 14 246 190 14 246 190 14
56501 -246 190 14 241 196 14 203 166 17 22 18 6
56502 - 2 2 6 2 2 6 2 2 6 38 38 38
56503 -218 218 218 253 253 253 253 253 253 253 253 253
56504 -253 253 253 253 253 253 253 253 253 253 253 253
56505 -253 253 253 253 253 253 253 253 253 253 253 253
56506 -253 253 253 253 253 253 253 253 253 253 253 253
56507 -250 250 250 206 206 206 198 198 198 202 162 69
56508 -226 170 11 236 178 12 224 166 10 210 150 10
56509 -200 144 11 197 138 11 192 133 9 197 138 11
56510 -210 150 10 226 170 11 242 186 14 246 190 14
56511 -246 190 14 246 186 14 225 175 15 124 112 88
56512 - 62 62 62 30 30 30 14 14 14 6 6 6
56513 - 0 0 0 0 0 0 0 0 0 0 0 0
56514 - 0 0 0 0 0 0 0 0 0 0 0 0
56515 - 0 0 0 0 0 0 0 0 0 0 0 0
56516 - 0 0 0 0 0 0 0 0 0 10 10 10
56517 - 30 30 30 78 78 78 174 135 50 224 166 10
56518 -239 182 13 246 190 14 246 190 14 246 190 14
56519 -246 190 14 246 190 14 246 190 14 246 190 14
56520 -246 190 14 246 190 14 246 190 14 246 190 14
56521 -246 190 14 246 190 14 241 196 14 139 102 15
56522 - 2 2 6 2 2 6 2 2 6 2 2 6
56523 - 78 78 78 250 250 250 253 253 253 253 253 253
56524 -253 253 253 253 253 253 253 253 253 253 253 253
56525 -253 253 253 253 253 253 253 253 253 253 253 253
56526 -253 253 253 253 253 253 253 253 253 253 253 253
56527 -250 250 250 214 214 214 198 198 198 190 150 46
56528 -219 162 10 236 178 12 234 174 13 224 166 10
56529 -216 158 10 213 154 11 213 154 11 216 158 10
56530 -226 170 11 239 182 13 246 190 14 246 190 14
56531 -246 190 14 246 190 14 242 186 14 206 162 42
56532 -101 101 101 58 58 58 30 30 30 14 14 14
56533 - 6 6 6 0 0 0 0 0 0 0 0 0
56534 - 0 0 0 0 0 0 0 0 0 0 0 0
56535 - 0 0 0 0 0 0 0 0 0 0 0 0
56536 - 0 0 0 0 0 0 0 0 0 10 10 10
56537 - 30 30 30 74 74 74 174 135 50 216 158 10
56538 -236 178 12 246 190 14 246 190 14 246 190 14
56539 -246 190 14 246 190 14 246 190 14 246 190 14
56540 -246 190 14 246 190 14 246 190 14 246 190 14
56541 -246 190 14 246 190 14 241 196 14 226 184 13
56542 - 61 42 6 2 2 6 2 2 6 2 2 6
56543 - 22 22 22 238 238 238 253 253 253 253 253 253
56544 -253 253 253 253 253 253 253 253 253 253 253 253
56545 -253 253 253 253 253 253 253 253 253 253 253 253
56546 -253 253 253 253 253 253 253 253 253 253 253 253
56547 -253 253 253 226 226 226 187 187 187 180 133 36
56548 -216 158 10 236 178 12 239 182 13 236 178 12
56549 -230 174 11 226 170 11 226 170 11 230 174 11
56550 -236 178 12 242 186 14 246 190 14 246 190 14
56551 -246 190 14 246 190 14 246 186 14 239 182 13
56552 -206 162 42 106 106 106 66 66 66 34 34 34
56553 - 14 14 14 6 6 6 0 0 0 0 0 0
56554 - 0 0 0 0 0 0 0 0 0 0 0 0
56555 - 0 0 0 0 0 0 0 0 0 0 0 0
56556 - 0 0 0 0 0 0 0 0 0 6 6 6
56557 - 26 26 26 70 70 70 163 133 67 213 154 11
56558 -236 178 12 246 190 14 246 190 14 246 190 14
56559 -246 190 14 246 190 14 246 190 14 246 190 14
56560 -246 190 14 246 190 14 246 190 14 246 190 14
56561 -246 190 14 246 190 14 246 190 14 241 196 14
56562 -190 146 13 18 14 6 2 2 6 2 2 6
56563 - 46 46 46 246 246 246 253 253 253 253 253 253
56564 -253 253 253 253 253 253 253 253 253 253 253 253
56565 -253 253 253 253 253 253 253 253 253 253 253 253
56566 -253 253 253 253 253 253 253 253 253 253 253 253
56567 -253 253 253 221 221 221 86 86 86 156 107 11
56568 -216 158 10 236 178 12 242 186 14 246 186 14
56569 -242 186 14 239 182 13 239 182 13 242 186 14
56570 -242 186 14 246 186 14 246 190 14 246 190 14
56571 -246 190 14 246 190 14 246 190 14 246 190 14
56572 -242 186 14 225 175 15 142 122 72 66 66 66
56573 - 30 30 30 10 10 10 0 0 0 0 0 0
56574 - 0 0 0 0 0 0 0 0 0 0 0 0
56575 - 0 0 0 0 0 0 0 0 0 0 0 0
56576 - 0 0 0 0 0 0 0 0 0 6 6 6
56577 - 26 26 26 70 70 70 163 133 67 210 150 10
56578 -236 178 12 246 190 14 246 190 14 246 190 14
56579 -246 190 14 246 190 14 246 190 14 246 190 14
56580 -246 190 14 246 190 14 246 190 14 246 190 14
56581 -246 190 14 246 190 14 246 190 14 246 190 14
56582 -232 195 16 121 92 8 34 34 34 106 106 106
56583 -221 221 221 253 253 253 253 253 253 253 253 253
56584 -253 253 253 253 253 253 253 253 253 253 253 253
56585 -253 253 253 253 253 253 253 253 253 253 253 253
56586 -253 253 253 253 253 253 253 253 253 253 253 253
56587 -242 242 242 82 82 82 18 14 6 163 110 8
56588 -216 158 10 236 178 12 242 186 14 246 190 14
56589 -246 190 14 246 190 14 246 190 14 246 190 14
56590 -246 190 14 246 190 14 246 190 14 246 190 14
56591 -246 190 14 246 190 14 246 190 14 246 190 14
56592 -246 190 14 246 190 14 242 186 14 163 133 67
56593 - 46 46 46 18 18 18 6 6 6 0 0 0
56594 - 0 0 0 0 0 0 0 0 0 0 0 0
56595 - 0 0 0 0 0 0 0 0 0 0 0 0
56596 - 0 0 0 0 0 0 0 0 0 10 10 10
56597 - 30 30 30 78 78 78 163 133 67 210 150 10
56598 -236 178 12 246 186 14 246 190 14 246 190 14
56599 -246 190 14 246 190 14 246 190 14 246 190 14
56600 -246 190 14 246 190 14 246 190 14 246 190 14
56601 -246 190 14 246 190 14 246 190 14 246 190 14
56602 -241 196 14 215 174 15 190 178 144 253 253 253
56603 -253 253 253 253 253 253 253 253 253 253 253 253
56604 -253 253 253 253 253 253 253 253 253 253 253 253
56605 -253 253 253 253 253 253 253 253 253 253 253 253
56606 -253 253 253 253 253 253 253 253 253 218 218 218
56607 - 58 58 58 2 2 6 22 18 6 167 114 7
56608 -216 158 10 236 178 12 246 186 14 246 190 14
56609 -246 190 14 246 190 14 246 190 14 246 190 14
56610 -246 190 14 246 190 14 246 190 14 246 190 14
56611 -246 190 14 246 190 14 246 190 14 246 190 14
56612 -246 190 14 246 186 14 242 186 14 190 150 46
56613 - 54 54 54 22 22 22 6 6 6 0 0 0
56614 - 0 0 0 0 0 0 0 0 0 0 0 0
56615 - 0 0 0 0 0 0 0 0 0 0 0 0
56616 - 0 0 0 0 0 0 0 0 0 14 14 14
56617 - 38 38 38 86 86 86 180 133 36 213 154 11
56618 -236 178 12 246 186 14 246 190 14 246 190 14
56619 -246 190 14 246 190 14 246 190 14 246 190 14
56620 -246 190 14 246 190 14 246 190 14 246 190 14
56621 -246 190 14 246 190 14 246 190 14 246 190 14
56622 -246 190 14 232 195 16 190 146 13 214 214 214
56623 -253 253 253 253 253 253 253 253 253 253 253 253
56624 -253 253 253 253 253 253 253 253 253 253 253 253
56625 -253 253 253 253 253 253 253 253 253 253 253 253
56626 -253 253 253 250 250 250 170 170 170 26 26 26
56627 - 2 2 6 2 2 6 37 26 9 163 110 8
56628 -219 162 10 239 182 13 246 186 14 246 190 14
56629 -246 190 14 246 190 14 246 190 14 246 190 14
56630 -246 190 14 246 190 14 246 190 14 246 190 14
56631 -246 190 14 246 190 14 246 190 14 246 190 14
56632 -246 186 14 236 178 12 224 166 10 142 122 72
56633 - 46 46 46 18 18 18 6 6 6 0 0 0
56634 - 0 0 0 0 0 0 0 0 0 0 0 0
56635 - 0 0 0 0 0 0 0 0 0 0 0 0
56636 - 0 0 0 0 0 0 6 6 6 18 18 18
56637 - 50 50 50 109 106 95 192 133 9 224 166 10
56638 -242 186 14 246 190 14 246 190 14 246 190 14
56639 -246 190 14 246 190 14 246 190 14 246 190 14
56640 -246 190 14 246 190 14 246 190 14 246 190 14
56641 -246 190 14 246 190 14 246 190 14 246 190 14
56642 -242 186 14 226 184 13 210 162 10 142 110 46
56643 -226 226 226 253 253 253 253 253 253 253 253 253
56644 -253 253 253 253 253 253 253 253 253 253 253 253
56645 -253 253 253 253 253 253 253 253 253 253 253 253
56646 -198 198 198 66 66 66 2 2 6 2 2 6
56647 - 2 2 6 2 2 6 50 34 6 156 107 11
56648 -219 162 10 239 182 13 246 186 14 246 190 14
56649 -246 190 14 246 190 14 246 190 14 246 190 14
56650 -246 190 14 246 190 14 246 190 14 246 190 14
56651 -246 190 14 246 190 14 246 190 14 242 186 14
56652 -234 174 13 213 154 11 154 122 46 66 66 66
56653 - 30 30 30 10 10 10 0 0 0 0 0 0
56654 - 0 0 0 0 0 0 0 0 0 0 0 0
56655 - 0 0 0 0 0 0 0 0 0 0 0 0
56656 - 0 0 0 0 0 0 6 6 6 22 22 22
56657 - 58 58 58 154 121 60 206 145 10 234 174 13
56658 -242 186 14 246 186 14 246 190 14 246 190 14
56659 -246 190 14 246 190 14 246 190 14 246 190 14
56660 -246 190 14 246 190 14 246 190 14 246 190 14
56661 -246 190 14 246 190 14 246 190 14 246 190 14
56662 -246 186 14 236 178 12 210 162 10 163 110 8
56663 - 61 42 6 138 138 138 218 218 218 250 250 250
56664 -253 253 253 253 253 253 253 253 253 250 250 250
56665 -242 242 242 210 210 210 144 144 144 66 66 66
56666 - 6 6 6 2 2 6 2 2 6 2 2 6
56667 - 2 2 6 2 2 6 61 42 6 163 110 8
56668 -216 158 10 236 178 12 246 190 14 246 190 14
56669 -246 190 14 246 190 14 246 190 14 246 190 14
56670 -246 190 14 246 190 14 246 190 14 246 190 14
56671 -246 190 14 239 182 13 230 174 11 216 158 10
56672 -190 142 34 124 112 88 70 70 70 38 38 38
56673 - 18 18 18 6 6 6 0 0 0 0 0 0
56674 - 0 0 0 0 0 0 0 0 0 0 0 0
56675 - 0 0 0 0 0 0 0 0 0 0 0 0
56676 - 0 0 0 0 0 0 6 6 6 22 22 22
56677 - 62 62 62 168 124 44 206 145 10 224 166 10
56678 -236 178 12 239 182 13 242 186 14 242 186 14
56679 -246 186 14 246 190 14 246 190 14 246 190 14
56680 -246 190 14 246 190 14 246 190 14 246 190 14
56681 -246 190 14 246 190 14 246 190 14 246 190 14
56682 -246 190 14 236 178 12 216 158 10 175 118 6
56683 - 80 54 7 2 2 6 6 6 6 30 30 30
56684 - 54 54 54 62 62 62 50 50 50 38 38 38
56685 - 14 14 14 2 2 6 2 2 6 2 2 6
56686 - 2 2 6 2 2 6 2 2 6 2 2 6
56687 - 2 2 6 6 6 6 80 54 7 167 114 7
56688 -213 154 11 236 178 12 246 190 14 246 190 14
56689 -246 190 14 246 190 14 246 190 14 246 190 14
56690 -246 190 14 242 186 14 239 182 13 239 182 13
56691 -230 174 11 210 150 10 174 135 50 124 112 88
56692 - 82 82 82 54 54 54 34 34 34 18 18 18
56693 - 6 6 6 0 0 0 0 0 0 0 0 0
56694 - 0 0 0 0 0 0 0 0 0 0 0 0
56695 - 0 0 0 0 0 0 0 0 0 0 0 0
56696 - 0 0 0 0 0 0 6 6 6 18 18 18
56697 - 50 50 50 158 118 36 192 133 9 200 144 11
56698 -216 158 10 219 162 10 224 166 10 226 170 11
56699 -230 174 11 236 178 12 239 182 13 239 182 13
56700 -242 186 14 246 186 14 246 190 14 246 190 14
56701 -246 190 14 246 190 14 246 190 14 246 190 14
56702 -246 186 14 230 174 11 210 150 10 163 110 8
56703 -104 69 6 10 10 10 2 2 6 2 2 6
56704 - 2 2 6 2 2 6 2 2 6 2 2 6
56705 - 2 2 6 2 2 6 2 2 6 2 2 6
56706 - 2 2 6 2 2 6 2 2 6 2 2 6
56707 - 2 2 6 6 6 6 91 60 6 167 114 7
56708 -206 145 10 230 174 11 242 186 14 246 190 14
56709 -246 190 14 246 190 14 246 186 14 242 186 14
56710 -239 182 13 230 174 11 224 166 10 213 154 11
56711 -180 133 36 124 112 88 86 86 86 58 58 58
56712 - 38 38 38 22 22 22 10 10 10 6 6 6
56713 - 0 0 0 0 0 0 0 0 0 0 0 0
56714 - 0 0 0 0 0 0 0 0 0 0 0 0
56715 - 0 0 0 0 0 0 0 0 0 0 0 0
56716 - 0 0 0 0 0 0 0 0 0 14 14 14
56717 - 34 34 34 70 70 70 138 110 50 158 118 36
56718 -167 114 7 180 123 7 192 133 9 197 138 11
56719 -200 144 11 206 145 10 213 154 11 219 162 10
56720 -224 166 10 230 174 11 239 182 13 242 186 14
56721 -246 186 14 246 186 14 246 186 14 246 186 14
56722 -239 182 13 216 158 10 185 133 11 152 99 6
56723 -104 69 6 18 14 6 2 2 6 2 2 6
56724 - 2 2 6 2 2 6 2 2 6 2 2 6
56725 - 2 2 6 2 2 6 2 2 6 2 2 6
56726 - 2 2 6 2 2 6 2 2 6 2 2 6
56727 - 2 2 6 6 6 6 80 54 7 152 99 6
56728 -192 133 9 219 162 10 236 178 12 239 182 13
56729 -246 186 14 242 186 14 239 182 13 236 178 12
56730 -224 166 10 206 145 10 192 133 9 154 121 60
56731 - 94 94 94 62 62 62 42 42 42 22 22 22
56732 - 14 14 14 6 6 6 0 0 0 0 0 0
56733 - 0 0 0 0 0 0 0 0 0 0 0 0
56734 - 0 0 0 0 0 0 0 0 0 0 0 0
56735 - 0 0 0 0 0 0 0 0 0 0 0 0
56736 - 0 0 0 0 0 0 0 0 0 6 6 6
56737 - 18 18 18 34 34 34 58 58 58 78 78 78
56738 -101 98 89 124 112 88 142 110 46 156 107 11
56739 -163 110 8 167 114 7 175 118 6 180 123 7
56740 -185 133 11 197 138 11 210 150 10 219 162 10
56741 -226 170 11 236 178 12 236 178 12 234 174 13
56742 -219 162 10 197 138 11 163 110 8 130 83 6
56743 - 91 60 6 10 10 10 2 2 6 2 2 6
56744 - 18 18 18 38 38 38 38 38 38 38 38 38
56745 - 38 38 38 38 38 38 38 38 38 38 38 38
56746 - 38 38 38 38 38 38 26 26 26 2 2 6
56747 - 2 2 6 6 6 6 70 47 6 137 92 6
56748 -175 118 6 200 144 11 219 162 10 230 174 11
56749 -234 174 13 230 174 11 219 162 10 210 150 10
56750 -192 133 9 163 110 8 124 112 88 82 82 82
56751 - 50 50 50 30 30 30 14 14 14 6 6 6
56752 - 0 0 0 0 0 0 0 0 0 0 0 0
56753 - 0 0 0 0 0 0 0 0 0 0 0 0
56754 - 0 0 0 0 0 0 0 0 0 0 0 0
56755 - 0 0 0 0 0 0 0 0 0 0 0 0
56756 - 0 0 0 0 0 0 0 0 0 0 0 0
56757 - 6 6 6 14 14 14 22 22 22 34 34 34
56758 - 42 42 42 58 58 58 74 74 74 86 86 86
56759 -101 98 89 122 102 70 130 98 46 121 87 25
56760 -137 92 6 152 99 6 163 110 8 180 123 7
56761 -185 133 11 197 138 11 206 145 10 200 144 11
56762 -180 123 7 156 107 11 130 83 6 104 69 6
56763 - 50 34 6 54 54 54 110 110 110 101 98 89
56764 - 86 86 86 82 82 82 78 78 78 78 78 78
56765 - 78 78 78 78 78 78 78 78 78 78 78 78
56766 - 78 78 78 82 82 82 86 86 86 94 94 94
56767 -106 106 106 101 101 101 86 66 34 124 80 6
56768 -156 107 11 180 123 7 192 133 9 200 144 11
56769 -206 145 10 200 144 11 192 133 9 175 118 6
56770 -139 102 15 109 106 95 70 70 70 42 42 42
56771 - 22 22 22 10 10 10 0 0 0 0 0 0
56772 - 0 0 0 0 0 0 0 0 0 0 0 0
56773 - 0 0 0 0 0 0 0 0 0 0 0 0
56774 - 0 0 0 0 0 0 0 0 0 0 0 0
56775 - 0 0 0 0 0 0 0 0 0 0 0 0
56776 - 0 0 0 0 0 0 0 0 0 0 0 0
56777 - 0 0 0 0 0 0 6 6 6 10 10 10
56778 - 14 14 14 22 22 22 30 30 30 38 38 38
56779 - 50 50 50 62 62 62 74 74 74 90 90 90
56780 -101 98 89 112 100 78 121 87 25 124 80 6
56781 -137 92 6 152 99 6 152 99 6 152 99 6
56782 -138 86 6 124 80 6 98 70 6 86 66 30
56783 -101 98 89 82 82 82 58 58 58 46 46 46
56784 - 38 38 38 34 34 34 34 34 34 34 34 34
56785 - 34 34 34 34 34 34 34 34 34 34 34 34
56786 - 34 34 34 34 34 34 38 38 38 42 42 42
56787 - 54 54 54 82 82 82 94 86 76 91 60 6
56788 -134 86 6 156 107 11 167 114 7 175 118 6
56789 -175 118 6 167 114 7 152 99 6 121 87 25
56790 -101 98 89 62 62 62 34 34 34 18 18 18
56791 - 6 6 6 0 0 0 0 0 0 0 0 0
56792 - 0 0 0 0 0 0 0 0 0 0 0 0
56793 - 0 0 0 0 0 0 0 0 0 0 0 0
56794 - 0 0 0 0 0 0 0 0 0 0 0 0
56795 - 0 0 0 0 0 0 0 0 0 0 0 0
56796 - 0 0 0 0 0 0 0 0 0 0 0 0
56797 - 0 0 0 0 0 0 0 0 0 0 0 0
56798 - 0 0 0 6 6 6 6 6 6 10 10 10
56799 - 18 18 18 22 22 22 30 30 30 42 42 42
56800 - 50 50 50 66 66 66 86 86 86 101 98 89
56801 -106 86 58 98 70 6 104 69 6 104 69 6
56802 -104 69 6 91 60 6 82 62 34 90 90 90
56803 - 62 62 62 38 38 38 22 22 22 14 14 14
56804 - 10 10 10 10 10 10 10 10 10 10 10 10
56805 - 10 10 10 10 10 10 6 6 6 10 10 10
56806 - 10 10 10 10 10 10 10 10 10 14 14 14
56807 - 22 22 22 42 42 42 70 70 70 89 81 66
56808 - 80 54 7 104 69 6 124 80 6 137 92 6
56809 -134 86 6 116 81 8 100 82 52 86 86 86
56810 - 58 58 58 30 30 30 14 14 14 6 6 6
56811 - 0 0 0 0 0 0 0 0 0 0 0 0
56812 - 0 0 0 0 0 0 0 0 0 0 0 0
56813 - 0 0 0 0 0 0 0 0 0 0 0 0
56814 - 0 0 0 0 0 0 0 0 0 0 0 0
56815 - 0 0 0 0 0 0 0 0 0 0 0 0
56816 - 0 0 0 0 0 0 0 0 0 0 0 0
56817 - 0 0 0 0 0 0 0 0 0 0 0 0
56818 - 0 0 0 0 0 0 0 0 0 0 0 0
56819 - 0 0 0 6 6 6 10 10 10 14 14 14
56820 - 18 18 18 26 26 26 38 38 38 54 54 54
56821 - 70 70 70 86 86 86 94 86 76 89 81 66
56822 - 89 81 66 86 86 86 74 74 74 50 50 50
56823 - 30 30 30 14 14 14 6 6 6 0 0 0
56824 - 0 0 0 0 0 0 0 0 0 0 0 0
56825 - 0 0 0 0 0 0 0 0 0 0 0 0
56826 - 0 0 0 0 0 0 0 0 0 0 0 0
56827 - 6 6 6 18 18 18 34 34 34 58 58 58
56828 - 82 82 82 89 81 66 89 81 66 89 81 66
56829 - 94 86 66 94 86 76 74 74 74 50 50 50
56830 - 26 26 26 14 14 14 6 6 6 0 0 0
56831 - 0 0 0 0 0 0 0 0 0 0 0 0
56832 - 0 0 0 0 0 0 0 0 0 0 0 0
56833 - 0 0 0 0 0 0 0 0 0 0 0 0
56834 - 0 0 0 0 0 0 0 0 0 0 0 0
56835 - 0 0 0 0 0 0 0 0 0 0 0 0
56836 - 0 0 0 0 0 0 0 0 0 0 0 0
56837 - 0 0 0 0 0 0 0 0 0 0 0 0
56838 - 0 0 0 0 0 0 0 0 0 0 0 0
56839 - 0 0 0 0 0 0 0 0 0 0 0 0
56840 - 6 6 6 6 6 6 14 14 14 18 18 18
56841 - 30 30 30 38 38 38 46 46 46 54 54 54
56842 - 50 50 50 42 42 42 30 30 30 18 18 18
56843 - 10 10 10 0 0 0 0 0 0 0 0 0
56844 - 0 0 0 0 0 0 0 0 0 0 0 0
56845 - 0 0 0 0 0 0 0 0 0 0 0 0
56846 - 0 0 0 0 0 0 0 0 0 0 0 0
56847 - 0 0 0 6 6 6 14 14 14 26 26 26
56848 - 38 38 38 50 50 50 58 58 58 58 58 58
56849 - 54 54 54 42 42 42 30 30 30 18 18 18
56850 - 10 10 10 0 0 0 0 0 0 0 0 0
56851 - 0 0 0 0 0 0 0 0 0 0 0 0
56852 - 0 0 0 0 0 0 0 0 0 0 0 0
56853 - 0 0 0 0 0 0 0 0 0 0 0 0
56854 - 0 0 0 0 0 0 0 0 0 0 0 0
56855 - 0 0 0 0 0 0 0 0 0 0 0 0
56856 - 0 0 0 0 0 0 0 0 0 0 0 0
56857 - 0 0 0 0 0 0 0 0 0 0 0 0
56858 - 0 0 0 0 0 0 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 6 6 6
56861 - 6 6 6 10 10 10 14 14 14 18 18 18
56862 - 18 18 18 14 14 14 10 10 10 6 6 6
56863 - 0 0 0 0 0 0 0 0 0 0 0 0
56864 - 0 0 0 0 0 0 0 0 0 0 0 0
56865 - 0 0 0 0 0 0 0 0 0 0 0 0
56866 - 0 0 0 0 0 0 0 0 0 0 0 0
56867 - 0 0 0 0 0 0 0 0 0 6 6 6
56868 - 14 14 14 18 18 18 22 22 22 22 22 22
56869 - 18 18 18 14 14 14 10 10 10 6 6 6
56870 - 0 0 0 0 0 0 0 0 0 0 0 0
56871 - 0 0 0 0 0 0 0 0 0 0 0 0
56872 - 0 0 0 0 0 0 0 0 0 0 0 0
56873 - 0 0 0 0 0 0 0 0 0 0 0 0
56874 - 0 0 0 0 0 0 0 0 0 0 0 0
56875 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56876 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56877 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56878 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56879 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56880 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56881 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56882 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56883 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56884 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56885 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56886 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56887 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56888 +4 4 4 4 4 4
56889 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56890 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56891 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56892 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56893 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56894 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56895 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56896 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56897 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56898 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56899 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56900 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56901 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56902 +4 4 4 4 4 4
56903 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56904 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56905 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56906 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56907 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56908 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56909 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56910 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56911 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56912 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56913 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56914 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56915 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56916 +4 4 4 4 4 4
56917 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56918 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56919 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56920 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56921 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56922 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56923 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56924 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56925 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56926 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56927 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56928 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56929 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56930 +4 4 4 4 4 4
56931 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56932 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56933 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56934 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56935 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56936 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56937 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56938 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56939 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56940 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56941 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56942 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56943 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56944 +4 4 4 4 4 4
56945 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56946 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56947 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56948 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56949 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56950 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56951 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56952 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56953 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56954 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56955 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56956 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56957 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56958 +4 4 4 4 4 4
56959 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56960 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56961 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56962 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56963 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
56964 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
56965 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56966 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56967 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56968 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
56969 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
56970 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
56971 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56972 +4 4 4 4 4 4
56973 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56974 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56975 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56976 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56977 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
56978 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
56979 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56980 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56981 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56982 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
56983 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
56984 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
56985 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56986 +4 4 4 4 4 4
56987 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56988 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56989 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56990 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56991 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
56992 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
56993 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
56994 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56995 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56996 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
56997 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
56998 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
56999 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
57000 +4 4 4 4 4 4
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 5 5 5 5 5 5 2 2 2 0 0 0
57005 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
57006 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
57007 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 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 5 5 5 5 5 5
57010 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
57011 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
57012 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
57013 +37 51 59 2 0 0 1 1 1 4 5 5 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 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
57019 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
57020 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
57021 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
57022 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57023 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
57024 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
57025 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
57026 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
57027 +64 123 161 14 17 19 0 0 0 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 5 5 5
57032 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
57033 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
57034 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
57035 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
57036 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57037 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
57038 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
57039 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
57040 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
57041 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 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 5 5 5 3 3 3
57046 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57047 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57048 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57049 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57050 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57051 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57052 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57053 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57054 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57055 +31 91 132 3 6 7 0 0 0 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 2 2 2 0 0 0 4 0 0
57060 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57061 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57062 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57063 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57064 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57065 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57066 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57067 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57068 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57069 +7 12 15 0 0 0 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 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57074 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57075 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57076 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57077 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57078 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57079 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57080 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57081 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57082 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57083 +1 1 2 4 3 3 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 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57088 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57089 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57090 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57091 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57092 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57093 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57094 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57095 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57096 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57097 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 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 3 3 3 0 0 0
57101 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57102 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57103 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57104 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57105 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57106 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57107 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57108 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57109 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57110 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57111 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
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 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57115 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57116 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57117 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57118 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57119 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57120 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57121 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57122 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57123 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57124 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57125 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57126 +0 0 0 4 4 4
57127 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57128 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57129 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57130 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57131 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57132 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57133 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57134 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57135 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57136 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57137 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57138 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57139 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57140 +2 0 0 0 0 0
57141 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57142 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57143 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57144 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57145 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57146 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57147 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57148 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57149 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57150 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57151 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57152 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57153 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57154 +37 38 37 0 0 0
57155 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57156 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57157 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57158 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57159 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57160 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57161 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57162 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57163 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57164 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57165 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57166 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57167 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57168 +85 115 134 4 0 0
57169 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57170 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57171 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57172 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57173 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57174 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57175 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57176 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57177 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57178 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57179 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57180 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57181 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57182 +60 73 81 4 0 0
57183 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57184 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57185 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57186 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57187 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57188 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57189 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57190 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57191 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57192 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57193 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57194 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57195 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57196 +16 19 21 4 0 0
57197 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57198 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57199 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57200 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57201 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57202 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57203 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57204 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57205 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57206 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57207 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57208 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57209 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57210 +4 0 0 4 3 3
57211 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57212 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57213 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57214 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57215 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57216 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57217 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57218 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57219 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57220 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57221 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57222 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57223 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57224 +3 2 2 4 4 4
57225 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57226 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57227 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57228 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57229 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57230 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57231 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57232 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57233 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57234 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57235 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57236 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57237 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57238 +4 4 4 4 4 4
57239 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57240 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57241 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57242 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57243 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57244 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57245 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57246 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57247 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57248 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57249 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57250 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57251 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57252 +4 4 4 4 4 4
57253 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57254 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57255 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57256 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57257 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57258 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57259 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57260 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57261 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57262 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57263 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57264 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57265 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57266 +5 5 5 5 5 5
57267 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57268 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57269 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57270 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57271 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57272 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57273 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57274 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57275 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57276 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57277 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57278 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57279 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57280 +5 5 5 4 4 4
57281 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57282 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57283 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57284 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57285 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57286 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57287 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57288 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57289 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57290 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57291 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57292 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57293 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57294 +4 4 4 4 4 4
57295 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57296 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57297 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57298 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57299 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57300 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57301 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57302 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57303 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57304 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57305 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57306 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
57307 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57308 +4 4 4 4 4 4
57309 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57310 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57311 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57312 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57313 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57314 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57315 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57316 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57317 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57318 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57319 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
57320 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57321 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57322 +4 4 4 4 4 4
57323 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57324 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57325 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57326 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57327 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57328 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57329 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57330 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57331 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57332 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57333 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
57334 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57335 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57336 +4 4 4 4 4 4
57337 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
57338 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57339 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57340 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57341 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57342 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57343 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57344 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57345 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57346 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57347 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57348 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57349 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57350 +4 4 4 4 4 4
57351 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57352 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57353 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57354 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57355 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57356 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57357 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57358 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57359 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57360 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57361 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
57362 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57363 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57364 +4 4 4 4 4 4
57365 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57366 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57367 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57368 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57369 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57370 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57371 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57372 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57373 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57374 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57375 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
57376 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57377 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57378 +4 4 4 4 4 4
57379 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57380 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57381 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57382 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57383 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57384 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57385 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57386 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57387 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57388 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57389 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57390 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57391 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57392 +4 4 4 4 4 4
57393 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57394 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57395 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57396 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57397 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57398 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57399 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57400 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57401 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57402 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57403 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57404 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57405 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57406 +4 4 4 4 4 4
57407 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57408 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57409 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57410 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57411 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57412 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57413 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57414 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57415 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57416 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57417 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57418 +4 4 4 4 4 4 4 4 4 4 4 4 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 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
57422 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57423 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57424 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57425 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57426 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57427 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57428 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57429 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57430 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57431 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57432 +4 4 4 4 4 4 4 4 4 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 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57436 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57437 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57438 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57439 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57440 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57441 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57442 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57443 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57444 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57445 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 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 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57450 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57451 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57452 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57453 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57454 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57455 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57456 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57457 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57458 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57459 +0 0 0 3 3 3 5 5 5 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 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
57464 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
57465 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57466 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
57467 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
57468 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
57469 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
57470 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
57471 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57472 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57473 +0 0 0 3 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 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
57478 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
57479 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57480 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
57481 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
57482 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
57483 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
57484 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
57485 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57486 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57487 +0 0 0 3 3 3 5 5 5 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 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57492 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
57493 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57494 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
57495 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
57496 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
57497 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
57498 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
57499 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57500 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57501 +0 0 0 3 3 3 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 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
57506 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
57507 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57508 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
57509 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
57510 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
57511 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
57512 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
57513 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
57514 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57515 +0 0 0 3 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 193 200 203 193 200 203 174 174 174
57520 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
57521 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
57522 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
57523 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
57524 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
57525 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
57526 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
57527 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57528 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57529 +0 0 0 3 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 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57534 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
57535 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57536 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
57537 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
57538 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
57539 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
57540 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
57541 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57542 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57543 +0 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 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57548 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
57549 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
57550 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
57551 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
57552 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
57553 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57554 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
57555 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
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 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57562 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
57563 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
57564 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57565 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
57566 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
57567 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57568 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
57569 +4 4 4 5 5 5 3 3 3 2 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 220 221 221 190 197 201 174 174 174
57576 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
57577 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
57578 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
57579 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
57580 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
57581 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
57582 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
57583 +4 4 4 5 5 5 4 4 4 0 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 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57590 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
57591 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
57592 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
57593 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
57594 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
57595 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
57596 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
57597 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
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 220 221 221 193 200 203 174 174 174
57604 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
57605 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
57606 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
57607 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57608 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
57609 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
57610 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
57611 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
57612 +131 129 131 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 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57618 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
57619 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
57620 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
57621 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
57622 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
57623 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
57624 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
57625 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
57626 +125 124 125 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 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
57632 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
57633 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
57634 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
57635 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
57636 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
57637 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
57638 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
57639 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
57640 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
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 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
57646 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57647 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
57648 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
57649 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
57650 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
57651 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
57652 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
57653 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
57654 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
57655 +0 0 0 4 4 4 4 4 4 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 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
57660 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57661 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
57662 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
57663 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
57664 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
57665 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57666 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
57667 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
57668 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
57669 +4 3 3 5 5 5 4 4 4 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 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
57674 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
57675 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
57676 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
57677 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
57678 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
57679 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
57680 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
57681 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
57682 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
57683 +5 5 5 4 4 4 4 4 4 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 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
57688 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
57689 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57690 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
57691 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
57692 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
57693 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
57694 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
57695 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
57696 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
57697 +4 4 4 4 4 4 4 4 4 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 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57702 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
57703 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
57704 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
57705 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
57706 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
57707 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
57708 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
57709 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
57710 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57711 +4 4 4 4 4 4 4 4 4 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 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
57716 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
57717 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
57718 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
57719 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
57720 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
57721 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
57722 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
57723 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
57724 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57725 +4 4 4 4 4 4 4 4 4 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 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
57730 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
57731 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
57732 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
57733 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
57734 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
57735 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
57736 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
57737 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57738 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57739 +4 4 4 4 4 4 4 4 4 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 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
57744 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57745 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
57746 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57747 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
57748 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
57749 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
57750 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
57751 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
57752 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57753 +4 4 4 4 4 4 4 4 4 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 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
57758 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
57759 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
57760 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
57761 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
57762 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
57763 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
57764 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
57765 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
57766 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57767 +4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57772 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
57773 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
57774 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
57775 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
57776 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
57777 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
57778 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
57779 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57780 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57781 +4 4 4 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 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
57786 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
57787 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57788 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
57789 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
57790 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
57791 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
57792 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
57793 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57794 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57795 +4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57800 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
57801 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
57802 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
57803 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
57804 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
57805 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
57806 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57807 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57808 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57809 +4 4 4 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 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57814 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
57815 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57816 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
57817 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
57818 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
57819 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
57820 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
57821 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57822 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57828 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
57829 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
57830 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
57831 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
57832 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
57833 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
57834 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
57835 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57836 +4 4 4 4 4 4 4 4 4 4 4 4 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 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57842 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57843 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
57844 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57845 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
57846 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
57847 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
57848 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57849 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57850 +4 4 4 4 4 4 4 4 4 4 4 4 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 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57856 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57857 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57858 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
57859 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
57860 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
57861 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
57862 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57863 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57864 +4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57870 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57871 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57872 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57873 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
57874 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
57875 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
57876 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57877 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57884 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57885 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57886 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57887 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57888 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
57889 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
57890 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57891 +4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57898 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57899 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57900 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57901 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57902 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57903 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
57904 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57905 +4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57912 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57913 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57914 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
57915 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
57916 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
57917 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
57918 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4
57926 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57927 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57928 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57929 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
57930 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57931 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57932 +4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4
57940 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57941 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57942 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57943 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
57944 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
57945 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57946 +4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57955 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57956 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57957 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
57958 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
57959 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57960 +4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
57969 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57970 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57971 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
57972 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
57973 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57974 +4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57984 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57985 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57986 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
57987 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57988 +4 4 4 4 4 4 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 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
57996 index fef20db..d28b1ab 100644
57997 --- a/drivers/xen/xenfs/xenstored.c
57998 +++ b/drivers/xen/xenfs/xenstored.c
57999 @@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
58000 static int xsd_kva_open(struct inode *inode, struct file *file)
58001 {
58002 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
58003 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58004 + NULL);
58005 +#else
58006 xen_store_interface);
58007 +#endif
58008 +
58009 if (!file->private_data)
58010 return -ENOMEM;
58011 return 0;
58012 diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
58013 index eb14e05..5156de7 100644
58014 --- a/fs/9p/vfs_addr.c
58015 +++ b/fs/9p/vfs_addr.c
58016 @@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
58017
58018 retval = v9fs_file_write_internal(inode,
58019 v9inode->writeback_fid,
58020 - (__force const char __user *)buffer,
58021 + (const char __force_user *)buffer,
58022 len, &offset, 0);
58023 if (retval > 0)
58024 retval = 0;
58025 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
58026 index 296482f..183ddc3 100644
58027 --- a/fs/9p/vfs_inode.c
58028 +++ b/fs/9p/vfs_inode.c
58029 @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58030 void
58031 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58032 {
58033 - char *s = nd_get_link(nd);
58034 + const char *s = nd_get_link(nd);
58035
58036 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
58037 dentry, IS_ERR(s) ? "<error>" : s);
58038 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
58039 index 370b24c..ff0be7b 100644
58040 --- a/fs/Kconfig.binfmt
58041 +++ b/fs/Kconfig.binfmt
58042 @@ -103,7 +103,7 @@ config HAVE_AOUT
58043
58044 config BINFMT_AOUT
58045 tristate "Kernel support for a.out and ECOFF binaries"
58046 - depends on HAVE_AOUT
58047 + depends on HAVE_AOUT && BROKEN
58048 ---help---
58049 A.out (Assembler.OUTput) is a set of formats for libraries and
58050 executables used in the earliest versions of UNIX. Linux used
58051 diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58052 index 2946712..f737435 100644
58053 --- a/fs/afs/inode.c
58054 +++ b/fs/afs/inode.c
58055 @@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58056 struct afs_vnode *vnode;
58057 struct super_block *sb;
58058 struct inode *inode;
58059 - static atomic_t afs_autocell_ino;
58060 + static atomic_unchecked_t afs_autocell_ino;
58061
58062 _enter("{%x:%u},%*.*s,",
58063 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
58064 @@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58065 data.fid.unique = 0;
58066 data.fid.vnode = 0;
58067
58068 - inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
58069 + inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58070 afs_iget5_autocell_test, afs_iget5_set,
58071 &data);
58072 if (!inode) {
58073 diff --git a/fs/aio.c b/fs/aio.c
58074 index 14b9315..365980f 100644
58075 --- a/fs/aio.c
58076 +++ b/fs/aio.c
58077 @@ -388,7 +388,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58078 size += sizeof(struct io_event) * nr_events;
58079
58080 nr_pages = PFN_UP(size);
58081 - if (nr_pages < 0)
58082 + if (nr_pages <= 0)
58083 return -EINVAL;
58084
58085 file = aio_private_file(ctx, nr_pages);
58086 diff --git a/fs/attr.c b/fs/attr.c
58087 index 6530ced..4a827e2 100644
58088 --- a/fs/attr.c
58089 +++ b/fs/attr.c
58090 @@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58091 unsigned long limit;
58092
58093 limit = rlimit(RLIMIT_FSIZE);
58094 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58095 if (limit != RLIM_INFINITY && offset > limit)
58096 goto out_sig;
58097 if (offset > inode->i_sb->s_maxbytes)
58098 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58099 index 116fd38..c04182da 100644
58100 --- a/fs/autofs4/waitq.c
58101 +++ b/fs/autofs4/waitq.c
58102 @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58103 {
58104 unsigned long sigpipe, flags;
58105 mm_segment_t fs;
58106 - const char *data = (const char *)addr;
58107 + const char __user *data = (const char __force_user *)addr;
58108 ssize_t wr = 0;
58109
58110 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58111 @@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58112 return 1;
58113 }
58114
58115 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58116 +static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58117 +#endif
58118 +
58119 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58120 enum autofs_notify notify)
58121 {
58122 @@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58123
58124 /* If this is a direct mount request create a dummy name */
58125 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58126 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58127 + /* this name does get written to userland via autofs4_write() */
58128 + qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58129 +#else
58130 qstr.len = sprintf(name, "%p", dentry);
58131 +#endif
58132 else {
58133 qstr.len = autofs4_getpath(sbi, dentry, &name);
58134 if (!qstr.len) {
58135 diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58136 index 2722387..56059b5 100644
58137 --- a/fs/befs/endian.h
58138 +++ b/fs/befs/endian.h
58139 @@ -11,7 +11,7 @@
58140
58141 #include <asm/byteorder.h>
58142
58143 -static inline u64
58144 +static inline u64 __intentional_overflow(-1)
58145 fs64_to_cpu(const struct super_block *sb, fs64 n)
58146 {
58147 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58148 @@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58149 return (__force fs64)cpu_to_be64(n);
58150 }
58151
58152 -static inline u32
58153 +static inline u32 __intentional_overflow(-1)
58154 fs32_to_cpu(const struct super_block *sb, fs32 n)
58155 {
58156 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58157 @@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58158 return (__force fs32)cpu_to_be32(n);
58159 }
58160
58161 -static inline u16
58162 +static inline u16 __intentional_overflow(-1)
58163 fs16_to_cpu(const struct super_block *sb, fs16 n)
58164 {
58165 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58166 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58167 index 929dec0..84bd914 100644
58168 --- a/fs/binfmt_aout.c
58169 +++ b/fs/binfmt_aout.c
58170 @@ -16,6 +16,7 @@
58171 #include <linux/string.h>
58172 #include <linux/fs.h>
58173 #include <linux/file.h>
58174 +#include <linux/security.h>
58175 #include <linux/stat.h>
58176 #include <linux/fcntl.h>
58177 #include <linux/ptrace.h>
58178 @@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58179 #endif
58180 # define START_STACK(u) ((void __user *)u.start_stack)
58181
58182 + memset(&dump, 0, sizeof(dump));
58183 +
58184 fs = get_fs();
58185 set_fs(KERNEL_DS);
58186 has_dumped = 1;
58187 @@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58188
58189 /* If the size of the dump file exceeds the rlimit, then see what would happen
58190 if we wrote the stack, but not the data area. */
58191 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58192 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58193 dump.u_dsize = 0;
58194
58195 /* Make sure we have enough room to write the stack and data areas. */
58196 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58197 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58198 dump.u_ssize = 0;
58199
58200 @@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58201 rlim = rlimit(RLIMIT_DATA);
58202 if (rlim >= RLIM_INFINITY)
58203 rlim = ~0;
58204 +
58205 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58206 if (ex.a_data + ex.a_bss > rlim)
58207 return -ENOMEM;
58208
58209 @@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58210
58211 install_exec_creds(bprm);
58212
58213 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58214 + current->mm->pax_flags = 0UL;
58215 +#endif
58216 +
58217 +#ifdef CONFIG_PAX_PAGEEXEC
58218 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58219 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58220 +
58221 +#ifdef CONFIG_PAX_EMUTRAMP
58222 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58223 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58224 +#endif
58225 +
58226 +#ifdef CONFIG_PAX_MPROTECT
58227 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58228 + current->mm->pax_flags |= MF_PAX_MPROTECT;
58229 +#endif
58230 +
58231 + }
58232 +#endif
58233 +
58234 if (N_MAGIC(ex) == OMAGIC) {
58235 unsigned long text_addr, map_size;
58236 loff_t pos;
58237 @@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58238 return error;
58239
58240 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58241 - PROT_READ | PROT_WRITE | PROT_EXEC,
58242 + PROT_READ | PROT_WRITE,
58243 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58244 fd_offset + ex.a_text);
58245 if (error != N_DATADDR(ex))
58246 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58247 index d8fc060..cbd44d5 100644
58248 --- a/fs/binfmt_elf.c
58249 +++ b/fs/binfmt_elf.c
58250 @@ -34,6 +34,7 @@
58251 #include <linux/utsname.h>
58252 #include <linux/coredump.h>
58253 #include <linux/sched.h>
58254 +#include <linux/xattr.h>
58255 #include <asm/uaccess.h>
58256 #include <asm/param.h>
58257 #include <asm/page.h>
58258 @@ -47,7 +48,7 @@
58259
58260 static int load_elf_binary(struct linux_binprm *bprm);
58261 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58262 - int, int, unsigned long);
58263 + int, int, unsigned long) __intentional_overflow(-1);
58264
58265 #ifdef CONFIG_USELIB
58266 static int load_elf_library(struct file *);
58267 @@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58268 #define elf_core_dump NULL
58269 #endif
58270
58271 +#ifdef CONFIG_PAX_MPROTECT
58272 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58273 +#endif
58274 +
58275 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58276 +static void elf_handle_mmap(struct file *file);
58277 +#endif
58278 +
58279 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58280 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58281 #else
58282 @@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58283 .load_binary = load_elf_binary,
58284 .load_shlib = load_elf_library,
58285 .core_dump = elf_core_dump,
58286 +
58287 +#ifdef CONFIG_PAX_MPROTECT
58288 + .handle_mprotect= elf_handle_mprotect,
58289 +#endif
58290 +
58291 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58292 + .handle_mmap = elf_handle_mmap,
58293 +#endif
58294 +
58295 .min_coredump = ELF_EXEC_PAGESIZE,
58296 };
58297
58298 @@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58299
58300 static int set_brk(unsigned long start, unsigned long end)
58301 {
58302 + unsigned long e = end;
58303 +
58304 start = ELF_PAGEALIGN(start);
58305 end = ELF_PAGEALIGN(end);
58306 if (end > start) {
58307 @@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58308 if (BAD_ADDR(addr))
58309 return addr;
58310 }
58311 - current->mm->start_brk = current->mm->brk = end;
58312 + current->mm->start_brk = current->mm->brk = e;
58313 return 0;
58314 }
58315
58316 @@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58317 elf_addr_t __user *u_rand_bytes;
58318 const char *k_platform = ELF_PLATFORM;
58319 const char *k_base_platform = ELF_BASE_PLATFORM;
58320 - unsigned char k_rand_bytes[16];
58321 + u32 k_rand_bytes[4];
58322 int items;
58323 elf_addr_t *elf_info;
58324 int ei_index = 0;
58325 const struct cred *cred = current_cred();
58326 struct vm_area_struct *vma;
58327 + unsigned long saved_auxv[AT_VECTOR_SIZE];
58328
58329 /*
58330 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58331 @@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58332 * Generate 16 random bytes for userspace PRNG seeding.
58333 */
58334 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58335 - u_rand_bytes = (elf_addr_t __user *)
58336 - STACK_ALLOC(p, sizeof(k_rand_bytes));
58337 + prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58338 + prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58339 + prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58340 + prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58341 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
58342 + u_rand_bytes = (elf_addr_t __user *) p;
58343 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58344 return -EFAULT;
58345
58346 @@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58347 return -EFAULT;
58348 current->mm->env_end = p;
58349
58350 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58351 +
58352 /* Put the elf_info on the stack in the right place. */
58353 sp = (elf_addr_t __user *)envp + 1;
58354 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58355 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58356 return -EFAULT;
58357 return 0;
58358 }
58359 @@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
58360 an ELF header */
58361
58362 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58363 - struct file *interpreter, unsigned long *interp_map_addr,
58364 - unsigned long no_base)
58365 + struct file *interpreter, unsigned long no_base)
58366 {
58367 struct elf_phdr *elf_phdata;
58368 struct elf_phdr *eppnt;
58369 - unsigned long load_addr = 0;
58370 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58371 int load_addr_set = 0;
58372 unsigned long last_bss = 0, elf_bss = 0;
58373 - unsigned long error = ~0UL;
58374 + unsigned long error = -EINVAL;
58375 unsigned long total_size;
58376 int retval, i, size;
58377
58378 @@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58379 goto out_close;
58380 }
58381
58382 +#ifdef CONFIG_PAX_SEGMEXEC
58383 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58384 + pax_task_size = SEGMEXEC_TASK_SIZE;
58385 +#endif
58386 +
58387 eppnt = elf_phdata;
58388 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58389 if (eppnt->p_type == PT_LOAD) {
58390 @@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58391 map_addr = elf_map(interpreter, load_addr + vaddr,
58392 eppnt, elf_prot, elf_type, total_size);
58393 total_size = 0;
58394 - if (!*interp_map_addr)
58395 - *interp_map_addr = map_addr;
58396 error = map_addr;
58397 if (BAD_ADDR(map_addr))
58398 goto out_close;
58399 @@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58400 k = load_addr + eppnt->p_vaddr;
58401 if (BAD_ADDR(k) ||
58402 eppnt->p_filesz > eppnt->p_memsz ||
58403 - eppnt->p_memsz > TASK_SIZE ||
58404 - TASK_SIZE - eppnt->p_memsz < k) {
58405 + eppnt->p_memsz > pax_task_size ||
58406 + pax_task_size - eppnt->p_memsz < k) {
58407 error = -ENOMEM;
58408 goto out_close;
58409 }
58410 @@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58411 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58412
58413 /* Map the last of the bss segment */
58414 - error = vm_brk(elf_bss, last_bss - elf_bss);
58415 - if (BAD_ADDR(error))
58416 - goto out_close;
58417 + if (last_bss > elf_bss) {
58418 + error = vm_brk(elf_bss, last_bss - elf_bss);
58419 + if (BAD_ADDR(error))
58420 + goto out_close;
58421 + }
58422 }
58423
58424 error = load_addr;
58425 @@ -543,6 +574,336 @@ out:
58426 return error;
58427 }
58428
58429 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
58430 +#ifdef CONFIG_PAX_SOFTMODE
58431 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58432 +{
58433 + unsigned long pax_flags = 0UL;
58434 +
58435 +#ifdef CONFIG_PAX_PAGEEXEC
58436 + if (elf_phdata->p_flags & PF_PAGEEXEC)
58437 + pax_flags |= MF_PAX_PAGEEXEC;
58438 +#endif
58439 +
58440 +#ifdef CONFIG_PAX_SEGMEXEC
58441 + if (elf_phdata->p_flags & PF_SEGMEXEC)
58442 + pax_flags |= MF_PAX_SEGMEXEC;
58443 +#endif
58444 +
58445 +#ifdef CONFIG_PAX_EMUTRAMP
58446 + if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58447 + pax_flags |= MF_PAX_EMUTRAMP;
58448 +#endif
58449 +
58450 +#ifdef CONFIG_PAX_MPROTECT
58451 + if (elf_phdata->p_flags & PF_MPROTECT)
58452 + pax_flags |= MF_PAX_MPROTECT;
58453 +#endif
58454 +
58455 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58456 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
58457 + pax_flags |= MF_PAX_RANDMMAP;
58458 +#endif
58459 +
58460 + return pax_flags;
58461 +}
58462 +#endif
58463 +
58464 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
58465 +{
58466 + unsigned long pax_flags = 0UL;
58467 +
58468 +#ifdef CONFIG_PAX_PAGEEXEC
58469 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
58470 + pax_flags |= MF_PAX_PAGEEXEC;
58471 +#endif
58472 +
58473 +#ifdef CONFIG_PAX_SEGMEXEC
58474 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
58475 + pax_flags |= MF_PAX_SEGMEXEC;
58476 +#endif
58477 +
58478 +#ifdef CONFIG_PAX_EMUTRAMP
58479 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
58480 + pax_flags |= MF_PAX_EMUTRAMP;
58481 +#endif
58482 +
58483 +#ifdef CONFIG_PAX_MPROTECT
58484 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
58485 + pax_flags |= MF_PAX_MPROTECT;
58486 +#endif
58487 +
58488 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58489 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
58490 + pax_flags |= MF_PAX_RANDMMAP;
58491 +#endif
58492 +
58493 + return pax_flags;
58494 +}
58495 +#endif
58496 +
58497 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58498 +#ifdef CONFIG_PAX_SOFTMODE
58499 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
58500 +{
58501 + unsigned long pax_flags = 0UL;
58502 +
58503 +#ifdef CONFIG_PAX_PAGEEXEC
58504 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
58505 + pax_flags |= MF_PAX_PAGEEXEC;
58506 +#endif
58507 +
58508 +#ifdef CONFIG_PAX_SEGMEXEC
58509 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
58510 + pax_flags |= MF_PAX_SEGMEXEC;
58511 +#endif
58512 +
58513 +#ifdef CONFIG_PAX_EMUTRAMP
58514 + if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58515 + pax_flags |= MF_PAX_EMUTRAMP;
58516 +#endif
58517 +
58518 +#ifdef CONFIG_PAX_MPROTECT
58519 + if (pax_flags_softmode & MF_PAX_MPROTECT)
58520 + pax_flags |= MF_PAX_MPROTECT;
58521 +#endif
58522 +
58523 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58524 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
58525 + pax_flags |= MF_PAX_RANDMMAP;
58526 +#endif
58527 +
58528 + return pax_flags;
58529 +}
58530 +#endif
58531 +
58532 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
58533 +{
58534 + unsigned long pax_flags = 0UL;
58535 +
58536 +#ifdef CONFIG_PAX_PAGEEXEC
58537 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
58538 + pax_flags |= MF_PAX_PAGEEXEC;
58539 +#endif
58540 +
58541 +#ifdef CONFIG_PAX_SEGMEXEC
58542 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
58543 + pax_flags |= MF_PAX_SEGMEXEC;
58544 +#endif
58545 +
58546 +#ifdef CONFIG_PAX_EMUTRAMP
58547 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
58548 + pax_flags |= MF_PAX_EMUTRAMP;
58549 +#endif
58550 +
58551 +#ifdef CONFIG_PAX_MPROTECT
58552 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
58553 + pax_flags |= MF_PAX_MPROTECT;
58554 +#endif
58555 +
58556 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58557 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
58558 + pax_flags |= MF_PAX_RANDMMAP;
58559 +#endif
58560 +
58561 + return pax_flags;
58562 +}
58563 +#endif
58564 +
58565 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58566 +static unsigned long pax_parse_defaults(void)
58567 +{
58568 + unsigned long pax_flags = 0UL;
58569 +
58570 +#ifdef CONFIG_PAX_SOFTMODE
58571 + if (pax_softmode)
58572 + return pax_flags;
58573 +#endif
58574 +
58575 +#ifdef CONFIG_PAX_PAGEEXEC
58576 + pax_flags |= MF_PAX_PAGEEXEC;
58577 +#endif
58578 +
58579 +#ifdef CONFIG_PAX_SEGMEXEC
58580 + pax_flags |= MF_PAX_SEGMEXEC;
58581 +#endif
58582 +
58583 +#ifdef CONFIG_PAX_MPROTECT
58584 + pax_flags |= MF_PAX_MPROTECT;
58585 +#endif
58586 +
58587 +#ifdef CONFIG_PAX_RANDMMAP
58588 + if (randomize_va_space)
58589 + pax_flags |= MF_PAX_RANDMMAP;
58590 +#endif
58591 +
58592 + return pax_flags;
58593 +}
58594 +
58595 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
58596 +{
58597 + unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
58598 +
58599 +#ifdef CONFIG_PAX_EI_PAX
58600 +
58601 +#ifdef CONFIG_PAX_SOFTMODE
58602 + if (pax_softmode)
58603 + return pax_flags;
58604 +#endif
58605 +
58606 + pax_flags = 0UL;
58607 +
58608 +#ifdef CONFIG_PAX_PAGEEXEC
58609 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
58610 + pax_flags |= MF_PAX_PAGEEXEC;
58611 +#endif
58612 +
58613 +#ifdef CONFIG_PAX_SEGMEXEC
58614 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
58615 + pax_flags |= MF_PAX_SEGMEXEC;
58616 +#endif
58617 +
58618 +#ifdef CONFIG_PAX_EMUTRAMP
58619 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
58620 + pax_flags |= MF_PAX_EMUTRAMP;
58621 +#endif
58622 +
58623 +#ifdef CONFIG_PAX_MPROTECT
58624 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
58625 + pax_flags |= MF_PAX_MPROTECT;
58626 +#endif
58627 +
58628 +#ifdef CONFIG_PAX_ASLR
58629 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
58630 + pax_flags |= MF_PAX_RANDMMAP;
58631 +#endif
58632 +
58633 +#endif
58634 +
58635 + return pax_flags;
58636 +
58637 +}
58638 +
58639 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
58640 +{
58641 +
58642 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
58643 + unsigned long i;
58644 +
58645 + for (i = 0UL; i < elf_ex->e_phnum; i++)
58646 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
58647 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
58648 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
58649 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
58650 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
58651 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
58652 + return PAX_PARSE_FLAGS_FALLBACK;
58653 +
58654 +#ifdef CONFIG_PAX_SOFTMODE
58655 + if (pax_softmode)
58656 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
58657 + else
58658 +#endif
58659 +
58660 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
58661 + break;
58662 + }
58663 +#endif
58664 +
58665 + return PAX_PARSE_FLAGS_FALLBACK;
58666 +}
58667 +
58668 +static unsigned long pax_parse_xattr_pax(struct file * const file)
58669 +{
58670 +
58671 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58672 + ssize_t xattr_size, i;
58673 + unsigned char xattr_value[sizeof("pemrs") - 1];
58674 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
58675 +
58676 + xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
58677 + if (xattr_size < 0 || xattr_size > sizeof xattr_value)
58678 + return PAX_PARSE_FLAGS_FALLBACK;
58679 +
58680 + for (i = 0; i < xattr_size; i++)
58681 + switch (xattr_value[i]) {
58682 + default:
58683 + return PAX_PARSE_FLAGS_FALLBACK;
58684 +
58685 +#define parse_flag(option1, option2, flag) \
58686 + case option1: \
58687 + if (pax_flags_hardmode & MF_PAX_##flag) \
58688 + return PAX_PARSE_FLAGS_FALLBACK;\
58689 + pax_flags_hardmode |= MF_PAX_##flag; \
58690 + break; \
58691 + case option2: \
58692 + if (pax_flags_softmode & MF_PAX_##flag) \
58693 + return PAX_PARSE_FLAGS_FALLBACK;\
58694 + pax_flags_softmode |= MF_PAX_##flag; \
58695 + break;
58696 +
58697 + parse_flag('p', 'P', PAGEEXEC);
58698 + parse_flag('e', 'E', EMUTRAMP);
58699 + parse_flag('m', 'M', MPROTECT);
58700 + parse_flag('r', 'R', RANDMMAP);
58701 + parse_flag('s', 'S', SEGMEXEC);
58702 +
58703 +#undef parse_flag
58704 + }
58705 +
58706 + if (pax_flags_hardmode & pax_flags_softmode)
58707 + return PAX_PARSE_FLAGS_FALLBACK;
58708 +
58709 +#ifdef CONFIG_PAX_SOFTMODE
58710 + if (pax_softmode)
58711 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
58712 + else
58713 +#endif
58714 +
58715 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
58716 +#else
58717 + return PAX_PARSE_FLAGS_FALLBACK;
58718 +#endif
58719 +
58720 +}
58721 +
58722 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
58723 +{
58724 + unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
58725 +
58726 + pax_flags = pax_parse_defaults();
58727 + ei_pax_flags = pax_parse_ei_pax(elf_ex);
58728 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
58729 + xattr_pax_flags = pax_parse_xattr_pax(file);
58730 +
58731 + if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58732 + xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58733 + pt_pax_flags != xattr_pax_flags)
58734 + return -EINVAL;
58735 + if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58736 + pax_flags = xattr_pax_flags;
58737 + else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58738 + pax_flags = pt_pax_flags;
58739 + else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58740 + pax_flags = ei_pax_flags;
58741 +
58742 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
58743 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58744 + if ((__supported_pte_mask & _PAGE_NX))
58745 + pax_flags &= ~MF_PAX_SEGMEXEC;
58746 + else
58747 + pax_flags &= ~MF_PAX_PAGEEXEC;
58748 + }
58749 +#endif
58750 +
58751 + if (0 > pax_check_flags(&pax_flags))
58752 + return -EINVAL;
58753 +
58754 + current->mm->pax_flags = pax_flags;
58755 + return 0;
58756 +}
58757 +#endif
58758 +
58759 /*
58760 * These are the functions used to load ELF style executables and shared
58761 * libraries. There is no binary dependent code anywhere else.
58762 @@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
58763 {
58764 unsigned int random_variable = 0;
58765
58766 +#ifdef CONFIG_PAX_RANDUSTACK
58767 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
58768 + return stack_top - current->mm->delta_stack;
58769 +#endif
58770 +
58771 if ((current->flags & PF_RANDOMIZE) &&
58772 !(current->personality & ADDR_NO_RANDOMIZE)) {
58773 random_variable = get_random_int() & STACK_RND_MASK;
58774 @@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58775 unsigned long load_addr = 0, load_bias = 0;
58776 int load_addr_set = 0;
58777 char * elf_interpreter = NULL;
58778 - unsigned long error;
58779 + unsigned long error = 0;
58780 struct elf_phdr *elf_ppnt, *elf_phdata;
58781 unsigned long elf_bss, elf_brk;
58782 int retval, i;
58783 @@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58784 struct elfhdr elf_ex;
58785 struct elfhdr interp_elf_ex;
58786 } *loc;
58787 + unsigned long pax_task_size;
58788
58789 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
58790 if (!loc) {
58791 @@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
58792 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
58793 may depend on the personality. */
58794 SET_PERSONALITY(loc->elf_ex);
58795 +
58796 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58797 + current->mm->pax_flags = 0UL;
58798 +#endif
58799 +
58800 +#ifdef CONFIG_PAX_DLRESOLVE
58801 + current->mm->call_dl_resolve = 0UL;
58802 +#endif
58803 +
58804 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
58805 + current->mm->call_syscall = 0UL;
58806 +#endif
58807 +
58808 +#ifdef CONFIG_PAX_ASLR
58809 + current->mm->delta_mmap = 0UL;
58810 + current->mm->delta_stack = 0UL;
58811 +#endif
58812 +
58813 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58814 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
58815 + send_sig(SIGKILL, current, 0);
58816 + goto out_free_dentry;
58817 + }
58818 +#endif
58819 +
58820 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58821 + pax_set_initial_flags(bprm);
58822 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
58823 + if (pax_set_initial_flags_func)
58824 + (pax_set_initial_flags_func)(bprm);
58825 +#endif
58826 +
58827 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
58828 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
58829 + current->mm->context.user_cs_limit = PAGE_SIZE;
58830 + current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
58831 + }
58832 +#endif
58833 +
58834 +#ifdef CONFIG_PAX_SEGMEXEC
58835 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
58836 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
58837 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
58838 + pax_task_size = SEGMEXEC_TASK_SIZE;
58839 + current->mm->def_flags |= VM_NOHUGEPAGE;
58840 + } else
58841 +#endif
58842 +
58843 + pax_task_size = TASK_SIZE;
58844 +
58845 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
58846 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58847 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
58848 + put_cpu();
58849 + }
58850 +#endif
58851 +
58852 +#ifdef CONFIG_PAX_ASLR
58853 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58854 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
58855 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
58856 + }
58857 +#endif
58858 +
58859 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58860 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58861 + executable_stack = EXSTACK_DISABLE_X;
58862 + current->personality &= ~READ_IMPLIES_EXEC;
58863 + } else
58864 +#endif
58865 +
58866 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
58867 current->personality |= READ_IMPLIES_EXEC;
58868
58869 @@ -811,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
58870 #else
58871 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
58872 #endif
58873 +
58874 +#ifdef CONFIG_PAX_RANDMMAP
58875 + /* PaX: randomize base address at the default exe base if requested */
58876 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
58877 +#ifdef CONFIG_SPARC64
58878 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
58879 +#else
58880 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
58881 +#endif
58882 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
58883 + elf_flags |= MAP_FIXED;
58884 + }
58885 +#endif
58886 +
58887 }
58888
58889 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
58890 @@ -842,9 +1294,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
58891 * allowed task size. Note that p_filesz must always be
58892 * <= p_memsz so it is only necessary to check p_memsz.
58893 */
58894 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58895 - elf_ppnt->p_memsz > TASK_SIZE ||
58896 - TASK_SIZE - elf_ppnt->p_memsz < k) {
58897 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58898 + elf_ppnt->p_memsz > pax_task_size ||
58899 + pax_task_size - elf_ppnt->p_memsz < k) {
58900 /* set_brk can never work. Avoid overflows. */
58901 retval = -EINVAL;
58902 goto out_free_dentry;
58903 @@ -880,16 +1332,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
58904 if (retval)
58905 goto out_free_dentry;
58906 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
58907 - retval = -EFAULT; /* Nobody gets to see this, but.. */
58908 - goto out_free_dentry;
58909 + /*
58910 + * This bss-zeroing can fail if the ELF
58911 + * file specifies odd protections. So
58912 + * we don't check the return value
58913 + */
58914 }
58915
58916 +#ifdef CONFIG_PAX_RANDMMAP
58917 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58918 + unsigned long start, size, flags;
58919 + vm_flags_t vm_flags;
58920 +
58921 + start = ELF_PAGEALIGN(elf_brk);
58922 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
58923 + flags = MAP_FIXED | MAP_PRIVATE;
58924 + vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
58925 +
58926 + down_write(&current->mm->mmap_sem);
58927 + start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
58928 + retval = -ENOMEM;
58929 + if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
58930 +// if (current->personality & ADDR_NO_RANDOMIZE)
58931 +// vm_flags |= VM_READ | VM_MAYREAD;
58932 + start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
58933 + retval = IS_ERR_VALUE(start) ? start : 0;
58934 + }
58935 + up_write(&current->mm->mmap_sem);
58936 + if (retval == 0)
58937 + retval = set_brk(start + size, start + size + PAGE_SIZE);
58938 + if (retval < 0)
58939 + goto out_free_dentry;
58940 + }
58941 +#endif
58942 +
58943 if (elf_interpreter) {
58944 - unsigned long interp_map_addr = 0;
58945 -
58946 elf_entry = load_elf_interp(&loc->interp_elf_ex,
58947 interpreter,
58948 - &interp_map_addr,
58949 load_bias);
58950 if (!IS_ERR((void *)elf_entry)) {
58951 /*
58952 @@ -1115,7 +1594,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
58953 * Decide what to dump of a segment, part, all or none.
58954 */
58955 static unsigned long vma_dump_size(struct vm_area_struct *vma,
58956 - unsigned long mm_flags)
58957 + unsigned long mm_flags, long signr)
58958 {
58959 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
58960
58961 @@ -1153,7 +1632,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
58962 if (vma->vm_file == NULL)
58963 return 0;
58964
58965 - if (FILTER(MAPPED_PRIVATE))
58966 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
58967 goto whole;
58968
58969 /*
58970 @@ -1360,9 +1839,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
58971 {
58972 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
58973 int i = 0;
58974 - do
58975 + do {
58976 i += 2;
58977 - while (auxv[i - 2] != AT_NULL);
58978 + } while (auxv[i - 2] != AT_NULL);
58979 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
58980 }
58981
58982 @@ -1371,7 +1850,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
58983 {
58984 mm_segment_t old_fs = get_fs();
58985 set_fs(KERNEL_DS);
58986 - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
58987 + copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
58988 set_fs(old_fs);
58989 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
58990 }
58991 @@ -1995,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
58992 }
58993
58994 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
58995 - unsigned long mm_flags)
58996 + struct coredump_params *cprm)
58997 {
58998 struct vm_area_struct *vma;
58999 size_t size = 0;
59000
59001 for (vma = first_vma(current, gate_vma); vma != NULL;
59002 vma = next_vma(vma, gate_vma))
59003 - size += vma_dump_size(vma, mm_flags);
59004 + size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59005 return size;
59006 }
59007
59008 @@ -2093,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59009
59010 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
59011
59012 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
59013 + offset += elf_core_vma_data_size(gate_vma, cprm);
59014 offset += elf_core_extra_data_size();
59015 e_shoff = offset;
59016
59017 @@ -2121,7 +2600,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59018 phdr.p_offset = offset;
59019 phdr.p_vaddr = vma->vm_start;
59020 phdr.p_paddr = 0;
59021 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
59022 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59023 phdr.p_memsz = vma->vm_end - vma->vm_start;
59024 offset += phdr.p_filesz;
59025 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
59026 @@ -2154,7 +2633,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59027 unsigned long addr;
59028 unsigned long end;
59029
59030 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
59031 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59032
59033 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
59034 struct page *page;
59035 @@ -2195,6 +2674,167 @@ out:
59036
59037 #endif /* CONFIG_ELF_CORE */
59038
59039 +#ifdef CONFIG_PAX_MPROTECT
59040 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
59041 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
59042 + * we'll remove VM_MAYWRITE for good on RELRO segments.
59043 + *
59044 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59045 + * basis because we want to allow the common case and not the special ones.
59046 + */
59047 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59048 +{
59049 + struct elfhdr elf_h;
59050 + struct elf_phdr elf_p;
59051 + unsigned long i;
59052 + unsigned long oldflags;
59053 + bool is_textrel_rw, is_textrel_rx, is_relro;
59054 +
59055 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59056 + return;
59057 +
59058 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59059 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59060 +
59061 +#ifdef CONFIG_PAX_ELFRELOCS
59062 + /* possible TEXTREL */
59063 + is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59064 + is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59065 +#else
59066 + is_textrel_rw = false;
59067 + is_textrel_rx = false;
59068 +#endif
59069 +
59070 + /* possible RELRO */
59071 + is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59072 +
59073 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59074 + return;
59075 +
59076 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59077 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59078 +
59079 +#ifdef CONFIG_PAX_ETEXECRELOCS
59080 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59081 +#else
59082 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59083 +#endif
59084 +
59085 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59086 + !elf_check_arch(&elf_h) ||
59087 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59088 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59089 + return;
59090 +
59091 + for (i = 0UL; i < elf_h.e_phnum; i++) {
59092 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59093 + return;
59094 + switch (elf_p.p_type) {
59095 + case PT_DYNAMIC:
59096 + if (!is_textrel_rw && !is_textrel_rx)
59097 + continue;
59098 + i = 0UL;
59099 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59100 + elf_dyn dyn;
59101 +
59102 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59103 + break;
59104 + if (dyn.d_tag == DT_NULL)
59105 + break;
59106 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59107 + gr_log_textrel(vma);
59108 + if (is_textrel_rw)
59109 + vma->vm_flags |= VM_MAYWRITE;
59110 + else
59111 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59112 + vma->vm_flags &= ~VM_MAYWRITE;
59113 + break;
59114 + }
59115 + i++;
59116 + }
59117 + is_textrel_rw = false;
59118 + is_textrel_rx = false;
59119 + continue;
59120 +
59121 + case PT_GNU_RELRO:
59122 + if (!is_relro)
59123 + continue;
59124 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59125 + vma->vm_flags &= ~VM_MAYWRITE;
59126 + is_relro = false;
59127 + continue;
59128 +
59129 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
59130 + case PT_PAX_FLAGS: {
59131 + const char *msg_mprotect = "", *msg_emutramp = "";
59132 + char *buffer_lib, *buffer_exe;
59133 +
59134 + if (elf_p.p_flags & PF_NOMPROTECT)
59135 + msg_mprotect = "MPROTECT disabled";
59136 +
59137 +#ifdef CONFIG_PAX_EMUTRAMP
59138 + if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59139 + msg_emutramp = "EMUTRAMP enabled";
59140 +#endif
59141 +
59142 + if (!msg_mprotect[0] && !msg_emutramp[0])
59143 + continue;
59144 +
59145 + if (!printk_ratelimit())
59146 + continue;
59147 +
59148 + buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59149 + buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59150 + if (buffer_lib && buffer_exe) {
59151 + char *path_lib, *path_exe;
59152 +
59153 + path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59154 + path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59155 +
59156 + pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59157 + (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59158 +
59159 + }
59160 + free_page((unsigned long)buffer_exe);
59161 + free_page((unsigned long)buffer_lib);
59162 + continue;
59163 + }
59164 +#endif
59165 +
59166 + }
59167 + }
59168 +}
59169 +#endif
59170 +
59171 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59172 +
59173 +extern int grsec_enable_log_rwxmaps;
59174 +
59175 +static void elf_handle_mmap(struct file *file)
59176 +{
59177 + struct elfhdr elf_h;
59178 + struct elf_phdr elf_p;
59179 + unsigned long i;
59180 +
59181 + if (!grsec_enable_log_rwxmaps)
59182 + return;
59183 +
59184 + if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59185 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59186 + (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59187 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59188 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59189 + return;
59190 +
59191 + for (i = 0UL; i < elf_h.e_phnum; i++) {
59192 + if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59193 + return;
59194 + if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59195 + gr_log_ptgnustack(file);
59196 + }
59197 +}
59198 +#endif
59199 +
59200 static int __init init_elf_binfmt(void)
59201 {
59202 register_binfmt(&elf_format);
59203 diff --git a/fs/block_dev.c b/fs/block_dev.c
59204 index 1d9c9f3..2905786 100644
59205 --- a/fs/block_dev.c
59206 +++ b/fs/block_dev.c
59207 @@ -697,7 +697,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59208 else if (bdev->bd_contains == bdev)
59209 return true; /* is a whole device which isn't held */
59210
59211 - else if (whole->bd_holder == bd_may_claim)
59212 + else if (whole->bd_holder == (void *)bd_may_claim)
59213 return true; /* is a partition of a device that is being partitioned */
59214 else if (whole->bd_holder != NULL)
59215 return false; /* is a partition of a held device */
59216 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59217 index 150822e..75bb326 100644
59218 --- a/fs/btrfs/ctree.c
59219 +++ b/fs/btrfs/ctree.c
59220 @@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59221 free_extent_buffer(buf);
59222 add_root_to_dirty_list(root);
59223 } else {
59224 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59225 - parent_start = parent->start;
59226 - else
59227 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59228 + if (parent)
59229 + parent_start = parent->start;
59230 + else
59231 + parent_start = 0;
59232 + } else
59233 parent_start = 0;
59234
59235 WARN_ON(trans->transid != btrfs_header_generation(parent));
59236 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59237 index 054577b..9b342cc 100644
59238 --- a/fs/btrfs/delayed-inode.c
59239 +++ b/fs/btrfs/delayed-inode.c
59240 @@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59241
59242 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59243 {
59244 - int seq = atomic_inc_return(&delayed_root->items_seq);
59245 + int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59246 if ((atomic_dec_return(&delayed_root->items) <
59247 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59248 waitqueue_active(&delayed_root->wait))
59249 @@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59250
59251 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59252 {
59253 - int val = atomic_read(&delayed_root->items_seq);
59254 + int val = atomic_read_unchecked(&delayed_root->items_seq);
59255
59256 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59257 return 1;
59258 @@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59259 int seq;
59260 int ret;
59261
59262 - seq = atomic_read(&delayed_root->items_seq);
59263 + seq = atomic_read_unchecked(&delayed_root->items_seq);
59264
59265 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59266 if (ret)
59267 diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59268 index f70119f..ab5894d 100644
59269 --- a/fs/btrfs/delayed-inode.h
59270 +++ b/fs/btrfs/delayed-inode.h
59271 @@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59272 */
59273 struct list_head prepare_list;
59274 atomic_t items; /* for delayed items */
59275 - atomic_t items_seq; /* for delayed items */
59276 + atomic_unchecked_t items_seq; /* for delayed items */
59277 int nodes; /* for delayed nodes */
59278 wait_queue_head_t wait;
59279 };
59280 @@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59281 struct btrfs_delayed_root *delayed_root)
59282 {
59283 atomic_set(&delayed_root->items, 0);
59284 - atomic_set(&delayed_root->items_seq, 0);
59285 + atomic_set_unchecked(&delayed_root->items_seq, 0);
59286 delayed_root->nodes = 0;
59287 spin_lock_init(&delayed_root->lock);
59288 init_waitqueue_head(&delayed_root->wait);
59289 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
59290 index 4399f0c..a34d8b4 100644
59291 --- a/fs/btrfs/ioctl.c
59292 +++ b/fs/btrfs/ioctl.c
59293 @@ -3953,9 +3953,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59294 for (i = 0; i < num_types; i++) {
59295 struct btrfs_space_info *tmp;
59296
59297 + /* Don't copy in more than we allocated */
59298 if (!slot_count)
59299 break;
59300
59301 + slot_count--;
59302 +
59303 info = NULL;
59304 rcu_read_lock();
59305 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
59306 @@ -3977,10 +3980,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59307 memcpy(dest, &space, sizeof(space));
59308 dest++;
59309 space_args.total_spaces++;
59310 - slot_count--;
59311 }
59312 - if (!slot_count)
59313 - break;
59314 }
59315 up_read(&info->groups_sem);
59316 }
59317 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59318 index 54bd91e..aefa810 100644
59319 --- a/fs/btrfs/super.c
59320 +++ b/fs/btrfs/super.c
59321 @@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59322 function, line, errstr);
59323 return;
59324 }
59325 - ACCESS_ONCE(trans->transaction->aborted) = errno;
59326 + ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59327 /* Wake up anybody who may be waiting on this transaction */
59328 wake_up(&root->fs_info->transaction_wait);
59329 wake_up(&root->fs_info->transaction_blocked_wait);
59330 diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59331 index b2e7bb4..3719201 100644
59332 --- a/fs/btrfs/sysfs.c
59333 +++ b/fs/btrfs/sysfs.c
59334 @@ -480,7 +480,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59335 for (set = 0; set < FEAT_MAX; set++) {
59336 int i;
59337 struct attribute *attrs[2];
59338 - struct attribute_group agroup = {
59339 + attribute_group_no_const agroup = {
59340 .name = "features",
59341 .attrs = attrs,
59342 };
59343 diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59344 index 2299bfd..4098e72 100644
59345 --- a/fs/btrfs/tests/free-space-tests.c
59346 +++ b/fs/btrfs/tests/free-space-tests.c
59347 @@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59348 * extent entry.
59349 */
59350 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59351 - cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59352 + pax_open_kernel();
59353 + *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59354 + pax_close_kernel();
59355
59356 /*
59357 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59358 @@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59359 if (ret)
59360 return ret;
59361
59362 - cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59363 + pax_open_kernel();
59364 + *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59365 + pax_close_kernel();
59366 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59367
59368 return 0;
59369 diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59370 index 154990c..d0cf699 100644
59371 --- a/fs/btrfs/tree-log.h
59372 +++ b/fs/btrfs/tree-log.h
59373 @@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59374 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59375 struct btrfs_trans_handle *trans)
59376 {
59377 - ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59378 + ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59379 }
59380
59381 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59382 diff --git a/fs/buffer.c b/fs/buffer.c
59383 index 20805db..2e8fc69 100644
59384 --- a/fs/buffer.c
59385 +++ b/fs/buffer.c
59386 @@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59387 bh_cachep = kmem_cache_create("buffer_head",
59388 sizeof(struct buffer_head), 0,
59389 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59390 - SLAB_MEM_SPREAD),
59391 + SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59392 NULL);
59393
59394 /*
59395 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59396 index fbb08e9..0fda764 100644
59397 --- a/fs/cachefiles/bind.c
59398 +++ b/fs/cachefiles/bind.c
59399 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59400 args);
59401
59402 /* start by checking things over */
59403 - ASSERT(cache->fstop_percent >= 0 &&
59404 - cache->fstop_percent < cache->fcull_percent &&
59405 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
59406 cache->fcull_percent < cache->frun_percent &&
59407 cache->frun_percent < 100);
59408
59409 - ASSERT(cache->bstop_percent >= 0 &&
59410 - cache->bstop_percent < cache->bcull_percent &&
59411 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
59412 cache->bcull_percent < cache->brun_percent &&
59413 cache->brun_percent < 100);
59414
59415 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59416 index ce1b115..4a6852c 100644
59417 --- a/fs/cachefiles/daemon.c
59418 +++ b/fs/cachefiles/daemon.c
59419 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59420 if (n > buflen)
59421 return -EMSGSIZE;
59422
59423 - if (copy_to_user(_buffer, buffer, n) != 0)
59424 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59425 return -EFAULT;
59426
59427 return n;
59428 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59429 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59430 return -EIO;
59431
59432 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
59433 + if (datalen > PAGE_SIZE - 1)
59434 return -EOPNOTSUPP;
59435
59436 /* drag the command string into the kernel so we can parse it */
59437 @@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59438 if (args[0] != '%' || args[1] != '\0')
59439 return -EINVAL;
59440
59441 - if (fstop < 0 || fstop >= cache->fcull_percent)
59442 + if (fstop >= cache->fcull_percent)
59443 return cachefiles_daemon_range_error(cache, args);
59444
59445 cache->fstop_percent = fstop;
59446 @@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59447 if (args[0] != '%' || args[1] != '\0')
59448 return -EINVAL;
59449
59450 - if (bstop < 0 || bstop >= cache->bcull_percent)
59451 + if (bstop >= cache->bcull_percent)
59452 return cachefiles_daemon_range_error(cache, args);
59453
59454 cache->bstop_percent = bstop;
59455 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59456 index 8c52472..c4e3a69 100644
59457 --- a/fs/cachefiles/internal.h
59458 +++ b/fs/cachefiles/internal.h
59459 @@ -66,7 +66,7 @@ struct cachefiles_cache {
59460 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59461 struct rb_root active_nodes; /* active nodes (can't be culled) */
59462 rwlock_t active_lock; /* lock for active_nodes */
59463 - atomic_t gravecounter; /* graveyard uniquifier */
59464 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59465 unsigned frun_percent; /* when to stop culling (% files) */
59466 unsigned fcull_percent; /* when to start culling (% files) */
59467 unsigned fstop_percent; /* when to stop allocating (% files) */
59468 @@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59469 * proc.c
59470 */
59471 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59472 -extern atomic_t cachefiles_lookup_histogram[HZ];
59473 -extern atomic_t cachefiles_mkdir_histogram[HZ];
59474 -extern atomic_t cachefiles_create_histogram[HZ];
59475 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59476 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59477 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59478
59479 extern int __init cachefiles_proc_init(void);
59480 extern void cachefiles_proc_cleanup(void);
59481 static inline
59482 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59483 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59484 {
59485 unsigned long jif = jiffies - start_jif;
59486 if (jif >= HZ)
59487 jif = HZ - 1;
59488 - atomic_inc(&histogram[jif]);
59489 + atomic_inc_unchecked(&histogram[jif]);
59490 }
59491
59492 #else
59493 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59494 index e12f189..ed17244 100644
59495 --- a/fs/cachefiles/namei.c
59496 +++ b/fs/cachefiles/namei.c
59497 @@ -312,7 +312,7 @@ try_again:
59498 /* first step is to make up a grave dentry in the graveyard */
59499 sprintf(nbuffer, "%08x%08x",
59500 (uint32_t) get_seconds(),
59501 - (uint32_t) atomic_inc_return(&cache->gravecounter));
59502 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
59503
59504 /* do the multiway lock magic */
59505 trap = lock_rename(cache->graveyard, dir);
59506 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
59507 index eccd339..4c1d995 100644
59508 --- a/fs/cachefiles/proc.c
59509 +++ b/fs/cachefiles/proc.c
59510 @@ -14,9 +14,9 @@
59511 #include <linux/seq_file.h>
59512 #include "internal.h"
59513
59514 -atomic_t cachefiles_lookup_histogram[HZ];
59515 -atomic_t cachefiles_mkdir_histogram[HZ];
59516 -atomic_t cachefiles_create_histogram[HZ];
59517 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59518 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59519 +atomic_unchecked_t cachefiles_create_histogram[HZ];
59520
59521 /*
59522 * display the latency histogram
59523 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
59524 return 0;
59525 default:
59526 index = (unsigned long) v - 3;
59527 - x = atomic_read(&cachefiles_lookup_histogram[index]);
59528 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
59529 - z = atomic_read(&cachefiles_create_histogram[index]);
59530 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
59531 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
59532 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
59533 if (x == 0 && y == 0 && z == 0)
59534 return 0;
59535
59536 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
59537 index 695e788..f4a9d4d 100644
59538 --- a/fs/ceph/dir.c
59539 +++ b/fs/ceph/dir.c
59540 @@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
59541 struct dentry *dentry, *last;
59542 struct ceph_dentry_info *di;
59543 int err = 0;
59544 + char d_name[DNAME_INLINE_LEN];
59545 + const unsigned char *name;
59546
59547 /* claim ref on last dentry we returned */
59548 last = fi->dentry;
59549 @@ -192,7 +194,12 @@ more:
59550
59551 dout(" %llu (%llu) dentry %p %.*s %p\n", di->offset, ctx->pos,
59552 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
59553 - if (!dir_emit(ctx, dentry->d_name.name,
59554 + name = dentry->d_name.name;
59555 + if (name == dentry->d_iname) {
59556 + memcpy(d_name, name, dentry->d_name.len);
59557 + name = d_name;
59558 + }
59559 + if (!dir_emit(ctx, name,
59560 dentry->d_name.len,
59561 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
59562 dentry->d_inode->i_mode >> 12)) {
59563 @@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
59564 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
59565 struct ceph_mds_client *mdsc = fsc->mdsc;
59566 unsigned frag = fpos_frag(ctx->pos);
59567 - int off = fpos_off(ctx->pos);
59568 + unsigned int off = fpos_off(ctx->pos);
59569 int err;
59570 u32 ftype;
59571 struct ceph_mds_reply_info_parsed *rinfo;
59572 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
59573 index f6e1237..796ffd1 100644
59574 --- a/fs/ceph/super.c
59575 +++ b/fs/ceph/super.c
59576 @@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
59577 /*
59578 * construct our own bdi so we can control readahead, etc.
59579 */
59580 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
59581 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
59582
59583 static int ceph_register_bdi(struct super_block *sb,
59584 struct ceph_fs_client *fsc)
59585 @@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
59586 default_backing_dev_info.ra_pages;
59587
59588 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
59589 - atomic_long_inc_return(&bdi_seq));
59590 + atomic_long_inc_return_unchecked(&bdi_seq));
59591 if (!err)
59592 sb->s_bdi = &fsc->backing_dev_info;
59593 return err;
59594 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
59595 index 44ec726..bcb06a3 100644
59596 --- a/fs/cifs/cifs_debug.c
59597 +++ b/fs/cifs/cifs_debug.c
59598 @@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59599
59600 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
59601 #ifdef CONFIG_CIFS_STATS2
59602 - atomic_set(&totBufAllocCount, 0);
59603 - atomic_set(&totSmBufAllocCount, 0);
59604 + atomic_set_unchecked(&totBufAllocCount, 0);
59605 + atomic_set_unchecked(&totSmBufAllocCount, 0);
59606 #endif /* CONFIG_CIFS_STATS2 */
59607 spin_lock(&cifs_tcp_ses_lock);
59608 list_for_each(tmp1, &cifs_tcp_ses_list) {
59609 @@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59610 tcon = list_entry(tmp3,
59611 struct cifs_tcon,
59612 tcon_list);
59613 - atomic_set(&tcon->num_smbs_sent, 0);
59614 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
59615 if (server->ops->clear_stats)
59616 server->ops->clear_stats(tcon);
59617 }
59618 @@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59619 smBufAllocCount.counter, cifs_min_small);
59620 #ifdef CONFIG_CIFS_STATS2
59621 seq_printf(m, "Total Large %d Small %d Allocations\n",
59622 - atomic_read(&totBufAllocCount),
59623 - atomic_read(&totSmBufAllocCount));
59624 + atomic_read_unchecked(&totBufAllocCount),
59625 + atomic_read_unchecked(&totSmBufAllocCount));
59626 #endif /* CONFIG_CIFS_STATS2 */
59627
59628 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
59629 @@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59630 if (tcon->need_reconnect)
59631 seq_puts(m, "\tDISCONNECTED ");
59632 seq_printf(m, "\nSMBs: %d",
59633 - atomic_read(&tcon->num_smbs_sent));
59634 + atomic_read_unchecked(&tcon->num_smbs_sent));
59635 if (server->ops->print_stats)
59636 server->ops->print_stats(m, tcon);
59637 }
59638 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
59639 index 9d7996e..35ad5cf4 100644
59640 --- a/fs/cifs/cifsfs.c
59641 +++ b/fs/cifs/cifsfs.c
59642 @@ -1093,7 +1093,7 @@ cifs_init_request_bufs(void)
59643 */
59644 cifs_req_cachep = kmem_cache_create("cifs_request",
59645 CIFSMaxBufSize + max_hdr_size, 0,
59646 - SLAB_HWCACHE_ALIGN, NULL);
59647 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
59648 if (cifs_req_cachep == NULL)
59649 return -ENOMEM;
59650
59651 @@ -1120,7 +1120,7 @@ cifs_init_request_bufs(void)
59652 efficient to alloc 1 per page off the slab compared to 17K (5page)
59653 alloc of large cifs buffers even when page debugging is on */
59654 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
59655 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
59656 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
59657 NULL);
59658 if (cifs_sm_req_cachep == NULL) {
59659 mempool_destroy(cifs_req_poolp);
59660 @@ -1205,8 +1205,8 @@ init_cifs(void)
59661 atomic_set(&bufAllocCount, 0);
59662 atomic_set(&smBufAllocCount, 0);
59663 #ifdef CONFIG_CIFS_STATS2
59664 - atomic_set(&totBufAllocCount, 0);
59665 - atomic_set(&totSmBufAllocCount, 0);
59666 + atomic_set_unchecked(&totBufAllocCount, 0);
59667 + atomic_set_unchecked(&totSmBufAllocCount, 0);
59668 #endif /* CONFIG_CIFS_STATS2 */
59669
59670 atomic_set(&midCount, 0);
59671 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
59672 index 02a33e5..3a28b5a 100644
59673 --- a/fs/cifs/cifsglob.h
59674 +++ b/fs/cifs/cifsglob.h
59675 @@ -823,35 +823,35 @@ struct cifs_tcon {
59676 __u16 Flags; /* optional support bits */
59677 enum statusEnum tidStatus;
59678 #ifdef CONFIG_CIFS_STATS
59679 - atomic_t num_smbs_sent;
59680 + atomic_unchecked_t num_smbs_sent;
59681 union {
59682 struct {
59683 - atomic_t num_writes;
59684 - atomic_t num_reads;
59685 - atomic_t num_flushes;
59686 - atomic_t num_oplock_brks;
59687 - atomic_t num_opens;
59688 - atomic_t num_closes;
59689 - atomic_t num_deletes;
59690 - atomic_t num_mkdirs;
59691 - atomic_t num_posixopens;
59692 - atomic_t num_posixmkdirs;
59693 - atomic_t num_rmdirs;
59694 - atomic_t num_renames;
59695 - atomic_t num_t2renames;
59696 - atomic_t num_ffirst;
59697 - atomic_t num_fnext;
59698 - atomic_t num_fclose;
59699 - atomic_t num_hardlinks;
59700 - atomic_t num_symlinks;
59701 - atomic_t num_locks;
59702 - atomic_t num_acl_get;
59703 - atomic_t num_acl_set;
59704 + atomic_unchecked_t num_writes;
59705 + atomic_unchecked_t num_reads;
59706 + atomic_unchecked_t num_flushes;
59707 + atomic_unchecked_t num_oplock_brks;
59708 + atomic_unchecked_t num_opens;
59709 + atomic_unchecked_t num_closes;
59710 + atomic_unchecked_t num_deletes;
59711 + atomic_unchecked_t num_mkdirs;
59712 + atomic_unchecked_t num_posixopens;
59713 + atomic_unchecked_t num_posixmkdirs;
59714 + atomic_unchecked_t num_rmdirs;
59715 + atomic_unchecked_t num_renames;
59716 + atomic_unchecked_t num_t2renames;
59717 + atomic_unchecked_t num_ffirst;
59718 + atomic_unchecked_t num_fnext;
59719 + atomic_unchecked_t num_fclose;
59720 + atomic_unchecked_t num_hardlinks;
59721 + atomic_unchecked_t num_symlinks;
59722 + atomic_unchecked_t num_locks;
59723 + atomic_unchecked_t num_acl_get;
59724 + atomic_unchecked_t num_acl_set;
59725 } cifs_stats;
59726 #ifdef CONFIG_CIFS_SMB2
59727 struct {
59728 - atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59729 - atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59730 + atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59731 + atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59732 } smb2_stats;
59733 #endif /* CONFIG_CIFS_SMB2 */
59734 } stats;
59735 @@ -1192,7 +1192,7 @@ convert_delimiter(char *path, char delim)
59736 }
59737
59738 #ifdef CONFIG_CIFS_STATS
59739 -#define cifs_stats_inc atomic_inc
59740 +#define cifs_stats_inc atomic_inc_unchecked
59741
59742 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
59743 unsigned int bytes)
59744 @@ -1559,8 +1559,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
59745 /* Various Debug counters */
59746 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
59747 #ifdef CONFIG_CIFS_STATS2
59748 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
59749 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
59750 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
59751 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
59752 #endif
59753 GLOBAL_EXTERN atomic_t smBufAllocCount;
59754 GLOBAL_EXTERN atomic_t midCount;
59755 diff --git a/fs/cifs/file.c b/fs/cifs/file.c
59756 index 3e4d00a..38a122d 100644
59757 --- a/fs/cifs/file.c
59758 +++ b/fs/cifs/file.c
59759 @@ -2056,10 +2056,14 @@ static int cifs_writepages(struct address_space *mapping,
59760 index = mapping->writeback_index; /* Start from prev offset */
59761 end = -1;
59762 } else {
59763 - index = wbc->range_start >> PAGE_CACHE_SHIFT;
59764 - end = wbc->range_end >> PAGE_CACHE_SHIFT;
59765 - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
59766 + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
59767 range_whole = true;
59768 + index = 0;
59769 + end = ULONG_MAX;
59770 + } else {
59771 + index = wbc->range_start >> PAGE_CACHE_SHIFT;
59772 + end = wbc->range_end >> PAGE_CACHE_SHIFT;
59773 + }
59774 scanned = true;
59775 }
59776 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
59777 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
59778 index b7415d5..3984ec0 100644
59779 --- a/fs/cifs/misc.c
59780 +++ b/fs/cifs/misc.c
59781 @@ -170,7 +170,7 @@ cifs_buf_get(void)
59782 memset(ret_buf, 0, buf_size + 3);
59783 atomic_inc(&bufAllocCount);
59784 #ifdef CONFIG_CIFS_STATS2
59785 - atomic_inc(&totBufAllocCount);
59786 + atomic_inc_unchecked(&totBufAllocCount);
59787 #endif /* CONFIG_CIFS_STATS2 */
59788 }
59789
59790 @@ -205,7 +205,7 @@ cifs_small_buf_get(void)
59791 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
59792 atomic_inc(&smBufAllocCount);
59793 #ifdef CONFIG_CIFS_STATS2
59794 - atomic_inc(&totSmBufAllocCount);
59795 + atomic_inc_unchecked(&totSmBufAllocCount);
59796 #endif /* CONFIG_CIFS_STATS2 */
59797
59798 }
59799 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
59800 index d297903..1cb7516 100644
59801 --- a/fs/cifs/smb1ops.c
59802 +++ b/fs/cifs/smb1ops.c
59803 @@ -622,27 +622,27 @@ static void
59804 cifs_clear_stats(struct cifs_tcon *tcon)
59805 {
59806 #ifdef CONFIG_CIFS_STATS
59807 - atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
59808 - atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
59809 - atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
59810 - atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59811 - atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
59812 - atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
59813 - atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59814 - atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
59815 - atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
59816 - atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
59817 - atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
59818 - atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
59819 - atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
59820 - atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
59821 - atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
59822 - atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
59823 - atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
59824 - atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
59825 - atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
59826 - atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
59827 - atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
59828 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
59829 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
59830 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
59831 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59832 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
59833 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
59834 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59835 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
59836 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
59837 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
59838 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
59839 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
59840 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
59841 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
59842 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
59843 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
59844 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
59845 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
59846 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
59847 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
59848 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
59849 #endif
59850 }
59851
59852 @@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59853 {
59854 #ifdef CONFIG_CIFS_STATS
59855 seq_printf(m, " Oplocks breaks: %d",
59856 - atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
59857 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
59858 seq_printf(m, "\nReads: %d Bytes: %llu",
59859 - atomic_read(&tcon->stats.cifs_stats.num_reads),
59860 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
59861 (long long)(tcon->bytes_read));
59862 seq_printf(m, "\nWrites: %d Bytes: %llu",
59863 - atomic_read(&tcon->stats.cifs_stats.num_writes),
59864 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
59865 (long long)(tcon->bytes_written));
59866 seq_printf(m, "\nFlushes: %d",
59867 - atomic_read(&tcon->stats.cifs_stats.num_flushes));
59868 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
59869 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
59870 - atomic_read(&tcon->stats.cifs_stats.num_locks),
59871 - atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
59872 - atomic_read(&tcon->stats.cifs_stats.num_symlinks));
59873 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
59874 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
59875 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
59876 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
59877 - atomic_read(&tcon->stats.cifs_stats.num_opens),
59878 - atomic_read(&tcon->stats.cifs_stats.num_closes),
59879 - atomic_read(&tcon->stats.cifs_stats.num_deletes));
59880 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
59881 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
59882 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
59883 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
59884 - atomic_read(&tcon->stats.cifs_stats.num_posixopens),
59885 - atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
59886 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
59887 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
59888 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
59889 - atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
59890 - atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
59891 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
59892 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
59893 seq_printf(m, "\nRenames: %d T2 Renames %d",
59894 - atomic_read(&tcon->stats.cifs_stats.num_renames),
59895 - atomic_read(&tcon->stats.cifs_stats.num_t2renames));
59896 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
59897 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
59898 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
59899 - atomic_read(&tcon->stats.cifs_stats.num_ffirst),
59900 - atomic_read(&tcon->stats.cifs_stats.num_fnext),
59901 - atomic_read(&tcon->stats.cifs_stats.num_fclose));
59902 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
59903 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
59904 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
59905 #endif
59906 }
59907
59908 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
59909 index c5f521b..1a40865 100644
59910 --- a/fs/cifs/smb2ops.c
59911 +++ b/fs/cifs/smb2ops.c
59912 @@ -417,8 +417,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
59913 #ifdef CONFIG_CIFS_STATS
59914 int i;
59915 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
59916 - atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59917 - atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59918 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59919 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59920 }
59921 #endif
59922 }
59923 @@ -458,65 +458,65 @@ static void
59924 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59925 {
59926 #ifdef CONFIG_CIFS_STATS
59927 - atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59928 - atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59929 + atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59930 + atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59931 seq_printf(m, "\nNegotiates: %d sent %d failed",
59932 - atomic_read(&sent[SMB2_NEGOTIATE_HE]),
59933 - atomic_read(&failed[SMB2_NEGOTIATE_HE]));
59934 + atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
59935 + atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
59936 seq_printf(m, "\nSessionSetups: %d sent %d failed",
59937 - atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
59938 - atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
59939 + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
59940 + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
59941 seq_printf(m, "\nLogoffs: %d sent %d failed",
59942 - atomic_read(&sent[SMB2_LOGOFF_HE]),
59943 - atomic_read(&failed[SMB2_LOGOFF_HE]));
59944 + atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
59945 + atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
59946 seq_printf(m, "\nTreeConnects: %d sent %d failed",
59947 - atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
59948 - atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
59949 + atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
59950 + atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
59951 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
59952 - atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
59953 - atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
59954 + atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
59955 + atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
59956 seq_printf(m, "\nCreates: %d sent %d failed",
59957 - atomic_read(&sent[SMB2_CREATE_HE]),
59958 - atomic_read(&failed[SMB2_CREATE_HE]));
59959 + atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
59960 + atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
59961 seq_printf(m, "\nCloses: %d sent %d failed",
59962 - atomic_read(&sent[SMB2_CLOSE_HE]),
59963 - atomic_read(&failed[SMB2_CLOSE_HE]));
59964 + atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
59965 + atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
59966 seq_printf(m, "\nFlushes: %d sent %d failed",
59967 - atomic_read(&sent[SMB2_FLUSH_HE]),
59968 - atomic_read(&failed[SMB2_FLUSH_HE]));
59969 + atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
59970 + atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
59971 seq_printf(m, "\nReads: %d sent %d failed",
59972 - atomic_read(&sent[SMB2_READ_HE]),
59973 - atomic_read(&failed[SMB2_READ_HE]));
59974 + atomic_read_unchecked(&sent[SMB2_READ_HE]),
59975 + atomic_read_unchecked(&failed[SMB2_READ_HE]));
59976 seq_printf(m, "\nWrites: %d sent %d failed",
59977 - atomic_read(&sent[SMB2_WRITE_HE]),
59978 - atomic_read(&failed[SMB2_WRITE_HE]));
59979 + atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
59980 + atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
59981 seq_printf(m, "\nLocks: %d sent %d failed",
59982 - atomic_read(&sent[SMB2_LOCK_HE]),
59983 - atomic_read(&failed[SMB2_LOCK_HE]));
59984 + atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
59985 + atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
59986 seq_printf(m, "\nIOCTLs: %d sent %d failed",
59987 - atomic_read(&sent[SMB2_IOCTL_HE]),
59988 - atomic_read(&failed[SMB2_IOCTL_HE]));
59989 + atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
59990 + atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
59991 seq_printf(m, "\nCancels: %d sent %d failed",
59992 - atomic_read(&sent[SMB2_CANCEL_HE]),
59993 - atomic_read(&failed[SMB2_CANCEL_HE]));
59994 + atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
59995 + atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
59996 seq_printf(m, "\nEchos: %d sent %d failed",
59997 - atomic_read(&sent[SMB2_ECHO_HE]),
59998 - atomic_read(&failed[SMB2_ECHO_HE]));
59999 + atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
60000 + atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
60001 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
60002 - atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
60003 - atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
60004 + atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
60005 + atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
60006 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
60007 - atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
60008 - atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
60009 + atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
60010 + atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
60011 seq_printf(m, "\nQueryInfos: %d sent %d failed",
60012 - atomic_read(&sent[SMB2_QUERY_INFO_HE]),
60013 - atomic_read(&failed[SMB2_QUERY_INFO_HE]));
60014 + atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
60015 + atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
60016 seq_printf(m, "\nSetInfos: %d sent %d failed",
60017 - atomic_read(&sent[SMB2_SET_INFO_HE]),
60018 - atomic_read(&failed[SMB2_SET_INFO_HE]));
60019 + atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
60020 + atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
60021 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
60022 - atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
60023 - atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
60024 + atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
60025 + atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
60026 #endif
60027 }
60028
60029 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
60030 index 8f1672b..af339c07 100644
60031 --- a/fs/cifs/smb2pdu.c
60032 +++ b/fs/cifs/smb2pdu.c
60033 @@ -2145,8 +2145,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
60034 default:
60035 cifs_dbg(VFS, "info level %u isn't supported\n",
60036 srch_inf->info_level);
60037 - rc = -EINVAL;
60038 - goto qdir_exit;
60039 + return -EINVAL;
60040 }
60041
60042 req->FileIndex = cpu_to_le32(index);
60043 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
60044 index 46ee6f2..89a9e7f 100644
60045 --- a/fs/coda/cache.c
60046 +++ b/fs/coda/cache.c
60047 @@ -24,7 +24,7 @@
60048 #include "coda_linux.h"
60049 #include "coda_cache.h"
60050
60051 -static atomic_t permission_epoch = ATOMIC_INIT(0);
60052 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60053
60054 /* replace or extend an acl cache hit */
60055 void coda_cache_enter(struct inode *inode, int mask)
60056 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60057 struct coda_inode_info *cii = ITOC(inode);
60058
60059 spin_lock(&cii->c_lock);
60060 - cii->c_cached_epoch = atomic_read(&permission_epoch);
60061 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60062 if (!uid_eq(cii->c_uid, current_fsuid())) {
60063 cii->c_uid = current_fsuid();
60064 cii->c_cached_perm = mask;
60065 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60066 {
60067 struct coda_inode_info *cii = ITOC(inode);
60068 spin_lock(&cii->c_lock);
60069 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60070 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60071 spin_unlock(&cii->c_lock);
60072 }
60073
60074 /* remove all acl caches */
60075 void coda_cache_clear_all(struct super_block *sb)
60076 {
60077 - atomic_inc(&permission_epoch);
60078 + atomic_inc_unchecked(&permission_epoch);
60079 }
60080
60081
60082 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60083 spin_lock(&cii->c_lock);
60084 hit = (mask & cii->c_cached_perm) == mask &&
60085 uid_eq(cii->c_uid, current_fsuid()) &&
60086 - cii->c_cached_epoch == atomic_read(&permission_epoch);
60087 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60088 spin_unlock(&cii->c_lock);
60089
60090 return hit;
60091 diff --git a/fs/compat.c b/fs/compat.c
60092 index b13df99..6f6f4a3 100644
60093 --- a/fs/compat.c
60094 +++ b/fs/compat.c
60095 @@ -54,7 +54,7 @@
60096 #include <asm/ioctls.h>
60097 #include "internal.h"
60098
60099 -int compat_log = 1;
60100 +int compat_log = 0;
60101
60102 int compat_printk(const char *fmt, ...)
60103 {
60104 @@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60105
60106 set_fs(KERNEL_DS);
60107 /* The __user pointer cast is valid because of the set_fs() */
60108 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60109 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60110 set_fs(oldfs);
60111 /* truncating is ok because it's a user address */
60112 if (!ret)
60113 @@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60114 goto out;
60115
60116 ret = -EINVAL;
60117 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60118 + if (nr_segs > UIO_MAXIOV)
60119 goto out;
60120 if (nr_segs > fast_segs) {
60121 ret = -ENOMEM;
60122 @@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60123 struct compat_readdir_callback {
60124 struct dir_context ctx;
60125 struct compat_old_linux_dirent __user *dirent;
60126 + struct file * file;
60127 int result;
60128 };
60129
60130 @@ -861,6 +862,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
60131 buf->result = -EOVERFLOW;
60132 return -EOVERFLOW;
60133 }
60134 +
60135 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60136 + return 0;
60137 +
60138 buf->result++;
60139 dirent = buf->dirent;
60140 if (!access_ok(VERIFY_WRITE, dirent,
60141 @@ -892,6 +897,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60142 if (!f.file)
60143 return -EBADF;
60144
60145 + buf.file = f.file;
60146 error = iterate_dir(f.file, &buf.ctx);
60147 if (buf.result)
60148 error = buf.result;
60149 @@ -911,6 +917,7 @@ struct compat_getdents_callback {
60150 struct dir_context ctx;
60151 struct compat_linux_dirent __user *current_dir;
60152 struct compat_linux_dirent __user *previous;
60153 + struct file * file;
60154 int count;
60155 int error;
60156 };
60157 @@ -932,6 +939,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
60158 buf->error = -EOVERFLOW;
60159 return -EOVERFLOW;
60160 }
60161 +
60162 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60163 + return 0;
60164 +
60165 dirent = buf->previous;
60166 if (dirent) {
60167 if (__put_user(offset, &dirent->d_off))
60168 @@ -977,6 +988,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60169 if (!f.file)
60170 return -EBADF;
60171
60172 + buf.file = f.file;
60173 error = iterate_dir(f.file, &buf.ctx);
60174 if (error >= 0)
60175 error = buf.error;
60176 @@ -997,6 +1009,7 @@ struct compat_getdents_callback64 {
60177 struct dir_context ctx;
60178 struct linux_dirent64 __user *current_dir;
60179 struct linux_dirent64 __user *previous;
60180 + struct file * file;
60181 int count;
60182 int error;
60183 };
60184 @@ -1013,6 +1026,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
60185 buf->error = -EINVAL; /* only used if we fail.. */
60186 if (reclen > buf->count)
60187 return -EINVAL;
60188 +
60189 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60190 + return 0;
60191 +
60192 dirent = buf->previous;
60193
60194 if (dirent) {
60195 @@ -1062,6 +1079,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60196 if (!f.file)
60197 return -EBADF;
60198
60199 + buf.file = f.file;
60200 error = iterate_dir(f.file, &buf.ctx);
60201 if (error >= 0)
60202 error = buf.error;
60203 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60204 index 4d24d17..4f8c09e 100644
60205 --- a/fs/compat_binfmt_elf.c
60206 +++ b/fs/compat_binfmt_elf.c
60207 @@ -30,11 +30,13 @@
60208 #undef elf_phdr
60209 #undef elf_shdr
60210 #undef elf_note
60211 +#undef elf_dyn
60212 #undef elf_addr_t
60213 #define elfhdr elf32_hdr
60214 #define elf_phdr elf32_phdr
60215 #define elf_shdr elf32_shdr
60216 #define elf_note elf32_note
60217 +#define elf_dyn Elf32_Dyn
60218 #define elf_addr_t Elf32_Addr
60219
60220 /*
60221 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60222 index afec645..9c65620 100644
60223 --- a/fs/compat_ioctl.c
60224 +++ b/fs/compat_ioctl.c
60225 @@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60226 return -EFAULT;
60227 if (__get_user(udata, &ss32->iomem_base))
60228 return -EFAULT;
60229 - ss.iomem_base = compat_ptr(udata);
60230 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60231 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60232 __get_user(ss.port_high, &ss32->port_high))
60233 return -EFAULT;
60234 @@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60235 for (i = 0; i < nmsgs; i++) {
60236 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60237 return -EFAULT;
60238 - if (get_user(datap, &umsgs[i].buf) ||
60239 - put_user(compat_ptr(datap), &tmsgs[i].buf))
60240 + if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60241 + put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60242 return -EFAULT;
60243 }
60244 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60245 @@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60246 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60247 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60248 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60249 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60250 + copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60251 return -EFAULT;
60252
60253 return ioctl_preallocate(file, p);
60254 @@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60255 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60256 {
60257 unsigned int a, b;
60258 - a = *(unsigned int *)p;
60259 - b = *(unsigned int *)q;
60260 + a = *(const unsigned int *)p;
60261 + b = *(const unsigned int *)q;
60262 if (a > b)
60263 return 1;
60264 if (a < b)
60265 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60266 index 668dcab..daebcd6 100644
60267 --- a/fs/configfs/dir.c
60268 +++ b/fs/configfs/dir.c
60269 @@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60270 }
60271 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60272 struct configfs_dirent *next;
60273 - const char *name;
60274 + const unsigned char * name;
60275 + char d_name[sizeof(next->s_dentry->d_iname)];
60276 int len;
60277 struct inode *inode = NULL;
60278
60279 @@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60280 continue;
60281
60282 name = configfs_get_name(next);
60283 - len = strlen(name);
60284 + if (next->s_dentry && name == next->s_dentry->d_iname) {
60285 + len = next->s_dentry->d_name.len;
60286 + memcpy(d_name, name, len);
60287 + name = d_name;
60288 + } else
60289 + len = strlen(name);
60290
60291 /*
60292 * We'll have a dentry and an inode for
60293 diff --git a/fs/coredump.c b/fs/coredump.c
60294 index b5c86ff..0dac262 100644
60295 --- a/fs/coredump.c
60296 +++ b/fs/coredump.c
60297 @@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60298 struct pipe_inode_info *pipe = file->private_data;
60299
60300 pipe_lock(pipe);
60301 - pipe->readers++;
60302 - pipe->writers--;
60303 + atomic_inc(&pipe->readers);
60304 + atomic_dec(&pipe->writers);
60305 wake_up_interruptible_sync(&pipe->wait);
60306 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60307 pipe_unlock(pipe);
60308 @@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60309 * We actually want wait_event_freezable() but then we need
60310 * to clear TIF_SIGPENDING and improve dump_interrupted().
60311 */
60312 - wait_event_interruptible(pipe->wait, pipe->readers == 1);
60313 + wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60314
60315 pipe_lock(pipe);
60316 - pipe->readers--;
60317 - pipe->writers++;
60318 + atomic_dec(&pipe->readers);
60319 + atomic_inc(&pipe->writers);
60320 pipe_unlock(pipe);
60321 }
60322
60323 @@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60324 struct files_struct *displaced;
60325 bool need_nonrelative = false;
60326 bool core_dumped = false;
60327 - static atomic_t core_dump_count = ATOMIC_INIT(0);
60328 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60329 + long signr = siginfo->si_signo;
60330 + int dumpable;
60331 struct coredump_params cprm = {
60332 .siginfo = siginfo,
60333 .regs = signal_pt_regs(),
60334 @@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60335 .mm_flags = mm->flags,
60336 };
60337
60338 - audit_core_dumps(siginfo->si_signo);
60339 + audit_core_dumps(signr);
60340 +
60341 + dumpable = __get_dumpable(cprm.mm_flags);
60342 +
60343 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60344 + gr_handle_brute_attach(dumpable);
60345
60346 binfmt = mm->binfmt;
60347 if (!binfmt || !binfmt->core_dump)
60348 goto fail;
60349 - if (!__get_dumpable(cprm.mm_flags))
60350 + if (!dumpable)
60351 goto fail;
60352
60353 cred = prepare_creds();
60354 @@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60355 need_nonrelative = true;
60356 }
60357
60358 - retval = coredump_wait(siginfo->si_signo, &core_state);
60359 + retval = coredump_wait(signr, &core_state);
60360 if (retval < 0)
60361 goto fail_creds;
60362
60363 @@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60364 }
60365 cprm.limit = RLIM_INFINITY;
60366
60367 - dump_count = atomic_inc_return(&core_dump_count);
60368 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
60369 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60370 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60371 task_tgid_vnr(current), current->comm);
60372 @@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60373 } else {
60374 struct inode *inode;
60375
60376 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60377 +
60378 if (cprm.limit < binfmt->min_coredump)
60379 goto fail_unlock;
60380
60381 @@ -681,7 +690,7 @@ close_fail:
60382 filp_close(cprm.file, NULL);
60383 fail_dropcount:
60384 if (ispipe)
60385 - atomic_dec(&core_dump_count);
60386 + atomic_dec_unchecked(&core_dump_count);
60387 fail_unlock:
60388 kfree(cn.corename);
60389 coredump_finish(mm, core_dumped);
60390 @@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60391 struct file *file = cprm->file;
60392 loff_t pos = file->f_pos;
60393 ssize_t n;
60394 +
60395 + gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60396 if (cprm->written + nr > cprm->limit)
60397 return 0;
60398 while (nr) {
60399 diff --git a/fs/dcache.c b/fs/dcache.c
60400 index 71acf8d..815e743 100644
60401 --- a/fs/dcache.c
60402 +++ b/fs/dcache.c
60403 @@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60404 * dentry_iput drops the locks, at which point nobody (except
60405 * transient RCU lookups) can reach this dentry.
60406 */
60407 - BUG_ON((int)dentry->d_lockref.count > 0);
60408 + BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60409 this_cpu_dec(nr_dentry);
60410 if (dentry->d_op && dentry->d_op->d_release)
60411 dentry->d_op->d_release(dentry);
60412 @@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60413 struct dentry *parent = dentry->d_parent;
60414 if (IS_ROOT(dentry))
60415 return NULL;
60416 - if (unlikely((int)dentry->d_lockref.count < 0))
60417 + if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60418 return NULL;
60419 if (likely(spin_trylock(&parent->d_lock)))
60420 return parent;
60421 @@ -638,7 +638,7 @@ repeat:
60422 dentry->d_flags |= DCACHE_REFERENCED;
60423 dentry_lru_add(dentry);
60424
60425 - dentry->d_lockref.count--;
60426 + __lockref_dec(&dentry->d_lockref);
60427 spin_unlock(&dentry->d_lock);
60428 return;
60429
60430 @@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60431 /* This must be called with d_lock held */
60432 static inline void __dget_dlock(struct dentry *dentry)
60433 {
60434 - dentry->d_lockref.count++;
60435 + __lockref_inc(&dentry->d_lockref);
60436 }
60437
60438 static inline void __dget(struct dentry *dentry)
60439 @@ -694,8 +694,8 @@ repeat:
60440 goto repeat;
60441 }
60442 rcu_read_unlock();
60443 - BUG_ON(!ret->d_lockref.count);
60444 - ret->d_lockref.count++;
60445 + BUG_ON(!__lockref_read(&ret->d_lockref));
60446 + __lockref_inc(&ret->d_lockref);
60447 spin_unlock(&ret->d_lock);
60448 return ret;
60449 }
60450 @@ -773,9 +773,9 @@ restart:
60451 spin_lock(&inode->i_lock);
60452 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60453 spin_lock(&dentry->d_lock);
60454 - if (!dentry->d_lockref.count) {
60455 + if (!__lockref_read(&dentry->d_lockref)) {
60456 struct dentry *parent = lock_parent(dentry);
60457 - if (likely(!dentry->d_lockref.count)) {
60458 + if (likely(!__lockref_read(&dentry->d_lockref))) {
60459 __dentry_kill(dentry);
60460 dput(parent);
60461 goto restart;
60462 @@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60463 * We found an inuse dentry which was not removed from
60464 * the LRU because of laziness during lookup. Do not free it.
60465 */
60466 - if ((int)dentry->d_lockref.count > 0) {
60467 + if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60468 spin_unlock(&dentry->d_lock);
60469 if (parent)
60470 spin_unlock(&parent->d_lock);
60471 @@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60472 dentry = parent;
60473 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60474 parent = lock_parent(dentry);
60475 - if (dentry->d_lockref.count != 1) {
60476 - dentry->d_lockref.count--;
60477 + if (__lockref_read(&dentry->d_lockref) != 1) {
60478 + __lockref_inc(&dentry->d_lockref);
60479 spin_unlock(&dentry->d_lock);
60480 if (parent)
60481 spin_unlock(&parent->d_lock);
60482 @@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60483 * counts, just remove them from the LRU. Otherwise give them
60484 * another pass through the LRU.
60485 */
60486 - if (dentry->d_lockref.count) {
60487 + if (__lockref_read(&dentry->d_lockref) > 0) {
60488 d_lru_isolate(dentry);
60489 spin_unlock(&dentry->d_lock);
60490 return LRU_REMOVED;
60491 @@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60492 } else {
60493 if (dentry->d_flags & DCACHE_LRU_LIST)
60494 d_lru_del(dentry);
60495 - if (!dentry->d_lockref.count) {
60496 + if (!__lockref_read(&dentry->d_lockref)) {
60497 d_shrink_add(dentry, &data->dispose);
60498 data->found++;
60499 }
60500 @@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60501 return D_WALK_CONTINUE;
60502
60503 /* root with refcount 1 is fine */
60504 - if (dentry == _data && dentry->d_lockref.count == 1)
60505 + if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
60506 return D_WALK_CONTINUE;
60507
60508 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
60509 @@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60510 dentry->d_inode ?
60511 dentry->d_inode->i_ino : 0UL,
60512 dentry,
60513 - dentry->d_lockref.count,
60514 + __lockref_read(&dentry->d_lockref),
60515 dentry->d_sb->s_type->name,
60516 dentry->d_sb->s_id);
60517 WARN_ON(1);
60518 @@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60519 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
60520 if (name->len > DNAME_INLINE_LEN-1) {
60521 size_t size = offsetof(struct external_name, name[1]);
60522 - struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
60523 + struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
60524 if (!p) {
60525 kmem_cache_free(dentry_cache, dentry);
60526 return NULL;
60527 @@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60528 smp_wmb();
60529 dentry->d_name.name = dname;
60530
60531 - dentry->d_lockref.count = 1;
60532 + __lockref_set(&dentry->d_lockref, 1);
60533 dentry->d_flags = 0;
60534 spin_lock_init(&dentry->d_lock);
60535 seqcount_init(&dentry->d_seq);
60536 @@ -2183,7 +2183,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
60537 goto next;
60538 }
60539
60540 - dentry->d_lockref.count++;
60541 + __lockref_inc(&dentry->d_lockref);
60542 found = dentry;
60543 spin_unlock(&dentry->d_lock);
60544 break;
60545 @@ -2282,7 +2282,7 @@ again:
60546 spin_lock(&dentry->d_lock);
60547 inode = dentry->d_inode;
60548 isdir = S_ISDIR(inode->i_mode);
60549 - if (dentry->d_lockref.count == 1) {
60550 + if (__lockref_read(&dentry->d_lockref) == 1) {
60551 if (!spin_trylock(&inode->i_lock)) {
60552 spin_unlock(&dentry->d_lock);
60553 cpu_relax();
60554 @@ -3306,7 +3306,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
60555
60556 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
60557 dentry->d_flags |= DCACHE_GENOCIDE;
60558 - dentry->d_lockref.count--;
60559 + __lockref_dec(&dentry->d_lockref);
60560 }
60561 }
60562 return D_WALK_CONTINUE;
60563 @@ -3422,7 +3422,8 @@ void __init vfs_caches_init(unsigned long mempages)
60564 mempages -= reserve;
60565
60566 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
60567 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
60568 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
60569 + SLAB_NO_SANITIZE, NULL);
60570
60571 dcache_init();
60572 inode_init();
60573 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
60574 index 05f2960..b012481 100644
60575 --- a/fs/debugfs/inode.c
60576 +++ b/fs/debugfs/inode.c
60577 @@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
60578 */
60579 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
60580 {
60581 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
60582 + return __create_file(name, S_IFDIR | S_IRWXU,
60583 +#else
60584 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
60585 +#endif
60586 parent, NULL, NULL);
60587 }
60588 EXPORT_SYMBOL_GPL(debugfs_create_dir);
60589 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
60590 index 1686dc2..9611c50 100644
60591 --- a/fs/ecryptfs/inode.c
60592 +++ b/fs/ecryptfs/inode.c
60593 @@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
60594 old_fs = get_fs();
60595 set_fs(get_ds());
60596 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
60597 - (char __user *)lower_buf,
60598 + (char __force_user *)lower_buf,
60599 PATH_MAX);
60600 set_fs(old_fs);
60601 if (rc < 0)
60602 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
60603 index e4141f2..d8263e8 100644
60604 --- a/fs/ecryptfs/miscdev.c
60605 +++ b/fs/ecryptfs/miscdev.c
60606 @@ -304,7 +304,7 @@ check_list:
60607 goto out_unlock_msg_ctx;
60608 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
60609 if (msg_ctx->msg) {
60610 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
60611 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
60612 goto out_unlock_msg_ctx;
60613 i += packet_length_size;
60614 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
60615 diff --git a/fs/exec.c b/fs/exec.c
60616 index 7302b75..7d61d19 100644
60617 --- a/fs/exec.c
60618 +++ b/fs/exec.c
60619 @@ -56,8 +56,20 @@
60620 #include <linux/pipe_fs_i.h>
60621 #include <linux/oom.h>
60622 #include <linux/compat.h>
60623 +#include <linux/random.h>
60624 +#include <linux/seq_file.h>
60625 +#include <linux/coredump.h>
60626 +#include <linux/mman.h>
60627 +
60628 +#ifdef CONFIG_PAX_REFCOUNT
60629 +#include <linux/kallsyms.h>
60630 +#include <linux/kdebug.h>
60631 +#endif
60632 +
60633 +#include <trace/events/fs.h>
60634
60635 #include <asm/uaccess.h>
60636 +#include <asm/sections.h>
60637 #include <asm/mmu_context.h>
60638 #include <asm/tlb.h>
60639
60640 @@ -66,19 +78,34 @@
60641
60642 #include <trace/events/sched.h>
60643
60644 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60645 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
60646 +{
60647 + 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");
60648 +}
60649 +#endif
60650 +
60651 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
60652 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60653 +EXPORT_SYMBOL(pax_set_initial_flags_func);
60654 +#endif
60655 +
60656 int suid_dumpable = 0;
60657
60658 static LIST_HEAD(formats);
60659 static DEFINE_RWLOCK(binfmt_lock);
60660
60661 +extern int gr_process_kernel_exec_ban(void);
60662 +extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
60663 +
60664 void __register_binfmt(struct linux_binfmt * fmt, int insert)
60665 {
60666 BUG_ON(!fmt);
60667 if (WARN_ON(!fmt->load_binary))
60668 return;
60669 write_lock(&binfmt_lock);
60670 - insert ? list_add(&fmt->lh, &formats) :
60671 - list_add_tail(&fmt->lh, &formats);
60672 + insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
60673 + pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
60674 write_unlock(&binfmt_lock);
60675 }
60676
60677 @@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
60678 void unregister_binfmt(struct linux_binfmt * fmt)
60679 {
60680 write_lock(&binfmt_lock);
60681 - list_del(&fmt->lh);
60682 + pax_list_del((struct list_head *)&fmt->lh);
60683 write_unlock(&binfmt_lock);
60684 }
60685
60686 @@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60687 int write)
60688 {
60689 struct page *page;
60690 - int ret;
60691
60692 -#ifdef CONFIG_STACK_GROWSUP
60693 - if (write) {
60694 - ret = expand_downwards(bprm->vma, pos);
60695 - if (ret < 0)
60696 - return NULL;
60697 - }
60698 -#endif
60699 - ret = get_user_pages(current, bprm->mm, pos,
60700 - 1, write, 1, &page, NULL);
60701 - if (ret <= 0)
60702 + if (0 > expand_downwards(bprm->vma, pos))
60703 + return NULL;
60704 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
60705 return NULL;
60706
60707 if (write) {
60708 @@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60709 if (size <= ARG_MAX)
60710 return page;
60711
60712 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60713 + // only allow 512KB for argv+env on suid/sgid binaries
60714 + // to prevent easy ASLR exhaustion
60715 + if (((!uid_eq(bprm->cred->euid, current_euid())) ||
60716 + (!gid_eq(bprm->cred->egid, current_egid()))) &&
60717 + (size > (512 * 1024))) {
60718 + put_page(page);
60719 + return NULL;
60720 + }
60721 +#endif
60722 +
60723 /*
60724 * Limit to 1/4-th the stack size for the argv+env strings.
60725 * This ensures that:
60726 @@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60727 vma->vm_end = STACK_TOP_MAX;
60728 vma->vm_start = vma->vm_end - PAGE_SIZE;
60729 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
60730 +
60731 +#ifdef CONFIG_PAX_SEGMEXEC
60732 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
60733 +#endif
60734 +
60735 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
60736 INIT_LIST_HEAD(&vma->anon_vma_chain);
60737
60738 @@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60739 mm->stack_vm = mm->total_vm = 1;
60740 up_write(&mm->mmap_sem);
60741 bprm->p = vma->vm_end - sizeof(void *);
60742 +
60743 +#ifdef CONFIG_PAX_RANDUSTACK
60744 + if (randomize_va_space)
60745 + bprm->p ^= prandom_u32() & ~PAGE_MASK;
60746 +#endif
60747 +
60748 return 0;
60749 err:
60750 up_write(&mm->mmap_sem);
60751 @@ -395,7 +436,7 @@ struct user_arg_ptr {
60752 } ptr;
60753 };
60754
60755 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60756 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60757 {
60758 const char __user *native;
60759
60760 @@ -404,14 +445,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60761 compat_uptr_t compat;
60762
60763 if (get_user(compat, argv.ptr.compat + nr))
60764 - return ERR_PTR(-EFAULT);
60765 + return (const char __force_user *)ERR_PTR(-EFAULT);
60766
60767 return compat_ptr(compat);
60768 }
60769 #endif
60770
60771 if (get_user(native, argv.ptr.native + nr))
60772 - return ERR_PTR(-EFAULT);
60773 + return (const char __force_user *)ERR_PTR(-EFAULT);
60774
60775 return native;
60776 }
60777 @@ -430,7 +471,7 @@ static int count(struct user_arg_ptr argv, int max)
60778 if (!p)
60779 break;
60780
60781 - if (IS_ERR(p))
60782 + if (IS_ERR((const char __force_kernel *)p))
60783 return -EFAULT;
60784
60785 if (i >= max)
60786 @@ -465,7 +506,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
60787
60788 ret = -EFAULT;
60789 str = get_user_arg_ptr(argv, argc);
60790 - if (IS_ERR(str))
60791 + if (IS_ERR((const char __force_kernel *)str))
60792 goto out;
60793
60794 len = strnlen_user(str, MAX_ARG_STRLEN);
60795 @@ -547,7 +588,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
60796 int r;
60797 mm_segment_t oldfs = get_fs();
60798 struct user_arg_ptr argv = {
60799 - .ptr.native = (const char __user *const __user *)__argv,
60800 + .ptr.native = (const char __user * const __force_user *)__argv,
60801 };
60802
60803 set_fs(KERNEL_DS);
60804 @@ -582,7 +623,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60805 unsigned long new_end = old_end - shift;
60806 struct mmu_gather tlb;
60807
60808 - BUG_ON(new_start > new_end);
60809 + if (new_start >= new_end || new_start < mmap_min_addr)
60810 + return -ENOMEM;
60811
60812 /*
60813 * ensure there are no vmas between where we want to go
60814 @@ -591,6 +633,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60815 if (vma != find_vma(mm, new_start))
60816 return -EFAULT;
60817
60818 +#ifdef CONFIG_PAX_SEGMEXEC
60819 + BUG_ON(pax_find_mirror_vma(vma));
60820 +#endif
60821 +
60822 /*
60823 * cover the whole range: [new_start, old_end)
60824 */
60825 @@ -671,10 +717,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60826 stack_top = arch_align_stack(stack_top);
60827 stack_top = PAGE_ALIGN(stack_top);
60828
60829 - if (unlikely(stack_top < mmap_min_addr) ||
60830 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
60831 - return -ENOMEM;
60832 -
60833 stack_shift = vma->vm_end - stack_top;
60834
60835 bprm->p -= stack_shift;
60836 @@ -686,8 +728,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
60837 bprm->exec -= stack_shift;
60838
60839 down_write(&mm->mmap_sem);
60840 +
60841 + /* Move stack pages down in memory. */
60842 + if (stack_shift) {
60843 + ret = shift_arg_pages(vma, stack_shift);
60844 + if (ret)
60845 + goto out_unlock;
60846 + }
60847 +
60848 vm_flags = VM_STACK_FLAGS;
60849
60850 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
60851 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
60852 + vm_flags &= ~VM_EXEC;
60853 +
60854 +#ifdef CONFIG_PAX_MPROTECT
60855 + if (mm->pax_flags & MF_PAX_MPROTECT)
60856 + vm_flags &= ~VM_MAYEXEC;
60857 +#endif
60858 +
60859 + }
60860 +#endif
60861 +
60862 /*
60863 * Adjust stack execute permissions; explicitly enable for
60864 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
60865 @@ -706,13 +768,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60866 goto out_unlock;
60867 BUG_ON(prev != vma);
60868
60869 - /* Move stack pages down in memory. */
60870 - if (stack_shift) {
60871 - ret = shift_arg_pages(vma, stack_shift);
60872 - if (ret)
60873 - goto out_unlock;
60874 - }
60875 -
60876 /* mprotect_fixup is overkill to remove the temporary stack flags */
60877 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
60878
60879 @@ -736,6 +791,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
60880 #endif
60881 current->mm->start_stack = bprm->p;
60882 ret = expand_stack(vma, stack_base);
60883 +
60884 +#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
60885 + if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
60886 + unsigned long size;
60887 + vm_flags_t vm_flags;
60888 +
60889 + size = STACK_TOP - vma->vm_end;
60890 + vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
60891 +
60892 + ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
60893 +
60894 +#ifdef CONFIG_X86
60895 + if (!ret) {
60896 + size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
60897 + ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
60898 + }
60899 +#endif
60900 +
60901 + }
60902 +#endif
60903 +
60904 if (ret)
60905 ret = -EFAULT;
60906
60907 @@ -771,6 +847,8 @@ static struct file *do_open_exec(struct filename *name)
60908
60909 fsnotify_open(file);
60910
60911 + trace_open_exec(name->name);
60912 +
60913 err = deny_write_access(file);
60914 if (err)
60915 goto exit;
60916 @@ -800,7 +878,7 @@ int kernel_read(struct file *file, loff_t offset,
60917 old_fs = get_fs();
60918 set_fs(get_ds());
60919 /* The cast to a user pointer is valid due to the set_fs() */
60920 - result = vfs_read(file, (void __user *)addr, count, &pos);
60921 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
60922 set_fs(old_fs);
60923 return result;
60924 }
60925 @@ -845,6 +923,7 @@ static int exec_mmap(struct mm_struct *mm)
60926 tsk->mm = mm;
60927 tsk->active_mm = mm;
60928 activate_mm(active_mm, mm);
60929 + populate_stack();
60930 tsk->mm->vmacache_seqnum = 0;
60931 vmacache_flush(tsk);
60932 task_unlock(tsk);
60933 @@ -1243,7 +1322,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
60934 }
60935 rcu_read_unlock();
60936
60937 - if (p->fs->users > n_fs)
60938 + if (atomic_read(&p->fs->users) > n_fs)
60939 bprm->unsafe |= LSM_UNSAFE_SHARE;
60940 else
60941 p->fs->in_exec = 1;
60942 @@ -1424,6 +1503,31 @@ static int exec_binprm(struct linux_binprm *bprm)
60943 return ret;
60944 }
60945
60946 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60947 +static DEFINE_PER_CPU(u64, exec_counter);
60948 +static int __init init_exec_counters(void)
60949 +{
60950 + unsigned int cpu;
60951 +
60952 + for_each_possible_cpu(cpu) {
60953 + per_cpu(exec_counter, cpu) = (u64)cpu;
60954 + }
60955 +
60956 + return 0;
60957 +}
60958 +early_initcall(init_exec_counters);
60959 +static inline void increment_exec_counter(void)
60960 +{
60961 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
60962 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
60963 +}
60964 +#else
60965 +static inline void increment_exec_counter(void) {}
60966 +#endif
60967 +
60968 +extern void gr_handle_exec_args(struct linux_binprm *bprm,
60969 + struct user_arg_ptr argv);
60970 +
60971 /*
60972 * sys_execve() executes a new program.
60973 */
60974 @@ -1431,6 +1535,11 @@ static int do_execve_common(struct filename *filename,
60975 struct user_arg_ptr argv,
60976 struct user_arg_ptr envp)
60977 {
60978 +#ifdef CONFIG_GRKERNSEC
60979 + struct file *old_exec_file;
60980 + struct acl_subject_label *old_acl;
60981 + struct rlimit old_rlim[RLIM_NLIMITS];
60982 +#endif
60983 struct linux_binprm *bprm;
60984 struct file *file;
60985 struct files_struct *displaced;
60986 @@ -1439,6 +1548,8 @@ static int do_execve_common(struct filename *filename,
60987 if (IS_ERR(filename))
60988 return PTR_ERR(filename);
60989
60990 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
60991 +
60992 /*
60993 * We move the actual failure in case of RLIMIT_NPROC excess from
60994 * set*uid() to execve() because too many poorly written programs
60995 @@ -1476,11 +1587,21 @@ static int do_execve_common(struct filename *filename,
60996 if (IS_ERR(file))
60997 goto out_unmark;
60998
60999 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
61000 + retval = -EPERM;
61001 + goto out_unmark;
61002 + }
61003 +
61004 sched_exec();
61005
61006 bprm->file = file;
61007 bprm->filename = bprm->interp = filename->name;
61008
61009 + if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
61010 + retval = -EACCES;
61011 + goto out_unmark;
61012 + }
61013 +
61014 retval = bprm_mm_init(bprm);
61015 if (retval)
61016 goto out_unmark;
61017 @@ -1497,24 +1618,70 @@ static int do_execve_common(struct filename *filename,
61018 if (retval < 0)
61019 goto out;
61020
61021 +#ifdef CONFIG_GRKERNSEC
61022 + old_acl = current->acl;
61023 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
61024 + old_exec_file = current->exec_file;
61025 + get_file(file);
61026 + current->exec_file = file;
61027 +#endif
61028 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61029 + /* limit suid stack to 8MB
61030 + * we saved the old limits above and will restore them if this exec fails
61031 + */
61032 + if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
61033 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
61034 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
61035 +#endif
61036 +
61037 + if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
61038 + retval = -EPERM;
61039 + goto out_fail;
61040 + }
61041 +
61042 + if (!gr_tpe_allow(file)) {
61043 + retval = -EACCES;
61044 + goto out_fail;
61045 + }
61046 +
61047 + if (gr_check_crash_exec(file)) {
61048 + retval = -EACCES;
61049 + goto out_fail;
61050 + }
61051 +
61052 + retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
61053 + bprm->unsafe);
61054 + if (retval < 0)
61055 + goto out_fail;
61056 +
61057 retval = copy_strings_kernel(1, &bprm->filename, bprm);
61058 if (retval < 0)
61059 - goto out;
61060 + goto out_fail;
61061
61062 bprm->exec = bprm->p;
61063 retval = copy_strings(bprm->envc, envp, bprm);
61064 if (retval < 0)
61065 - goto out;
61066 + goto out_fail;
61067
61068 retval = copy_strings(bprm->argc, argv, bprm);
61069 if (retval < 0)
61070 - goto out;
61071 + goto out_fail;
61072 +
61073 + gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61074 +
61075 + gr_handle_exec_args(bprm, argv);
61076
61077 retval = exec_binprm(bprm);
61078 if (retval < 0)
61079 - goto out;
61080 + goto out_fail;
61081 +#ifdef CONFIG_GRKERNSEC
61082 + if (old_exec_file)
61083 + fput(old_exec_file);
61084 +#endif
61085
61086 /* execve succeeded */
61087 +
61088 + increment_exec_counter();
61089 current->fs->in_exec = 0;
61090 current->in_execve = 0;
61091 acct_update_integrals(current);
61092 @@ -1525,6 +1692,14 @@ static int do_execve_common(struct filename *filename,
61093 put_files_struct(displaced);
61094 return retval;
61095
61096 +out_fail:
61097 +#ifdef CONFIG_GRKERNSEC
61098 + current->acl = old_acl;
61099 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61100 + fput(current->exec_file);
61101 + current->exec_file = old_exec_file;
61102 +#endif
61103 +
61104 out:
61105 if (bprm->mm) {
61106 acct_arg_size(bprm, 0);
61107 @@ -1616,3 +1791,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
61108 return compat_do_execve(getname(filename), argv, envp);
61109 }
61110 #endif
61111 +
61112 +int pax_check_flags(unsigned long *flags)
61113 +{
61114 + int retval = 0;
61115 +
61116 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61117 + if (*flags & MF_PAX_SEGMEXEC)
61118 + {
61119 + *flags &= ~MF_PAX_SEGMEXEC;
61120 + retval = -EINVAL;
61121 + }
61122 +#endif
61123 +
61124 + if ((*flags & MF_PAX_PAGEEXEC)
61125 +
61126 +#ifdef CONFIG_PAX_PAGEEXEC
61127 + && (*flags & MF_PAX_SEGMEXEC)
61128 +#endif
61129 +
61130 + )
61131 + {
61132 + *flags &= ~MF_PAX_PAGEEXEC;
61133 + retval = -EINVAL;
61134 + }
61135 +
61136 + if ((*flags & MF_PAX_MPROTECT)
61137 +
61138 +#ifdef CONFIG_PAX_MPROTECT
61139 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61140 +#endif
61141 +
61142 + )
61143 + {
61144 + *flags &= ~MF_PAX_MPROTECT;
61145 + retval = -EINVAL;
61146 + }
61147 +
61148 + if ((*flags & MF_PAX_EMUTRAMP)
61149 +
61150 +#ifdef CONFIG_PAX_EMUTRAMP
61151 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61152 +#endif
61153 +
61154 + )
61155 + {
61156 + *flags &= ~MF_PAX_EMUTRAMP;
61157 + retval = -EINVAL;
61158 + }
61159 +
61160 + return retval;
61161 +}
61162 +
61163 +EXPORT_SYMBOL(pax_check_flags);
61164 +
61165 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61166 +char *pax_get_path(const struct path *path, char *buf, int buflen)
61167 +{
61168 + char *pathname = d_path(path, buf, buflen);
61169 +
61170 + if (IS_ERR(pathname))
61171 + goto toolong;
61172 +
61173 + pathname = mangle_path(buf, pathname, "\t\n\\");
61174 + if (!pathname)
61175 + goto toolong;
61176 +
61177 + *pathname = 0;
61178 + return buf;
61179 +
61180 +toolong:
61181 + return "<path too long>";
61182 +}
61183 +EXPORT_SYMBOL(pax_get_path);
61184 +
61185 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61186 +{
61187 + struct task_struct *tsk = current;
61188 + struct mm_struct *mm = current->mm;
61189 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61190 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61191 + char *path_exec = NULL;
61192 + char *path_fault = NULL;
61193 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
61194 + siginfo_t info = { };
61195 +
61196 + if (buffer_exec && buffer_fault) {
61197 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61198 +
61199 + down_read(&mm->mmap_sem);
61200 + vma = mm->mmap;
61201 + while (vma && (!vma_exec || !vma_fault)) {
61202 + if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61203 + vma_exec = vma;
61204 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61205 + vma_fault = vma;
61206 + vma = vma->vm_next;
61207 + }
61208 + if (vma_exec)
61209 + path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61210 + if (vma_fault) {
61211 + start = vma_fault->vm_start;
61212 + end = vma_fault->vm_end;
61213 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61214 + if (vma_fault->vm_file)
61215 + path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61216 + else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61217 + path_fault = "<heap>";
61218 + else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61219 + path_fault = "<stack>";
61220 + else
61221 + path_fault = "<anonymous mapping>";
61222 + }
61223 + up_read(&mm->mmap_sem);
61224 + }
61225 + if (tsk->signal->curr_ip)
61226 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61227 + else
61228 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61229 + 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),
61230 + from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61231 + free_page((unsigned long)buffer_exec);
61232 + free_page((unsigned long)buffer_fault);
61233 + pax_report_insns(regs, pc, sp);
61234 + info.si_signo = SIGKILL;
61235 + info.si_errno = 0;
61236 + info.si_code = SI_KERNEL;
61237 + info.si_pid = 0;
61238 + info.si_uid = 0;
61239 + do_coredump(&info);
61240 +}
61241 +#endif
61242 +
61243 +#ifdef CONFIG_PAX_REFCOUNT
61244 +void pax_report_refcount_overflow(struct pt_regs *regs)
61245 +{
61246 + if (current->signal->curr_ip)
61247 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61248 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
61249 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61250 + else
61251 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61252 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61253 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61254 + preempt_disable();
61255 + show_regs(regs);
61256 + preempt_enable();
61257 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61258 +}
61259 +#endif
61260 +
61261 +#ifdef CONFIG_PAX_USERCOPY
61262 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61263 +static noinline int check_stack_object(const void *obj, unsigned long len)
61264 +{
61265 + const void * const stack = task_stack_page(current);
61266 + const void * const stackend = stack + THREAD_SIZE;
61267 +
61268 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61269 + const void *frame = NULL;
61270 + const void *oldframe;
61271 +#endif
61272 +
61273 + if (obj + len < obj)
61274 + return -1;
61275 +
61276 + if (obj + len <= stack || stackend <= obj)
61277 + return 0;
61278 +
61279 + if (obj < stack || stackend < obj + len)
61280 + return -1;
61281 +
61282 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61283 + oldframe = __builtin_frame_address(1);
61284 + if (oldframe)
61285 + frame = __builtin_frame_address(2);
61286 + /*
61287 + low ----------------------------------------------> high
61288 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
61289 + ^----------------^
61290 + allow copies only within here
61291 + */
61292 + while (stack <= frame && frame < stackend) {
61293 + /* if obj + len extends past the last frame, this
61294 + check won't pass and the next frame will be 0,
61295 + causing us to bail out and correctly report
61296 + the copy as invalid
61297 + */
61298 + if (obj + len <= frame)
61299 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61300 + oldframe = frame;
61301 + frame = *(const void * const *)frame;
61302 + }
61303 + return -1;
61304 +#else
61305 + return 1;
61306 +#endif
61307 +}
61308 +
61309 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61310 +{
61311 + if (current->signal->curr_ip)
61312 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61313 + &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61314 + else
61315 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61316 + to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61317 + dump_stack();
61318 + gr_handle_kernel_exploit();
61319 + do_group_exit(SIGKILL);
61320 +}
61321 +#endif
61322 +
61323 +#ifdef CONFIG_PAX_USERCOPY
61324 +
61325 +static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61326 +{
61327 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61328 + unsigned long textlow = ktla_ktva((unsigned long)_stext);
61329 +#ifdef CONFIG_MODULES
61330 + unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61331 +#else
61332 + unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61333 +#endif
61334 +
61335 +#else
61336 + unsigned long textlow = (unsigned long)_stext;
61337 + unsigned long texthigh = (unsigned long)_etext;
61338 +
61339 +#ifdef CONFIG_X86_64
61340 + /* check against linear mapping as well */
61341 + if (high > (unsigned long)__va(__pa(textlow)) &&
61342 + low < (unsigned long)__va(__pa(texthigh)))
61343 + return true;
61344 +#endif
61345 +
61346 +#endif
61347 +
61348 + if (high <= textlow || low >= texthigh)
61349 + return false;
61350 + else
61351 + return true;
61352 +}
61353 +#endif
61354 +
61355 +void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61356 +{
61357 +#ifdef CONFIG_PAX_USERCOPY
61358 + const char *type;
61359 +#endif
61360 +
61361 +#ifndef CONFIG_STACK_GROWSUP
61362 + unsigned long stackstart = (unsigned long)task_stack_page(current);
61363 + unsigned long currentsp = (unsigned long)&stackstart;
61364 + if (unlikely((currentsp < stackstart + 512 ||
61365 + currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61366 + BUG();
61367 +#endif
61368 +
61369 +#ifndef CONFIG_PAX_USERCOPY_DEBUG
61370 + if (const_size)
61371 + return;
61372 +#endif
61373 +
61374 +#ifdef CONFIG_PAX_USERCOPY
61375 + if (!n)
61376 + return;
61377 +
61378 + type = check_heap_object(ptr, n);
61379 + if (!type) {
61380 + int ret = check_stack_object(ptr, n);
61381 + if (ret == 1 || ret == 2)
61382 + return;
61383 + if (ret == 0) {
61384 + if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61385 + type = "<kernel text>";
61386 + else
61387 + return;
61388 + } else
61389 + type = "<process stack>";
61390 + }
61391 +
61392 + pax_report_usercopy(ptr, n, to_user, type);
61393 +#endif
61394 +
61395 +}
61396 +EXPORT_SYMBOL(__check_object_size);
61397 +
61398 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61399 +void pax_track_stack(void)
61400 +{
61401 + unsigned long sp = (unsigned long)&sp;
61402 + if (sp < current_thread_info()->lowest_stack &&
61403 + sp > (unsigned long)task_stack_page(current))
61404 + current_thread_info()->lowest_stack = sp;
61405 + if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61406 + BUG();
61407 +}
61408 +EXPORT_SYMBOL(pax_track_stack);
61409 +#endif
61410 +
61411 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
61412 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61413 +{
61414 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61415 + dump_stack();
61416 + do_group_exit(SIGKILL);
61417 +}
61418 +EXPORT_SYMBOL(report_size_overflow);
61419 +#endif
61420 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61421 index 9f9992b..8b59411 100644
61422 --- a/fs/ext2/balloc.c
61423 +++ b/fs/ext2/balloc.c
61424 @@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61425
61426 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61427 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61428 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61429 + if (free_blocks < root_blocks + 1 &&
61430 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61431 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61432 - !in_group_p (sbi->s_resgid))) {
61433 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61434 return 0;
61435 }
61436 return 1;
61437 diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61438 index 170dc41..62f6b18 100644
61439 --- a/fs/ext2/super.c
61440 +++ b/fs/ext2/super.c
61441 @@ -264,10 +264,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61442 #ifdef CONFIG_EXT2_FS_XATTR
61443 if (test_opt(sb, XATTR_USER))
61444 seq_puts(seq, ",user_xattr");
61445 - if (!test_opt(sb, XATTR_USER) &&
61446 - (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61447 + if (!test_opt(sb, XATTR_USER))
61448 seq_puts(seq, ",nouser_xattr");
61449 - }
61450 #endif
61451
61452 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61453 @@ -841,8 +839,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
61454 if (def_mount_opts & EXT2_DEFM_UID16)
61455 set_opt(sbi->s_mount_opt, NO_UID32);
61456 #ifdef CONFIG_EXT2_FS_XATTR
61457 - if (def_mount_opts & EXT2_DEFM_XATTR_USER)
61458 - set_opt(sbi->s_mount_opt, XATTR_USER);
61459 + /* always enable user xattrs */
61460 + set_opt(sbi->s_mount_opt, XATTR_USER);
61461 #endif
61462 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61463 if (def_mount_opts & EXT2_DEFM_ACL)
61464 diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
61465 index 9142614..97484fa 100644
61466 --- a/fs/ext2/xattr.c
61467 +++ b/fs/ext2/xattr.c
61468 @@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
61469 struct buffer_head *bh = NULL;
61470 struct ext2_xattr_entry *entry;
61471 char *end;
61472 - size_t rest = buffer_size;
61473 + size_t rest = buffer_size, total_size = 0;
61474 int error;
61475
61476 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
61477 @@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
61478 buffer += size;
61479 }
61480 rest -= size;
61481 + total_size += size;
61482 }
61483 }
61484 - error = buffer_size - rest; /* total size */
61485 + error = total_size;
61486
61487 cleanup:
61488 brelse(bh);
61489 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
61490 index 158b5d4..2432610 100644
61491 --- a/fs/ext3/balloc.c
61492 +++ b/fs/ext3/balloc.c
61493 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
61494
61495 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61496 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61497 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61498 + if (free_blocks < root_blocks + 1 &&
61499 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
61500 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61501 - !in_group_p (sbi->s_resgid))) {
61502 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61503 return 0;
61504 }
61505 return 1;
61506 diff --git a/fs/ext3/super.c b/fs/ext3/super.c
61507 index eb742d0..c19f705 100644
61508 --- a/fs/ext3/super.c
61509 +++ b/fs/ext3/super.c
61510 @@ -649,10 +649,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
61511 #ifdef CONFIG_EXT3_FS_XATTR
61512 if (test_opt(sb, XATTR_USER))
61513 seq_puts(seq, ",user_xattr");
61514 - if (!test_opt(sb, XATTR_USER) &&
61515 - (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
61516 + if (!test_opt(sb, XATTR_USER))
61517 seq_puts(seq, ",nouser_xattr");
61518 - }
61519 #endif
61520 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61521 if (test_opt(sb, POSIX_ACL))
61522 @@ -1749,8 +1747,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
61523 if (def_mount_opts & EXT3_DEFM_UID16)
61524 set_opt(sbi->s_mount_opt, NO_UID32);
61525 #ifdef CONFIG_EXT3_FS_XATTR
61526 - if (def_mount_opts & EXT3_DEFM_XATTR_USER)
61527 - set_opt(sbi->s_mount_opt, XATTR_USER);
61528 + /* always enable user xattrs */
61529 + set_opt(sbi->s_mount_opt, XATTR_USER);
61530 #endif
61531 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61532 if (def_mount_opts & EXT3_DEFM_ACL)
61533 diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
61534 index c6874be..f8a6ae8 100644
61535 --- a/fs/ext3/xattr.c
61536 +++ b/fs/ext3/xattr.c
61537 @@ -330,7 +330,7 @@ static int
61538 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61539 char *buffer, size_t buffer_size)
61540 {
61541 - size_t rest = buffer_size;
61542 + size_t rest = buffer_size, total_size = 0;
61543
61544 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
61545 const struct xattr_handler *handler =
61546 @@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61547 buffer += size;
61548 }
61549 rest -= size;
61550 + total_size += size;
61551 }
61552 }
61553 - return buffer_size - rest;
61554 + return total_size;
61555 }
61556
61557 static int
61558 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
61559 index 83a6f49..d4e4d03 100644
61560 --- a/fs/ext4/balloc.c
61561 +++ b/fs/ext4/balloc.c
61562 @@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
61563 /* Hm, nope. Are (enough) root reserved clusters available? */
61564 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
61565 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
61566 - capable(CAP_SYS_RESOURCE) ||
61567 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
61568 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
61569 + capable_nolog(CAP_SYS_RESOURCE)) {
61570
61571 if (free_clusters >= (nclusters + dirty_clusters +
61572 resv_clusters))
61573 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
61574 index c55a1fa..9904ebb 100644
61575 --- a/fs/ext4/ext4.h
61576 +++ b/fs/ext4/ext4.h
61577 @@ -1279,19 +1279,19 @@ struct ext4_sb_info {
61578 unsigned long s_mb_last_start;
61579
61580 /* stats for buddy allocator */
61581 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
61582 - atomic_t s_bal_success; /* we found long enough chunks */
61583 - atomic_t s_bal_allocated; /* in blocks */
61584 - atomic_t s_bal_ex_scanned; /* total extents scanned */
61585 - atomic_t s_bal_goals; /* goal hits */
61586 - atomic_t s_bal_breaks; /* too long searches */
61587 - atomic_t s_bal_2orders; /* 2^order hits */
61588 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
61589 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
61590 + atomic_unchecked_t s_bal_allocated; /* in blocks */
61591 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
61592 + atomic_unchecked_t s_bal_goals; /* goal hits */
61593 + atomic_unchecked_t s_bal_breaks; /* too long searches */
61594 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
61595 spinlock_t s_bal_lock;
61596 unsigned long s_mb_buddies_generated;
61597 unsigned long long s_mb_generation_time;
61598 - atomic_t s_mb_lost_chunks;
61599 - atomic_t s_mb_preallocated;
61600 - atomic_t s_mb_discarded;
61601 + atomic_unchecked_t s_mb_lost_chunks;
61602 + atomic_unchecked_t s_mb_preallocated;
61603 + atomic_unchecked_t s_mb_discarded;
61604 atomic_t s_lock_busy;
61605
61606 /* locality groups */
61607 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
61608 index dbfe15c..9a6ee8d 100644
61609 --- a/fs/ext4/mballoc.c
61610 +++ b/fs/ext4/mballoc.c
61611 @@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
61612 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
61613
61614 if (EXT4_SB(sb)->s_mb_stats)
61615 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
61616 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
61617
61618 break;
61619 }
61620 @@ -2211,7 +2211,7 @@ repeat:
61621 ac->ac_status = AC_STATUS_CONTINUE;
61622 ac->ac_flags |= EXT4_MB_HINT_FIRST;
61623 cr = 3;
61624 - atomic_inc(&sbi->s_mb_lost_chunks);
61625 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
61626 goto repeat;
61627 }
61628 }
61629 @@ -2717,25 +2717,25 @@ int ext4_mb_release(struct super_block *sb)
61630 if (sbi->s_mb_stats) {
61631 ext4_msg(sb, KERN_INFO,
61632 "mballoc: %u blocks %u reqs (%u success)",
61633 - atomic_read(&sbi->s_bal_allocated),
61634 - atomic_read(&sbi->s_bal_reqs),
61635 - atomic_read(&sbi->s_bal_success));
61636 + atomic_read_unchecked(&sbi->s_bal_allocated),
61637 + atomic_read_unchecked(&sbi->s_bal_reqs),
61638 + atomic_read_unchecked(&sbi->s_bal_success));
61639 ext4_msg(sb, KERN_INFO,
61640 "mballoc: %u extents scanned, %u goal hits, "
61641 "%u 2^N hits, %u breaks, %u lost",
61642 - atomic_read(&sbi->s_bal_ex_scanned),
61643 - atomic_read(&sbi->s_bal_goals),
61644 - atomic_read(&sbi->s_bal_2orders),
61645 - atomic_read(&sbi->s_bal_breaks),
61646 - atomic_read(&sbi->s_mb_lost_chunks));
61647 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
61648 + atomic_read_unchecked(&sbi->s_bal_goals),
61649 + atomic_read_unchecked(&sbi->s_bal_2orders),
61650 + atomic_read_unchecked(&sbi->s_bal_breaks),
61651 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
61652 ext4_msg(sb, KERN_INFO,
61653 "mballoc: %lu generated and it took %Lu",
61654 sbi->s_mb_buddies_generated,
61655 sbi->s_mb_generation_time);
61656 ext4_msg(sb, KERN_INFO,
61657 "mballoc: %u preallocated, %u discarded",
61658 - atomic_read(&sbi->s_mb_preallocated),
61659 - atomic_read(&sbi->s_mb_discarded));
61660 + atomic_read_unchecked(&sbi->s_mb_preallocated),
61661 + atomic_read_unchecked(&sbi->s_mb_discarded));
61662 }
61663
61664 free_percpu(sbi->s_locality_groups);
61665 @@ -3191,16 +3191,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
61666 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
61667
61668 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
61669 - atomic_inc(&sbi->s_bal_reqs);
61670 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61671 + atomic_inc_unchecked(&sbi->s_bal_reqs);
61672 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61673 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
61674 - atomic_inc(&sbi->s_bal_success);
61675 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
61676 + atomic_inc_unchecked(&sbi->s_bal_success);
61677 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
61678 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
61679 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
61680 - atomic_inc(&sbi->s_bal_goals);
61681 + atomic_inc_unchecked(&sbi->s_bal_goals);
61682 if (ac->ac_found > sbi->s_mb_max_to_scan)
61683 - atomic_inc(&sbi->s_bal_breaks);
61684 + atomic_inc_unchecked(&sbi->s_bal_breaks);
61685 }
61686
61687 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
61688 @@ -3627,7 +3627,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
61689 trace_ext4_mb_new_inode_pa(ac, pa);
61690
61691 ext4_mb_use_inode_pa(ac, pa);
61692 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
61693 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
61694
61695 ei = EXT4_I(ac->ac_inode);
61696 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61697 @@ -3687,7 +3687,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
61698 trace_ext4_mb_new_group_pa(ac, pa);
61699
61700 ext4_mb_use_group_pa(ac, pa);
61701 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61702 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61703
61704 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61705 lg = ac->ac_lg;
61706 @@ -3776,7 +3776,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
61707 * from the bitmap and continue.
61708 */
61709 }
61710 - atomic_add(free, &sbi->s_mb_discarded);
61711 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
61712
61713 return err;
61714 }
61715 @@ -3794,7 +3794,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
61716 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
61717 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
61718 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
61719 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61720 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61721 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
61722
61723 return 0;
61724 diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
61725 index 8313ca3..8a37d08 100644
61726 --- a/fs/ext4/mmp.c
61727 +++ b/fs/ext4/mmp.c
61728 @@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
61729 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
61730 const char *function, unsigned int line, const char *msg)
61731 {
61732 - __ext4_warning(sb, function, line, msg);
61733 + __ext4_warning(sb, function, line, "%s", msg);
61734 __ext4_warning(sb, function, line,
61735 "MMP failure info: last update time: %llu, last update "
61736 "node: %s, last update device: %s\n",
61737 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
61738 index 2c9e686..6a40edc 100644
61739 --- a/fs/ext4/super.c
61740 +++ b/fs/ext4/super.c
61741 @@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data)
61742 }
61743
61744 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
61745 -static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61746 +static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61747 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
61748
61749 #ifdef CONFIG_QUOTA
61750 @@ -2434,7 +2434,7 @@ struct ext4_attr {
61751 int offset;
61752 int deprecated_val;
61753 } u;
61754 -};
61755 +} __do_const;
61756
61757 static int parse_strtoull(const char *buf,
61758 unsigned long long max, unsigned long long *value)
61759 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
61760 index 1e09fc7..0400dd4 100644
61761 --- a/fs/ext4/xattr.c
61762 +++ b/fs/ext4/xattr.c
61763 @@ -399,7 +399,7 @@ static int
61764 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61765 char *buffer, size_t buffer_size)
61766 {
61767 - size_t rest = buffer_size;
61768 + size_t rest = buffer_size, total_size = 0;
61769
61770 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
61771 const struct xattr_handler *handler =
61772 @@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61773 buffer += size;
61774 }
61775 rest -= size;
61776 + total_size += size;
61777 }
61778 }
61779 - return buffer_size - rest;
61780 + return total_size;
61781 }
61782
61783 static int
61784 diff --git a/fs/fcntl.c b/fs/fcntl.c
61785 index 99d440a..eb979d1 100644
61786 --- a/fs/fcntl.c
61787 +++ b/fs/fcntl.c
61788 @@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
61789 int force)
61790 {
61791 security_file_set_fowner(filp);
61792 + if (gr_handle_chroot_fowner(pid, type))
61793 + return;
61794 + if (gr_check_protected_task_fowner(pid, type))
61795 + return;
61796 f_modown(filp, pid, type, force);
61797 }
61798 EXPORT_SYMBOL(__f_setown);
61799 diff --git a/fs/fhandle.c b/fs/fhandle.c
61800 index 999ff5c..ac037c9 100644
61801 --- a/fs/fhandle.c
61802 +++ b/fs/fhandle.c
61803 @@ -8,6 +8,7 @@
61804 #include <linux/fs_struct.h>
61805 #include <linux/fsnotify.h>
61806 #include <linux/personality.h>
61807 +#include <linux/grsecurity.h>
61808 #include <asm/uaccess.h>
61809 #include "internal.h"
61810 #include "mount.h"
61811 @@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
61812 } else
61813 retval = 0;
61814 /* copy the mount id */
61815 - if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
61816 - sizeof(*mnt_id)) ||
61817 + if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
61818 copy_to_user(ufh, handle,
61819 sizeof(struct file_handle) + handle_bytes))
61820 retval = -EFAULT;
61821 @@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
61822 * the directory. Ideally we would like CAP_DAC_SEARCH.
61823 * But we don't have that
61824 */
61825 - if (!capable(CAP_DAC_READ_SEARCH)) {
61826 + if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
61827 retval = -EPERM;
61828 goto out_err;
61829 }
61830 diff --git a/fs/file.c b/fs/file.c
61831 index ab3eb6a..8de2392 100644
61832 --- a/fs/file.c
61833 +++ b/fs/file.c
61834 @@ -16,6 +16,7 @@
61835 #include <linux/slab.h>
61836 #include <linux/vmalloc.h>
61837 #include <linux/file.h>
61838 +#include <linux/security.h>
61839 #include <linux/fdtable.h>
61840 #include <linux/bitops.h>
61841 #include <linux/interrupt.h>
61842 @@ -139,7 +140,7 @@ out:
61843 * Return <0 error code on error; 1 on successful completion.
61844 * The files->file_lock should be held on entry, and will be held on exit.
61845 */
61846 -static int expand_fdtable(struct files_struct *files, int nr)
61847 +static int expand_fdtable(struct files_struct *files, unsigned int nr)
61848 __releases(files->file_lock)
61849 __acquires(files->file_lock)
61850 {
61851 @@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
61852 * expanded and execution may have blocked.
61853 * The files->file_lock should be held on entry, and will be held on exit.
61854 */
61855 -static int expand_files(struct files_struct *files, int nr)
61856 +static int expand_files(struct files_struct *files, unsigned int nr)
61857 {
61858 struct fdtable *fdt;
61859
61860 @@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
61861 if (!file)
61862 return __close_fd(files, fd);
61863
61864 + gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
61865 if (fd >= rlimit(RLIMIT_NOFILE))
61866 return -EBADF;
61867
61868 @@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
61869 if (unlikely(oldfd == newfd))
61870 return -EINVAL;
61871
61872 + gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
61873 if (newfd >= rlimit(RLIMIT_NOFILE))
61874 return -EBADF;
61875
61876 @@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
61877 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
61878 {
61879 int err;
61880 + gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
61881 if (from >= rlimit(RLIMIT_NOFILE))
61882 return -EINVAL;
61883 err = alloc_fd(from, flags);
61884 diff --git a/fs/filesystems.c b/fs/filesystems.c
61885 index 5797d45..7d7d79a 100644
61886 --- a/fs/filesystems.c
61887 +++ b/fs/filesystems.c
61888 @@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
61889 int len = dot ? dot - name : strlen(name);
61890
61891 fs = __get_fs_type(name, len);
61892 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
61893 + if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
61894 +#else
61895 if (!fs && (request_module("fs-%.*s", len, name) == 0))
61896 +#endif
61897 fs = __get_fs_type(name, len);
61898
61899 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
61900 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
61901 index 7dca743..543d620 100644
61902 --- a/fs/fs_struct.c
61903 +++ b/fs/fs_struct.c
61904 @@ -4,6 +4,7 @@
61905 #include <linux/path.h>
61906 #include <linux/slab.h>
61907 #include <linux/fs_struct.h>
61908 +#include <linux/grsecurity.h>
61909 #include "internal.h"
61910
61911 /*
61912 @@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
61913 write_seqcount_begin(&fs->seq);
61914 old_root = fs->root;
61915 fs->root = *path;
61916 + gr_set_chroot_entries(current, path);
61917 write_seqcount_end(&fs->seq);
61918 spin_unlock(&fs->lock);
61919 if (old_root.dentry)
61920 @@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
61921 int hits = 0;
61922 spin_lock(&fs->lock);
61923 write_seqcount_begin(&fs->seq);
61924 + /* this root replacement is only done by pivot_root,
61925 + leave grsec's chroot tagging alone for this task
61926 + so that a pivoted root isn't treated as a chroot
61927 + */
61928 hits += replace_path(&fs->root, old_root, new_root);
61929 hits += replace_path(&fs->pwd, old_root, new_root);
61930 write_seqcount_end(&fs->seq);
61931 @@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
61932 task_lock(tsk);
61933 spin_lock(&fs->lock);
61934 tsk->fs = NULL;
61935 - kill = !--fs->users;
61936 + gr_clear_chroot_entries(tsk);
61937 + kill = !atomic_dec_return(&fs->users);
61938 spin_unlock(&fs->lock);
61939 task_unlock(tsk);
61940 if (kill)
61941 @@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
61942 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
61943 /* We don't need to lock fs - think why ;-) */
61944 if (fs) {
61945 - fs->users = 1;
61946 + atomic_set(&fs->users, 1);
61947 fs->in_exec = 0;
61948 spin_lock_init(&fs->lock);
61949 seqcount_init(&fs->seq);
61950 @@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
61951 spin_lock(&old->lock);
61952 fs->root = old->root;
61953 path_get(&fs->root);
61954 + /* instead of calling gr_set_chroot_entries here,
61955 + we call it from every caller of this function
61956 + */
61957 fs->pwd = old->pwd;
61958 path_get(&fs->pwd);
61959 spin_unlock(&old->lock);
61960 @@ -139,8 +149,9 @@ int unshare_fs_struct(void)
61961
61962 task_lock(current);
61963 spin_lock(&fs->lock);
61964 - kill = !--fs->users;
61965 + kill = !atomic_dec_return(&fs->users);
61966 current->fs = new_fs;
61967 + gr_set_chroot_entries(current, &new_fs->root);
61968 spin_unlock(&fs->lock);
61969 task_unlock(current);
61970
61971 @@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
61972
61973 int current_umask(void)
61974 {
61975 - return current->fs->umask;
61976 + return current->fs->umask | gr_acl_umask();
61977 }
61978 EXPORT_SYMBOL(current_umask);
61979
61980 /* to be mentioned only in INIT_TASK */
61981 struct fs_struct init_fs = {
61982 - .users = 1,
61983 + .users = ATOMIC_INIT(1),
61984 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
61985 .seq = SEQCNT_ZERO(init_fs.seq),
61986 .umask = 0022,
61987 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
61988 index 89acec7..a575262 100644
61989 --- a/fs/fscache/cookie.c
61990 +++ b/fs/fscache/cookie.c
61991 @@ -19,7 +19,7 @@
61992
61993 struct kmem_cache *fscache_cookie_jar;
61994
61995 -static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
61996 +static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
61997
61998 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
61999 static int fscache_alloc_object(struct fscache_cache *cache,
62000 @@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
62001 parent ? (char *) parent->def->name : "<no-parent>",
62002 def->name, netfs_data, enable);
62003
62004 - fscache_stat(&fscache_n_acquires);
62005 + fscache_stat_unchecked(&fscache_n_acquires);
62006
62007 /* if there's no parent cookie, then we don't create one here either */
62008 if (!parent) {
62009 - fscache_stat(&fscache_n_acquires_null);
62010 + fscache_stat_unchecked(&fscache_n_acquires_null);
62011 _leave(" [no parent]");
62012 return NULL;
62013 }
62014 @@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62015 /* allocate and initialise a cookie */
62016 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
62017 if (!cookie) {
62018 - fscache_stat(&fscache_n_acquires_oom);
62019 + fscache_stat_unchecked(&fscache_n_acquires_oom);
62020 _leave(" [ENOMEM]");
62021 return NULL;
62022 }
62023 @@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
62024
62025 switch (cookie->def->type) {
62026 case FSCACHE_COOKIE_TYPE_INDEX:
62027 - fscache_stat(&fscache_n_cookie_index);
62028 + fscache_stat_unchecked(&fscache_n_cookie_index);
62029 break;
62030 case FSCACHE_COOKIE_TYPE_DATAFILE:
62031 - fscache_stat(&fscache_n_cookie_data);
62032 + fscache_stat_unchecked(&fscache_n_cookie_data);
62033 break;
62034 default:
62035 - fscache_stat(&fscache_n_cookie_special);
62036 + fscache_stat_unchecked(&fscache_n_cookie_special);
62037 break;
62038 }
62039
62040 @@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62041 } else {
62042 atomic_dec(&parent->n_children);
62043 __fscache_cookie_put(cookie);
62044 - fscache_stat(&fscache_n_acquires_nobufs);
62045 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
62046 _leave(" = NULL");
62047 return NULL;
62048 }
62049 @@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62050 }
62051 }
62052
62053 - fscache_stat(&fscache_n_acquires_ok);
62054 + fscache_stat_unchecked(&fscache_n_acquires_ok);
62055 _leave(" = %p", cookie);
62056 return cookie;
62057 }
62058 @@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
62059 cache = fscache_select_cache_for_object(cookie->parent);
62060 if (!cache) {
62061 up_read(&fscache_addremove_sem);
62062 - fscache_stat(&fscache_n_acquires_no_cache);
62063 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
62064 _leave(" = -ENOMEDIUM [no cache]");
62065 return -ENOMEDIUM;
62066 }
62067 @@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
62068 object = cache->ops->alloc_object(cache, cookie);
62069 fscache_stat_d(&fscache_n_cop_alloc_object);
62070 if (IS_ERR(object)) {
62071 - fscache_stat(&fscache_n_object_no_alloc);
62072 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
62073 ret = PTR_ERR(object);
62074 goto error;
62075 }
62076
62077 - fscache_stat(&fscache_n_object_alloc);
62078 + fscache_stat_unchecked(&fscache_n_object_alloc);
62079
62080 - object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62081 + object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62082
62083 _debug("ALLOC OBJ%x: %s {%lx}",
62084 object->debug_id, cookie->def->name, object->events);
62085 @@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62086
62087 _enter("{%s}", cookie->def->name);
62088
62089 - fscache_stat(&fscache_n_invalidates);
62090 + fscache_stat_unchecked(&fscache_n_invalidates);
62091
62092 /* Only permit invalidation of data files. Invalidating an index will
62093 * require the caller to release all its attachments to the tree rooted
62094 @@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62095 {
62096 struct fscache_object *object;
62097
62098 - fscache_stat(&fscache_n_updates);
62099 + fscache_stat_unchecked(&fscache_n_updates);
62100
62101 if (!cookie) {
62102 - fscache_stat(&fscache_n_updates_null);
62103 + fscache_stat_unchecked(&fscache_n_updates_null);
62104 _leave(" [no cookie]");
62105 return;
62106 }
62107 @@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62108 */
62109 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62110 {
62111 - fscache_stat(&fscache_n_relinquishes);
62112 + fscache_stat_unchecked(&fscache_n_relinquishes);
62113 if (retire)
62114 - fscache_stat(&fscache_n_relinquishes_retire);
62115 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62116
62117 if (!cookie) {
62118 - fscache_stat(&fscache_n_relinquishes_null);
62119 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
62120 _leave(" [no cookie]");
62121 return;
62122 }
62123 @@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62124 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62125 goto inconsistent;
62126
62127 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62128 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62129
62130 __fscache_use_cookie(cookie);
62131 if (fscache_submit_op(object, op) < 0)
62132 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62133 index 7872a62..d91b19f 100644
62134 --- a/fs/fscache/internal.h
62135 +++ b/fs/fscache/internal.h
62136 @@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62137 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62138 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62139 struct fscache_operation *,
62140 - atomic_t *,
62141 - atomic_t *,
62142 + atomic_unchecked_t *,
62143 + atomic_unchecked_t *,
62144 void (*)(struct fscache_operation *));
62145 extern void fscache_invalidate_writes(struct fscache_cookie *);
62146
62147 @@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62148 * stats.c
62149 */
62150 #ifdef CONFIG_FSCACHE_STATS
62151 -extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62152 -extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62153 +extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62154 +extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62155
62156 -extern atomic_t fscache_n_op_pend;
62157 -extern atomic_t fscache_n_op_run;
62158 -extern atomic_t fscache_n_op_enqueue;
62159 -extern atomic_t fscache_n_op_deferred_release;
62160 -extern atomic_t fscache_n_op_release;
62161 -extern atomic_t fscache_n_op_gc;
62162 -extern atomic_t fscache_n_op_cancelled;
62163 -extern atomic_t fscache_n_op_rejected;
62164 +extern atomic_unchecked_t fscache_n_op_pend;
62165 +extern atomic_unchecked_t fscache_n_op_run;
62166 +extern atomic_unchecked_t fscache_n_op_enqueue;
62167 +extern atomic_unchecked_t fscache_n_op_deferred_release;
62168 +extern atomic_unchecked_t fscache_n_op_release;
62169 +extern atomic_unchecked_t fscache_n_op_gc;
62170 +extern atomic_unchecked_t fscache_n_op_cancelled;
62171 +extern atomic_unchecked_t fscache_n_op_rejected;
62172
62173 -extern atomic_t fscache_n_attr_changed;
62174 -extern atomic_t fscache_n_attr_changed_ok;
62175 -extern atomic_t fscache_n_attr_changed_nobufs;
62176 -extern atomic_t fscache_n_attr_changed_nomem;
62177 -extern atomic_t fscache_n_attr_changed_calls;
62178 +extern atomic_unchecked_t fscache_n_attr_changed;
62179 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
62180 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62181 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62182 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
62183
62184 -extern atomic_t fscache_n_allocs;
62185 -extern atomic_t fscache_n_allocs_ok;
62186 -extern atomic_t fscache_n_allocs_wait;
62187 -extern atomic_t fscache_n_allocs_nobufs;
62188 -extern atomic_t fscache_n_allocs_intr;
62189 -extern atomic_t fscache_n_allocs_object_dead;
62190 -extern atomic_t fscache_n_alloc_ops;
62191 -extern atomic_t fscache_n_alloc_op_waits;
62192 +extern atomic_unchecked_t fscache_n_allocs;
62193 +extern atomic_unchecked_t fscache_n_allocs_ok;
62194 +extern atomic_unchecked_t fscache_n_allocs_wait;
62195 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
62196 +extern atomic_unchecked_t fscache_n_allocs_intr;
62197 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
62198 +extern atomic_unchecked_t fscache_n_alloc_ops;
62199 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
62200
62201 -extern atomic_t fscache_n_retrievals;
62202 -extern atomic_t fscache_n_retrievals_ok;
62203 -extern atomic_t fscache_n_retrievals_wait;
62204 -extern atomic_t fscache_n_retrievals_nodata;
62205 -extern atomic_t fscache_n_retrievals_nobufs;
62206 -extern atomic_t fscache_n_retrievals_intr;
62207 -extern atomic_t fscache_n_retrievals_nomem;
62208 -extern atomic_t fscache_n_retrievals_object_dead;
62209 -extern atomic_t fscache_n_retrieval_ops;
62210 -extern atomic_t fscache_n_retrieval_op_waits;
62211 +extern atomic_unchecked_t fscache_n_retrievals;
62212 +extern atomic_unchecked_t fscache_n_retrievals_ok;
62213 +extern atomic_unchecked_t fscache_n_retrievals_wait;
62214 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
62215 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62216 +extern atomic_unchecked_t fscache_n_retrievals_intr;
62217 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
62218 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62219 +extern atomic_unchecked_t fscache_n_retrieval_ops;
62220 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62221
62222 -extern atomic_t fscache_n_stores;
62223 -extern atomic_t fscache_n_stores_ok;
62224 -extern atomic_t fscache_n_stores_again;
62225 -extern atomic_t fscache_n_stores_nobufs;
62226 -extern atomic_t fscache_n_stores_oom;
62227 -extern atomic_t fscache_n_store_ops;
62228 -extern atomic_t fscache_n_store_calls;
62229 -extern atomic_t fscache_n_store_pages;
62230 -extern atomic_t fscache_n_store_radix_deletes;
62231 -extern atomic_t fscache_n_store_pages_over_limit;
62232 +extern atomic_unchecked_t fscache_n_stores;
62233 +extern atomic_unchecked_t fscache_n_stores_ok;
62234 +extern atomic_unchecked_t fscache_n_stores_again;
62235 +extern atomic_unchecked_t fscache_n_stores_nobufs;
62236 +extern atomic_unchecked_t fscache_n_stores_oom;
62237 +extern atomic_unchecked_t fscache_n_store_ops;
62238 +extern atomic_unchecked_t fscache_n_store_calls;
62239 +extern atomic_unchecked_t fscache_n_store_pages;
62240 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
62241 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62242
62243 -extern atomic_t fscache_n_store_vmscan_not_storing;
62244 -extern atomic_t fscache_n_store_vmscan_gone;
62245 -extern atomic_t fscache_n_store_vmscan_busy;
62246 -extern atomic_t fscache_n_store_vmscan_cancelled;
62247 -extern atomic_t fscache_n_store_vmscan_wait;
62248 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62249 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62250 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62251 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62252 +extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62253
62254 -extern atomic_t fscache_n_marks;
62255 -extern atomic_t fscache_n_uncaches;
62256 +extern atomic_unchecked_t fscache_n_marks;
62257 +extern atomic_unchecked_t fscache_n_uncaches;
62258
62259 -extern atomic_t fscache_n_acquires;
62260 -extern atomic_t fscache_n_acquires_null;
62261 -extern atomic_t fscache_n_acquires_no_cache;
62262 -extern atomic_t fscache_n_acquires_ok;
62263 -extern atomic_t fscache_n_acquires_nobufs;
62264 -extern atomic_t fscache_n_acquires_oom;
62265 +extern atomic_unchecked_t fscache_n_acquires;
62266 +extern atomic_unchecked_t fscache_n_acquires_null;
62267 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
62268 +extern atomic_unchecked_t fscache_n_acquires_ok;
62269 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
62270 +extern atomic_unchecked_t fscache_n_acquires_oom;
62271
62272 -extern atomic_t fscache_n_invalidates;
62273 -extern atomic_t fscache_n_invalidates_run;
62274 +extern atomic_unchecked_t fscache_n_invalidates;
62275 +extern atomic_unchecked_t fscache_n_invalidates_run;
62276
62277 -extern atomic_t fscache_n_updates;
62278 -extern atomic_t fscache_n_updates_null;
62279 -extern atomic_t fscache_n_updates_run;
62280 +extern atomic_unchecked_t fscache_n_updates;
62281 +extern atomic_unchecked_t fscache_n_updates_null;
62282 +extern atomic_unchecked_t fscache_n_updates_run;
62283
62284 -extern atomic_t fscache_n_relinquishes;
62285 -extern atomic_t fscache_n_relinquishes_null;
62286 -extern atomic_t fscache_n_relinquishes_waitcrt;
62287 -extern atomic_t fscache_n_relinquishes_retire;
62288 +extern atomic_unchecked_t fscache_n_relinquishes;
62289 +extern atomic_unchecked_t fscache_n_relinquishes_null;
62290 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62291 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
62292
62293 -extern atomic_t fscache_n_cookie_index;
62294 -extern atomic_t fscache_n_cookie_data;
62295 -extern atomic_t fscache_n_cookie_special;
62296 +extern atomic_unchecked_t fscache_n_cookie_index;
62297 +extern atomic_unchecked_t fscache_n_cookie_data;
62298 +extern atomic_unchecked_t fscache_n_cookie_special;
62299
62300 -extern atomic_t fscache_n_object_alloc;
62301 -extern atomic_t fscache_n_object_no_alloc;
62302 -extern atomic_t fscache_n_object_lookups;
62303 -extern atomic_t fscache_n_object_lookups_negative;
62304 -extern atomic_t fscache_n_object_lookups_positive;
62305 -extern atomic_t fscache_n_object_lookups_timed_out;
62306 -extern atomic_t fscache_n_object_created;
62307 -extern atomic_t fscache_n_object_avail;
62308 -extern atomic_t fscache_n_object_dead;
62309 +extern atomic_unchecked_t fscache_n_object_alloc;
62310 +extern atomic_unchecked_t fscache_n_object_no_alloc;
62311 +extern atomic_unchecked_t fscache_n_object_lookups;
62312 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
62313 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
62314 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62315 +extern atomic_unchecked_t fscache_n_object_created;
62316 +extern atomic_unchecked_t fscache_n_object_avail;
62317 +extern atomic_unchecked_t fscache_n_object_dead;
62318
62319 -extern atomic_t fscache_n_checkaux_none;
62320 -extern atomic_t fscache_n_checkaux_okay;
62321 -extern atomic_t fscache_n_checkaux_update;
62322 -extern atomic_t fscache_n_checkaux_obsolete;
62323 +extern atomic_unchecked_t fscache_n_checkaux_none;
62324 +extern atomic_unchecked_t fscache_n_checkaux_okay;
62325 +extern atomic_unchecked_t fscache_n_checkaux_update;
62326 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62327
62328 extern atomic_t fscache_n_cop_alloc_object;
62329 extern atomic_t fscache_n_cop_lookup_object;
62330 @@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62331 atomic_inc(stat);
62332 }
62333
62334 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62335 +{
62336 + atomic_inc_unchecked(stat);
62337 +}
62338 +
62339 static inline void fscache_stat_d(atomic_t *stat)
62340 {
62341 atomic_dec(stat);
62342 @@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62343
62344 #define __fscache_stat(stat) (NULL)
62345 #define fscache_stat(stat) do {} while (0)
62346 +#define fscache_stat_unchecked(stat) do {} while (0)
62347 #define fscache_stat_d(stat) do {} while (0)
62348 #endif
62349
62350 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62351 index da032da..0076ce7 100644
62352 --- a/fs/fscache/object.c
62353 +++ b/fs/fscache/object.c
62354 @@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62355 _debug("LOOKUP \"%s\" in \"%s\"",
62356 cookie->def->name, object->cache->tag->name);
62357
62358 - fscache_stat(&fscache_n_object_lookups);
62359 + fscache_stat_unchecked(&fscache_n_object_lookups);
62360 fscache_stat(&fscache_n_cop_lookup_object);
62361 ret = object->cache->ops->lookup_object(object);
62362 fscache_stat_d(&fscache_n_cop_lookup_object);
62363 @@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62364 if (ret == -ETIMEDOUT) {
62365 /* probably stuck behind another object, so move this one to
62366 * the back of the queue */
62367 - fscache_stat(&fscache_n_object_lookups_timed_out);
62368 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62369 _leave(" [timeout]");
62370 return NO_TRANSIT;
62371 }
62372 @@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62373 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62374
62375 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62376 - fscache_stat(&fscache_n_object_lookups_negative);
62377 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
62378
62379 /* Allow write requests to begin stacking up and read requests to begin
62380 * returning ENODATA.
62381 @@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
62382 /* if we were still looking up, then we must have a positive lookup
62383 * result, in which case there may be data available */
62384 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62385 - fscache_stat(&fscache_n_object_lookups_positive);
62386 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
62387
62388 /* We do (presumably) have data */
62389 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
62390 @@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
62391 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
62392 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
62393 } else {
62394 - fscache_stat(&fscache_n_object_created);
62395 + fscache_stat_unchecked(&fscache_n_object_created);
62396 }
62397
62398 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
62399 @@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
62400 fscache_stat_d(&fscache_n_cop_lookup_complete);
62401
62402 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
62403 - fscache_stat(&fscache_n_object_avail);
62404 + fscache_stat_unchecked(&fscache_n_object_avail);
62405
62406 _leave("");
62407 return transit_to(JUMPSTART_DEPS);
62408 @@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
62409
62410 /* this just shifts the object release to the work processor */
62411 fscache_put_object(object);
62412 - fscache_stat(&fscache_n_object_dead);
62413 + fscache_stat_unchecked(&fscache_n_object_dead);
62414
62415 _leave("");
62416 return transit_to(OBJECT_DEAD);
62417 @@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62418 enum fscache_checkaux result;
62419
62420 if (!object->cookie->def->check_aux) {
62421 - fscache_stat(&fscache_n_checkaux_none);
62422 + fscache_stat_unchecked(&fscache_n_checkaux_none);
62423 return FSCACHE_CHECKAUX_OKAY;
62424 }
62425
62426 @@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62427 switch (result) {
62428 /* entry okay as is */
62429 case FSCACHE_CHECKAUX_OKAY:
62430 - fscache_stat(&fscache_n_checkaux_okay);
62431 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
62432 break;
62433
62434 /* entry requires update */
62435 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
62436 - fscache_stat(&fscache_n_checkaux_update);
62437 + fscache_stat_unchecked(&fscache_n_checkaux_update);
62438 break;
62439
62440 /* entry requires deletion */
62441 case FSCACHE_CHECKAUX_OBSOLETE:
62442 - fscache_stat(&fscache_n_checkaux_obsolete);
62443 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
62444 break;
62445
62446 default:
62447 @@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
62448 {
62449 const struct fscache_state *s;
62450
62451 - fscache_stat(&fscache_n_invalidates_run);
62452 + fscache_stat_unchecked(&fscache_n_invalidates_run);
62453 fscache_stat(&fscache_n_cop_invalidate_object);
62454 s = _fscache_invalidate_object(object, event);
62455 fscache_stat_d(&fscache_n_cop_invalidate_object);
62456 @@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
62457 {
62458 _enter("{OBJ%x},%d", object->debug_id, event);
62459
62460 - fscache_stat(&fscache_n_updates_run);
62461 + fscache_stat_unchecked(&fscache_n_updates_run);
62462 fscache_stat(&fscache_n_cop_update_object);
62463 object->cache->ops->update_object(object);
62464 fscache_stat_d(&fscache_n_cop_update_object);
62465 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
62466 index e7b87a0..a85d47a 100644
62467 --- a/fs/fscache/operation.c
62468 +++ b/fs/fscache/operation.c
62469 @@ -17,7 +17,7 @@
62470 #include <linux/slab.h>
62471 #include "internal.h"
62472
62473 -atomic_t fscache_op_debug_id;
62474 +atomic_unchecked_t fscache_op_debug_id;
62475 EXPORT_SYMBOL(fscache_op_debug_id);
62476
62477 /**
62478 @@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
62479 ASSERTCMP(atomic_read(&op->usage), >, 0);
62480 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
62481
62482 - fscache_stat(&fscache_n_op_enqueue);
62483 + fscache_stat_unchecked(&fscache_n_op_enqueue);
62484 switch (op->flags & FSCACHE_OP_TYPE) {
62485 case FSCACHE_OP_ASYNC:
62486 _debug("queue async");
62487 @@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
62488 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
62489 if (op->processor)
62490 fscache_enqueue_operation(op);
62491 - fscache_stat(&fscache_n_op_run);
62492 + fscache_stat_unchecked(&fscache_n_op_run);
62493 }
62494
62495 /*
62496 @@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62497 if (object->n_in_progress > 0) {
62498 atomic_inc(&op->usage);
62499 list_add_tail(&op->pend_link, &object->pending_ops);
62500 - fscache_stat(&fscache_n_op_pend);
62501 + fscache_stat_unchecked(&fscache_n_op_pend);
62502 } else if (!list_empty(&object->pending_ops)) {
62503 atomic_inc(&op->usage);
62504 list_add_tail(&op->pend_link, &object->pending_ops);
62505 - fscache_stat(&fscache_n_op_pend);
62506 + fscache_stat_unchecked(&fscache_n_op_pend);
62507 fscache_start_operations(object);
62508 } else {
62509 ASSERTCMP(object->n_in_progress, ==, 0);
62510 @@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62511 object->n_exclusive++; /* reads and writes must wait */
62512 atomic_inc(&op->usage);
62513 list_add_tail(&op->pend_link, &object->pending_ops);
62514 - fscache_stat(&fscache_n_op_pend);
62515 + fscache_stat_unchecked(&fscache_n_op_pend);
62516 ret = 0;
62517 } else {
62518 /* If we're in any other state, there must have been an I/O
62519 @@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
62520 if (object->n_exclusive > 0) {
62521 atomic_inc(&op->usage);
62522 list_add_tail(&op->pend_link, &object->pending_ops);
62523 - fscache_stat(&fscache_n_op_pend);
62524 + fscache_stat_unchecked(&fscache_n_op_pend);
62525 } else if (!list_empty(&object->pending_ops)) {
62526 atomic_inc(&op->usage);
62527 list_add_tail(&op->pend_link, &object->pending_ops);
62528 - fscache_stat(&fscache_n_op_pend);
62529 + fscache_stat_unchecked(&fscache_n_op_pend);
62530 fscache_start_operations(object);
62531 } else {
62532 ASSERTCMP(object->n_exclusive, ==, 0);
62533 @@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
62534 object->n_ops++;
62535 atomic_inc(&op->usage);
62536 list_add_tail(&op->pend_link, &object->pending_ops);
62537 - fscache_stat(&fscache_n_op_pend);
62538 + fscache_stat_unchecked(&fscache_n_op_pend);
62539 ret = 0;
62540 } else if (fscache_object_is_dying(object)) {
62541 - fscache_stat(&fscache_n_op_rejected);
62542 + fscache_stat_unchecked(&fscache_n_op_rejected);
62543 op->state = FSCACHE_OP_ST_CANCELLED;
62544 ret = -ENOBUFS;
62545 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
62546 @@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
62547 ret = -EBUSY;
62548 if (op->state == FSCACHE_OP_ST_PENDING) {
62549 ASSERT(!list_empty(&op->pend_link));
62550 - fscache_stat(&fscache_n_op_cancelled);
62551 + fscache_stat_unchecked(&fscache_n_op_cancelled);
62552 list_del_init(&op->pend_link);
62553 if (do_cancel)
62554 do_cancel(op);
62555 @@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
62556 while (!list_empty(&object->pending_ops)) {
62557 op = list_entry(object->pending_ops.next,
62558 struct fscache_operation, pend_link);
62559 - fscache_stat(&fscache_n_op_cancelled);
62560 + fscache_stat_unchecked(&fscache_n_op_cancelled);
62561 list_del_init(&op->pend_link);
62562
62563 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
62564 @@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
62565 op->state, ==, FSCACHE_OP_ST_CANCELLED);
62566 op->state = FSCACHE_OP_ST_DEAD;
62567
62568 - fscache_stat(&fscache_n_op_release);
62569 + fscache_stat_unchecked(&fscache_n_op_release);
62570
62571 if (op->release) {
62572 op->release(op);
62573 @@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
62574 * lock, and defer it otherwise */
62575 if (!spin_trylock(&object->lock)) {
62576 _debug("defer put");
62577 - fscache_stat(&fscache_n_op_deferred_release);
62578 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
62579
62580 cache = object->cache;
62581 spin_lock(&cache->op_gc_list_lock);
62582 @@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
62583
62584 _debug("GC DEFERRED REL OBJ%x OP%x",
62585 object->debug_id, op->debug_id);
62586 - fscache_stat(&fscache_n_op_gc);
62587 + fscache_stat_unchecked(&fscache_n_op_gc);
62588
62589 ASSERTCMP(atomic_read(&op->usage), ==, 0);
62590 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
62591 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
62592 index de33b3f..8be4d29 100644
62593 --- a/fs/fscache/page.c
62594 +++ b/fs/fscache/page.c
62595 @@ -74,7 +74,7 @@ try_again:
62596 val = radix_tree_lookup(&cookie->stores, page->index);
62597 if (!val) {
62598 rcu_read_unlock();
62599 - fscache_stat(&fscache_n_store_vmscan_not_storing);
62600 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
62601 __fscache_uncache_page(cookie, page);
62602 return true;
62603 }
62604 @@ -104,11 +104,11 @@ try_again:
62605 spin_unlock(&cookie->stores_lock);
62606
62607 if (xpage) {
62608 - fscache_stat(&fscache_n_store_vmscan_cancelled);
62609 - fscache_stat(&fscache_n_store_radix_deletes);
62610 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
62611 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62612 ASSERTCMP(xpage, ==, page);
62613 } else {
62614 - fscache_stat(&fscache_n_store_vmscan_gone);
62615 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
62616 }
62617
62618 wake_up_bit(&cookie->flags, 0);
62619 @@ -123,11 +123,11 @@ page_busy:
62620 * sleeping on memory allocation, so we may need to impose a timeout
62621 * too. */
62622 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
62623 - fscache_stat(&fscache_n_store_vmscan_busy);
62624 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
62625 return false;
62626 }
62627
62628 - fscache_stat(&fscache_n_store_vmscan_wait);
62629 + fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
62630 if (!release_page_wait_timeout(cookie, page))
62631 _debug("fscache writeout timeout page: %p{%lx}",
62632 page, page->index);
62633 @@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
62634 FSCACHE_COOKIE_STORING_TAG);
62635 if (!radix_tree_tag_get(&cookie->stores, page->index,
62636 FSCACHE_COOKIE_PENDING_TAG)) {
62637 - fscache_stat(&fscache_n_store_radix_deletes);
62638 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62639 xpage = radix_tree_delete(&cookie->stores, page->index);
62640 }
62641 spin_unlock(&cookie->stores_lock);
62642 @@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
62643
62644 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
62645
62646 - fscache_stat(&fscache_n_attr_changed_calls);
62647 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
62648
62649 if (fscache_object_is_active(object)) {
62650 fscache_stat(&fscache_n_cop_attr_changed);
62651 @@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62652
62653 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62654
62655 - fscache_stat(&fscache_n_attr_changed);
62656 + fscache_stat_unchecked(&fscache_n_attr_changed);
62657
62658 op = kzalloc(sizeof(*op), GFP_KERNEL);
62659 if (!op) {
62660 - fscache_stat(&fscache_n_attr_changed_nomem);
62661 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
62662 _leave(" = -ENOMEM");
62663 return -ENOMEM;
62664 }
62665 @@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62666 if (fscache_submit_exclusive_op(object, op) < 0)
62667 goto nobufs_dec;
62668 spin_unlock(&cookie->lock);
62669 - fscache_stat(&fscache_n_attr_changed_ok);
62670 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
62671 fscache_put_operation(op);
62672 _leave(" = 0");
62673 return 0;
62674 @@ -242,7 +242,7 @@ nobufs:
62675 kfree(op);
62676 if (wake_cookie)
62677 __fscache_wake_unused_cookie(cookie);
62678 - fscache_stat(&fscache_n_attr_changed_nobufs);
62679 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
62680 _leave(" = %d", -ENOBUFS);
62681 return -ENOBUFS;
62682 }
62683 @@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
62684 /* allocate a retrieval operation and attempt to submit it */
62685 op = kzalloc(sizeof(*op), GFP_NOIO);
62686 if (!op) {
62687 - fscache_stat(&fscache_n_retrievals_nomem);
62688 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62689 return NULL;
62690 }
62691
62692 @@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
62693 return 0;
62694 }
62695
62696 - fscache_stat(&fscache_n_retrievals_wait);
62697 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
62698
62699 jif = jiffies;
62700 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
62701 TASK_INTERRUPTIBLE) != 0) {
62702 - fscache_stat(&fscache_n_retrievals_intr);
62703 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62704 _leave(" = -ERESTARTSYS");
62705 return -ERESTARTSYS;
62706 }
62707 @@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
62708 */
62709 int fscache_wait_for_operation_activation(struct fscache_object *object,
62710 struct fscache_operation *op,
62711 - atomic_t *stat_op_waits,
62712 - atomic_t *stat_object_dead,
62713 + atomic_unchecked_t *stat_op_waits,
62714 + atomic_unchecked_t *stat_object_dead,
62715 void (*do_cancel)(struct fscache_operation *))
62716 {
62717 int ret;
62718 @@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62719
62720 _debug(">>> WT");
62721 if (stat_op_waits)
62722 - fscache_stat(stat_op_waits);
62723 + fscache_stat_unchecked(stat_op_waits);
62724 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
62725 TASK_INTERRUPTIBLE) != 0) {
62726 ret = fscache_cancel_op(op, do_cancel);
62727 @@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62728 check_if_dead:
62729 if (op->state == FSCACHE_OP_ST_CANCELLED) {
62730 if (stat_object_dead)
62731 - fscache_stat(stat_object_dead);
62732 + fscache_stat_unchecked(stat_object_dead);
62733 _leave(" = -ENOBUFS [cancelled]");
62734 return -ENOBUFS;
62735 }
62736 @@ -381,7 +381,7 @@ check_if_dead:
62737 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
62738 fscache_cancel_op(op, do_cancel);
62739 if (stat_object_dead)
62740 - fscache_stat(stat_object_dead);
62741 + fscache_stat_unchecked(stat_object_dead);
62742 return -ENOBUFS;
62743 }
62744 return 0;
62745 @@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62746
62747 _enter("%p,%p,,,", cookie, page);
62748
62749 - fscache_stat(&fscache_n_retrievals);
62750 + fscache_stat_unchecked(&fscache_n_retrievals);
62751
62752 if (hlist_empty(&cookie->backing_objects))
62753 goto nobufs;
62754 @@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62755 goto nobufs_unlock_dec;
62756 spin_unlock(&cookie->lock);
62757
62758 - fscache_stat(&fscache_n_retrieval_ops);
62759 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
62760
62761 /* pin the netfs read context in case we need to do the actual netfs
62762 * read because we've encountered a cache read failure */
62763 @@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62764
62765 error:
62766 if (ret == -ENOMEM)
62767 - fscache_stat(&fscache_n_retrievals_nomem);
62768 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62769 else if (ret == -ERESTARTSYS)
62770 - fscache_stat(&fscache_n_retrievals_intr);
62771 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62772 else if (ret == -ENODATA)
62773 - fscache_stat(&fscache_n_retrievals_nodata);
62774 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62775 else if (ret < 0)
62776 - fscache_stat(&fscache_n_retrievals_nobufs);
62777 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62778 else
62779 - fscache_stat(&fscache_n_retrievals_ok);
62780 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
62781
62782 fscache_put_retrieval(op);
62783 _leave(" = %d", ret);
62784 @@ -505,7 +505,7 @@ nobufs_unlock:
62785 __fscache_wake_unused_cookie(cookie);
62786 kfree(op);
62787 nobufs:
62788 - fscache_stat(&fscache_n_retrievals_nobufs);
62789 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62790 _leave(" = -ENOBUFS");
62791 return -ENOBUFS;
62792 }
62793 @@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62794
62795 _enter("%p,,%d,,,", cookie, *nr_pages);
62796
62797 - fscache_stat(&fscache_n_retrievals);
62798 + fscache_stat_unchecked(&fscache_n_retrievals);
62799
62800 if (hlist_empty(&cookie->backing_objects))
62801 goto nobufs;
62802 @@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62803 goto nobufs_unlock_dec;
62804 spin_unlock(&cookie->lock);
62805
62806 - fscache_stat(&fscache_n_retrieval_ops);
62807 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
62808
62809 /* pin the netfs read context in case we need to do the actual netfs
62810 * read because we've encountered a cache read failure */
62811 @@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62812
62813 error:
62814 if (ret == -ENOMEM)
62815 - fscache_stat(&fscache_n_retrievals_nomem);
62816 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62817 else if (ret == -ERESTARTSYS)
62818 - fscache_stat(&fscache_n_retrievals_intr);
62819 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62820 else if (ret == -ENODATA)
62821 - fscache_stat(&fscache_n_retrievals_nodata);
62822 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62823 else if (ret < 0)
62824 - fscache_stat(&fscache_n_retrievals_nobufs);
62825 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62826 else
62827 - fscache_stat(&fscache_n_retrievals_ok);
62828 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
62829
62830 fscache_put_retrieval(op);
62831 _leave(" = %d", ret);
62832 @@ -636,7 +636,7 @@ nobufs_unlock:
62833 if (wake_cookie)
62834 __fscache_wake_unused_cookie(cookie);
62835 nobufs:
62836 - fscache_stat(&fscache_n_retrievals_nobufs);
62837 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62838 _leave(" = -ENOBUFS");
62839 return -ENOBUFS;
62840 }
62841 @@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62842
62843 _enter("%p,%p,,,", cookie, page);
62844
62845 - fscache_stat(&fscache_n_allocs);
62846 + fscache_stat_unchecked(&fscache_n_allocs);
62847
62848 if (hlist_empty(&cookie->backing_objects))
62849 goto nobufs;
62850 @@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62851 goto nobufs_unlock_dec;
62852 spin_unlock(&cookie->lock);
62853
62854 - fscache_stat(&fscache_n_alloc_ops);
62855 + fscache_stat_unchecked(&fscache_n_alloc_ops);
62856
62857 ret = fscache_wait_for_operation_activation(
62858 object, &op->op,
62859 @@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62860
62861 error:
62862 if (ret == -ERESTARTSYS)
62863 - fscache_stat(&fscache_n_allocs_intr);
62864 + fscache_stat_unchecked(&fscache_n_allocs_intr);
62865 else if (ret < 0)
62866 - fscache_stat(&fscache_n_allocs_nobufs);
62867 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62868 else
62869 - fscache_stat(&fscache_n_allocs_ok);
62870 + fscache_stat_unchecked(&fscache_n_allocs_ok);
62871
62872 fscache_put_retrieval(op);
62873 _leave(" = %d", ret);
62874 @@ -730,7 +730,7 @@ nobufs_unlock:
62875 if (wake_cookie)
62876 __fscache_wake_unused_cookie(cookie);
62877 nobufs:
62878 - fscache_stat(&fscache_n_allocs_nobufs);
62879 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62880 _leave(" = -ENOBUFS");
62881 return -ENOBUFS;
62882 }
62883 @@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62884
62885 spin_lock(&cookie->stores_lock);
62886
62887 - fscache_stat(&fscache_n_store_calls);
62888 + fscache_stat_unchecked(&fscache_n_store_calls);
62889
62890 /* find a page to store */
62891 page = NULL;
62892 @@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62893 page = results[0];
62894 _debug("gang %d [%lx]", n, page->index);
62895 if (page->index > op->store_limit) {
62896 - fscache_stat(&fscache_n_store_pages_over_limit);
62897 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
62898 goto superseded;
62899 }
62900
62901 @@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62902 spin_unlock(&cookie->stores_lock);
62903 spin_unlock(&object->lock);
62904
62905 - fscache_stat(&fscache_n_store_pages);
62906 + fscache_stat_unchecked(&fscache_n_store_pages);
62907 fscache_stat(&fscache_n_cop_write_page);
62908 ret = object->cache->ops->write_page(op, page);
62909 fscache_stat_d(&fscache_n_cop_write_page);
62910 @@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62911 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62912 ASSERT(PageFsCache(page));
62913
62914 - fscache_stat(&fscache_n_stores);
62915 + fscache_stat_unchecked(&fscache_n_stores);
62916
62917 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
62918 _leave(" = -ENOBUFS [invalidating]");
62919 @@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62920 spin_unlock(&cookie->stores_lock);
62921 spin_unlock(&object->lock);
62922
62923 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
62924 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62925 op->store_limit = object->store_limit;
62926
62927 __fscache_use_cookie(cookie);
62928 @@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62929
62930 spin_unlock(&cookie->lock);
62931 radix_tree_preload_end();
62932 - fscache_stat(&fscache_n_store_ops);
62933 - fscache_stat(&fscache_n_stores_ok);
62934 + fscache_stat_unchecked(&fscache_n_store_ops);
62935 + fscache_stat_unchecked(&fscache_n_stores_ok);
62936
62937 /* the work queue now carries its own ref on the object */
62938 fscache_put_operation(&op->op);
62939 @@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62940 return 0;
62941
62942 already_queued:
62943 - fscache_stat(&fscache_n_stores_again);
62944 + fscache_stat_unchecked(&fscache_n_stores_again);
62945 already_pending:
62946 spin_unlock(&cookie->stores_lock);
62947 spin_unlock(&object->lock);
62948 spin_unlock(&cookie->lock);
62949 radix_tree_preload_end();
62950 kfree(op);
62951 - fscache_stat(&fscache_n_stores_ok);
62952 + fscache_stat_unchecked(&fscache_n_stores_ok);
62953 _leave(" = 0");
62954 return 0;
62955
62956 @@ -1039,14 +1039,14 @@ nobufs:
62957 kfree(op);
62958 if (wake_cookie)
62959 __fscache_wake_unused_cookie(cookie);
62960 - fscache_stat(&fscache_n_stores_nobufs);
62961 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
62962 _leave(" = -ENOBUFS");
62963 return -ENOBUFS;
62964
62965 nomem_free:
62966 kfree(op);
62967 nomem:
62968 - fscache_stat(&fscache_n_stores_oom);
62969 + fscache_stat_unchecked(&fscache_n_stores_oom);
62970 _leave(" = -ENOMEM");
62971 return -ENOMEM;
62972 }
62973 @@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
62974 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62975 ASSERTCMP(page, !=, NULL);
62976
62977 - fscache_stat(&fscache_n_uncaches);
62978 + fscache_stat_unchecked(&fscache_n_uncaches);
62979
62980 /* cache withdrawal may beat us to it */
62981 if (!PageFsCache(page))
62982 @@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
62983 struct fscache_cookie *cookie = op->op.object->cookie;
62984
62985 #ifdef CONFIG_FSCACHE_STATS
62986 - atomic_inc(&fscache_n_marks);
62987 + atomic_inc_unchecked(&fscache_n_marks);
62988 #endif
62989
62990 _debug("- mark %p{%lx}", page, page->index);
62991 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
62992 index 40d13c7..ddf52b9 100644
62993 --- a/fs/fscache/stats.c
62994 +++ b/fs/fscache/stats.c
62995 @@ -18,99 +18,99 @@
62996 /*
62997 * operation counters
62998 */
62999 -atomic_t fscache_n_op_pend;
63000 -atomic_t fscache_n_op_run;
63001 -atomic_t fscache_n_op_enqueue;
63002 -atomic_t fscache_n_op_requeue;
63003 -atomic_t fscache_n_op_deferred_release;
63004 -atomic_t fscache_n_op_release;
63005 -atomic_t fscache_n_op_gc;
63006 -atomic_t fscache_n_op_cancelled;
63007 -atomic_t fscache_n_op_rejected;
63008 +atomic_unchecked_t fscache_n_op_pend;
63009 +atomic_unchecked_t fscache_n_op_run;
63010 +atomic_unchecked_t fscache_n_op_enqueue;
63011 +atomic_unchecked_t fscache_n_op_requeue;
63012 +atomic_unchecked_t fscache_n_op_deferred_release;
63013 +atomic_unchecked_t fscache_n_op_release;
63014 +atomic_unchecked_t fscache_n_op_gc;
63015 +atomic_unchecked_t fscache_n_op_cancelled;
63016 +atomic_unchecked_t fscache_n_op_rejected;
63017
63018 -atomic_t fscache_n_attr_changed;
63019 -atomic_t fscache_n_attr_changed_ok;
63020 -atomic_t fscache_n_attr_changed_nobufs;
63021 -atomic_t fscache_n_attr_changed_nomem;
63022 -atomic_t fscache_n_attr_changed_calls;
63023 +atomic_unchecked_t fscache_n_attr_changed;
63024 +atomic_unchecked_t fscache_n_attr_changed_ok;
63025 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
63026 +atomic_unchecked_t fscache_n_attr_changed_nomem;
63027 +atomic_unchecked_t fscache_n_attr_changed_calls;
63028
63029 -atomic_t fscache_n_allocs;
63030 -atomic_t fscache_n_allocs_ok;
63031 -atomic_t fscache_n_allocs_wait;
63032 -atomic_t fscache_n_allocs_nobufs;
63033 -atomic_t fscache_n_allocs_intr;
63034 -atomic_t fscache_n_allocs_object_dead;
63035 -atomic_t fscache_n_alloc_ops;
63036 -atomic_t fscache_n_alloc_op_waits;
63037 +atomic_unchecked_t fscache_n_allocs;
63038 +atomic_unchecked_t fscache_n_allocs_ok;
63039 +atomic_unchecked_t fscache_n_allocs_wait;
63040 +atomic_unchecked_t fscache_n_allocs_nobufs;
63041 +atomic_unchecked_t fscache_n_allocs_intr;
63042 +atomic_unchecked_t fscache_n_allocs_object_dead;
63043 +atomic_unchecked_t fscache_n_alloc_ops;
63044 +atomic_unchecked_t fscache_n_alloc_op_waits;
63045
63046 -atomic_t fscache_n_retrievals;
63047 -atomic_t fscache_n_retrievals_ok;
63048 -atomic_t fscache_n_retrievals_wait;
63049 -atomic_t fscache_n_retrievals_nodata;
63050 -atomic_t fscache_n_retrievals_nobufs;
63051 -atomic_t fscache_n_retrievals_intr;
63052 -atomic_t fscache_n_retrievals_nomem;
63053 -atomic_t fscache_n_retrievals_object_dead;
63054 -atomic_t fscache_n_retrieval_ops;
63055 -atomic_t fscache_n_retrieval_op_waits;
63056 +atomic_unchecked_t fscache_n_retrievals;
63057 +atomic_unchecked_t fscache_n_retrievals_ok;
63058 +atomic_unchecked_t fscache_n_retrievals_wait;
63059 +atomic_unchecked_t fscache_n_retrievals_nodata;
63060 +atomic_unchecked_t fscache_n_retrievals_nobufs;
63061 +atomic_unchecked_t fscache_n_retrievals_intr;
63062 +atomic_unchecked_t fscache_n_retrievals_nomem;
63063 +atomic_unchecked_t fscache_n_retrievals_object_dead;
63064 +atomic_unchecked_t fscache_n_retrieval_ops;
63065 +atomic_unchecked_t fscache_n_retrieval_op_waits;
63066
63067 -atomic_t fscache_n_stores;
63068 -atomic_t fscache_n_stores_ok;
63069 -atomic_t fscache_n_stores_again;
63070 -atomic_t fscache_n_stores_nobufs;
63071 -atomic_t fscache_n_stores_oom;
63072 -atomic_t fscache_n_store_ops;
63073 -atomic_t fscache_n_store_calls;
63074 -atomic_t fscache_n_store_pages;
63075 -atomic_t fscache_n_store_radix_deletes;
63076 -atomic_t fscache_n_store_pages_over_limit;
63077 +atomic_unchecked_t fscache_n_stores;
63078 +atomic_unchecked_t fscache_n_stores_ok;
63079 +atomic_unchecked_t fscache_n_stores_again;
63080 +atomic_unchecked_t fscache_n_stores_nobufs;
63081 +atomic_unchecked_t fscache_n_stores_oom;
63082 +atomic_unchecked_t fscache_n_store_ops;
63083 +atomic_unchecked_t fscache_n_store_calls;
63084 +atomic_unchecked_t fscache_n_store_pages;
63085 +atomic_unchecked_t fscache_n_store_radix_deletes;
63086 +atomic_unchecked_t fscache_n_store_pages_over_limit;
63087
63088 -atomic_t fscache_n_store_vmscan_not_storing;
63089 -atomic_t fscache_n_store_vmscan_gone;
63090 -atomic_t fscache_n_store_vmscan_busy;
63091 -atomic_t fscache_n_store_vmscan_cancelled;
63092 -atomic_t fscache_n_store_vmscan_wait;
63093 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63094 +atomic_unchecked_t fscache_n_store_vmscan_gone;
63095 +atomic_unchecked_t fscache_n_store_vmscan_busy;
63096 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63097 +atomic_unchecked_t fscache_n_store_vmscan_wait;
63098
63099 -atomic_t fscache_n_marks;
63100 -atomic_t fscache_n_uncaches;
63101 +atomic_unchecked_t fscache_n_marks;
63102 +atomic_unchecked_t fscache_n_uncaches;
63103
63104 -atomic_t fscache_n_acquires;
63105 -atomic_t fscache_n_acquires_null;
63106 -atomic_t fscache_n_acquires_no_cache;
63107 -atomic_t fscache_n_acquires_ok;
63108 -atomic_t fscache_n_acquires_nobufs;
63109 -atomic_t fscache_n_acquires_oom;
63110 +atomic_unchecked_t fscache_n_acquires;
63111 +atomic_unchecked_t fscache_n_acquires_null;
63112 +atomic_unchecked_t fscache_n_acquires_no_cache;
63113 +atomic_unchecked_t fscache_n_acquires_ok;
63114 +atomic_unchecked_t fscache_n_acquires_nobufs;
63115 +atomic_unchecked_t fscache_n_acquires_oom;
63116
63117 -atomic_t fscache_n_invalidates;
63118 -atomic_t fscache_n_invalidates_run;
63119 +atomic_unchecked_t fscache_n_invalidates;
63120 +atomic_unchecked_t fscache_n_invalidates_run;
63121
63122 -atomic_t fscache_n_updates;
63123 -atomic_t fscache_n_updates_null;
63124 -atomic_t fscache_n_updates_run;
63125 +atomic_unchecked_t fscache_n_updates;
63126 +atomic_unchecked_t fscache_n_updates_null;
63127 +atomic_unchecked_t fscache_n_updates_run;
63128
63129 -atomic_t fscache_n_relinquishes;
63130 -atomic_t fscache_n_relinquishes_null;
63131 -atomic_t fscache_n_relinquishes_waitcrt;
63132 -atomic_t fscache_n_relinquishes_retire;
63133 +atomic_unchecked_t fscache_n_relinquishes;
63134 +atomic_unchecked_t fscache_n_relinquishes_null;
63135 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63136 +atomic_unchecked_t fscache_n_relinquishes_retire;
63137
63138 -atomic_t fscache_n_cookie_index;
63139 -atomic_t fscache_n_cookie_data;
63140 -atomic_t fscache_n_cookie_special;
63141 +atomic_unchecked_t fscache_n_cookie_index;
63142 +atomic_unchecked_t fscache_n_cookie_data;
63143 +atomic_unchecked_t fscache_n_cookie_special;
63144
63145 -atomic_t fscache_n_object_alloc;
63146 -atomic_t fscache_n_object_no_alloc;
63147 -atomic_t fscache_n_object_lookups;
63148 -atomic_t fscache_n_object_lookups_negative;
63149 -atomic_t fscache_n_object_lookups_positive;
63150 -atomic_t fscache_n_object_lookups_timed_out;
63151 -atomic_t fscache_n_object_created;
63152 -atomic_t fscache_n_object_avail;
63153 -atomic_t fscache_n_object_dead;
63154 +atomic_unchecked_t fscache_n_object_alloc;
63155 +atomic_unchecked_t fscache_n_object_no_alloc;
63156 +atomic_unchecked_t fscache_n_object_lookups;
63157 +atomic_unchecked_t fscache_n_object_lookups_negative;
63158 +atomic_unchecked_t fscache_n_object_lookups_positive;
63159 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
63160 +atomic_unchecked_t fscache_n_object_created;
63161 +atomic_unchecked_t fscache_n_object_avail;
63162 +atomic_unchecked_t fscache_n_object_dead;
63163
63164 -atomic_t fscache_n_checkaux_none;
63165 -atomic_t fscache_n_checkaux_okay;
63166 -atomic_t fscache_n_checkaux_update;
63167 -atomic_t fscache_n_checkaux_obsolete;
63168 +atomic_unchecked_t fscache_n_checkaux_none;
63169 +atomic_unchecked_t fscache_n_checkaux_okay;
63170 +atomic_unchecked_t fscache_n_checkaux_update;
63171 +atomic_unchecked_t fscache_n_checkaux_obsolete;
63172
63173 atomic_t fscache_n_cop_alloc_object;
63174 atomic_t fscache_n_cop_lookup_object;
63175 @@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63176 seq_puts(m, "FS-Cache statistics\n");
63177
63178 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63179 - atomic_read(&fscache_n_cookie_index),
63180 - atomic_read(&fscache_n_cookie_data),
63181 - atomic_read(&fscache_n_cookie_special));
63182 + atomic_read_unchecked(&fscache_n_cookie_index),
63183 + atomic_read_unchecked(&fscache_n_cookie_data),
63184 + atomic_read_unchecked(&fscache_n_cookie_special));
63185
63186 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63187 - atomic_read(&fscache_n_object_alloc),
63188 - atomic_read(&fscache_n_object_no_alloc),
63189 - atomic_read(&fscache_n_object_avail),
63190 - atomic_read(&fscache_n_object_dead));
63191 + atomic_read_unchecked(&fscache_n_object_alloc),
63192 + atomic_read_unchecked(&fscache_n_object_no_alloc),
63193 + atomic_read_unchecked(&fscache_n_object_avail),
63194 + atomic_read_unchecked(&fscache_n_object_dead));
63195 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63196 - atomic_read(&fscache_n_checkaux_none),
63197 - atomic_read(&fscache_n_checkaux_okay),
63198 - atomic_read(&fscache_n_checkaux_update),
63199 - atomic_read(&fscache_n_checkaux_obsolete));
63200 + atomic_read_unchecked(&fscache_n_checkaux_none),
63201 + atomic_read_unchecked(&fscache_n_checkaux_okay),
63202 + atomic_read_unchecked(&fscache_n_checkaux_update),
63203 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63204
63205 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63206 - atomic_read(&fscache_n_marks),
63207 - atomic_read(&fscache_n_uncaches));
63208 + atomic_read_unchecked(&fscache_n_marks),
63209 + atomic_read_unchecked(&fscache_n_uncaches));
63210
63211 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63212 " oom=%u\n",
63213 - atomic_read(&fscache_n_acquires),
63214 - atomic_read(&fscache_n_acquires_null),
63215 - atomic_read(&fscache_n_acquires_no_cache),
63216 - atomic_read(&fscache_n_acquires_ok),
63217 - atomic_read(&fscache_n_acquires_nobufs),
63218 - atomic_read(&fscache_n_acquires_oom));
63219 + atomic_read_unchecked(&fscache_n_acquires),
63220 + atomic_read_unchecked(&fscache_n_acquires_null),
63221 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
63222 + atomic_read_unchecked(&fscache_n_acquires_ok),
63223 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
63224 + atomic_read_unchecked(&fscache_n_acquires_oom));
63225
63226 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63227 - atomic_read(&fscache_n_object_lookups),
63228 - atomic_read(&fscache_n_object_lookups_negative),
63229 - atomic_read(&fscache_n_object_lookups_positive),
63230 - atomic_read(&fscache_n_object_created),
63231 - atomic_read(&fscache_n_object_lookups_timed_out));
63232 + atomic_read_unchecked(&fscache_n_object_lookups),
63233 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
63234 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
63235 + atomic_read_unchecked(&fscache_n_object_created),
63236 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63237
63238 seq_printf(m, "Invals : n=%u run=%u\n",
63239 - atomic_read(&fscache_n_invalidates),
63240 - atomic_read(&fscache_n_invalidates_run));
63241 + atomic_read_unchecked(&fscache_n_invalidates),
63242 + atomic_read_unchecked(&fscache_n_invalidates_run));
63243
63244 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63245 - atomic_read(&fscache_n_updates),
63246 - atomic_read(&fscache_n_updates_null),
63247 - atomic_read(&fscache_n_updates_run));
63248 + atomic_read_unchecked(&fscache_n_updates),
63249 + atomic_read_unchecked(&fscache_n_updates_null),
63250 + atomic_read_unchecked(&fscache_n_updates_run));
63251
63252 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63253 - atomic_read(&fscache_n_relinquishes),
63254 - atomic_read(&fscache_n_relinquishes_null),
63255 - atomic_read(&fscache_n_relinquishes_waitcrt),
63256 - atomic_read(&fscache_n_relinquishes_retire));
63257 + atomic_read_unchecked(&fscache_n_relinquishes),
63258 + atomic_read_unchecked(&fscache_n_relinquishes_null),
63259 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63260 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
63261
63262 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63263 - atomic_read(&fscache_n_attr_changed),
63264 - atomic_read(&fscache_n_attr_changed_ok),
63265 - atomic_read(&fscache_n_attr_changed_nobufs),
63266 - atomic_read(&fscache_n_attr_changed_nomem),
63267 - atomic_read(&fscache_n_attr_changed_calls));
63268 + atomic_read_unchecked(&fscache_n_attr_changed),
63269 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
63270 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63271 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63272 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
63273
63274 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63275 - atomic_read(&fscache_n_allocs),
63276 - atomic_read(&fscache_n_allocs_ok),
63277 - atomic_read(&fscache_n_allocs_wait),
63278 - atomic_read(&fscache_n_allocs_nobufs),
63279 - atomic_read(&fscache_n_allocs_intr));
63280 + atomic_read_unchecked(&fscache_n_allocs),
63281 + atomic_read_unchecked(&fscache_n_allocs_ok),
63282 + atomic_read_unchecked(&fscache_n_allocs_wait),
63283 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
63284 + atomic_read_unchecked(&fscache_n_allocs_intr));
63285 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63286 - atomic_read(&fscache_n_alloc_ops),
63287 - atomic_read(&fscache_n_alloc_op_waits),
63288 - atomic_read(&fscache_n_allocs_object_dead));
63289 + atomic_read_unchecked(&fscache_n_alloc_ops),
63290 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
63291 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
63292
63293 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63294 " int=%u oom=%u\n",
63295 - atomic_read(&fscache_n_retrievals),
63296 - atomic_read(&fscache_n_retrievals_ok),
63297 - atomic_read(&fscache_n_retrievals_wait),
63298 - atomic_read(&fscache_n_retrievals_nodata),
63299 - atomic_read(&fscache_n_retrievals_nobufs),
63300 - atomic_read(&fscache_n_retrievals_intr),
63301 - atomic_read(&fscache_n_retrievals_nomem));
63302 + atomic_read_unchecked(&fscache_n_retrievals),
63303 + atomic_read_unchecked(&fscache_n_retrievals_ok),
63304 + atomic_read_unchecked(&fscache_n_retrievals_wait),
63305 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
63306 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63307 + atomic_read_unchecked(&fscache_n_retrievals_intr),
63308 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
63309 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63310 - atomic_read(&fscache_n_retrieval_ops),
63311 - atomic_read(&fscache_n_retrieval_op_waits),
63312 - atomic_read(&fscache_n_retrievals_object_dead));
63313 + atomic_read_unchecked(&fscache_n_retrieval_ops),
63314 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63315 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63316
63317 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63318 - atomic_read(&fscache_n_stores),
63319 - atomic_read(&fscache_n_stores_ok),
63320 - atomic_read(&fscache_n_stores_again),
63321 - atomic_read(&fscache_n_stores_nobufs),
63322 - atomic_read(&fscache_n_stores_oom));
63323 + atomic_read_unchecked(&fscache_n_stores),
63324 + atomic_read_unchecked(&fscache_n_stores_ok),
63325 + atomic_read_unchecked(&fscache_n_stores_again),
63326 + atomic_read_unchecked(&fscache_n_stores_nobufs),
63327 + atomic_read_unchecked(&fscache_n_stores_oom));
63328 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63329 - atomic_read(&fscache_n_store_ops),
63330 - atomic_read(&fscache_n_store_calls),
63331 - atomic_read(&fscache_n_store_pages),
63332 - atomic_read(&fscache_n_store_radix_deletes),
63333 - atomic_read(&fscache_n_store_pages_over_limit));
63334 + atomic_read_unchecked(&fscache_n_store_ops),
63335 + atomic_read_unchecked(&fscache_n_store_calls),
63336 + atomic_read_unchecked(&fscache_n_store_pages),
63337 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
63338 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63339
63340 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63341 - atomic_read(&fscache_n_store_vmscan_not_storing),
63342 - atomic_read(&fscache_n_store_vmscan_gone),
63343 - atomic_read(&fscache_n_store_vmscan_busy),
63344 - atomic_read(&fscache_n_store_vmscan_cancelled),
63345 - atomic_read(&fscache_n_store_vmscan_wait));
63346 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63347 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63348 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63349 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63350 + atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63351
63352 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63353 - atomic_read(&fscache_n_op_pend),
63354 - atomic_read(&fscache_n_op_run),
63355 - atomic_read(&fscache_n_op_enqueue),
63356 - atomic_read(&fscache_n_op_cancelled),
63357 - atomic_read(&fscache_n_op_rejected));
63358 + atomic_read_unchecked(&fscache_n_op_pend),
63359 + atomic_read_unchecked(&fscache_n_op_run),
63360 + atomic_read_unchecked(&fscache_n_op_enqueue),
63361 + atomic_read_unchecked(&fscache_n_op_cancelled),
63362 + atomic_read_unchecked(&fscache_n_op_rejected));
63363 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63364 - atomic_read(&fscache_n_op_deferred_release),
63365 - atomic_read(&fscache_n_op_release),
63366 - atomic_read(&fscache_n_op_gc));
63367 + atomic_read_unchecked(&fscache_n_op_deferred_release),
63368 + atomic_read_unchecked(&fscache_n_op_release),
63369 + atomic_read_unchecked(&fscache_n_op_gc));
63370
63371 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63372 atomic_read(&fscache_n_cop_alloc_object),
63373 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63374 index 966ace8..030a03a 100644
63375 --- a/fs/fuse/cuse.c
63376 +++ b/fs/fuse/cuse.c
63377 @@ -611,10 +611,12 @@ static int __init cuse_init(void)
63378 INIT_LIST_HEAD(&cuse_conntbl[i]);
63379
63380 /* inherit and extend fuse_dev_operations */
63381 - cuse_channel_fops = fuse_dev_operations;
63382 - cuse_channel_fops.owner = THIS_MODULE;
63383 - cuse_channel_fops.open = cuse_channel_open;
63384 - cuse_channel_fops.release = cuse_channel_release;
63385 + pax_open_kernel();
63386 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
63387 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
63388 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
63389 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
63390 + pax_close_kernel();
63391
63392 cuse_class = class_create(THIS_MODULE, "cuse");
63393 if (IS_ERR(cuse_class))
63394 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
63395 index ca88731..8e9c55d 100644
63396 --- a/fs/fuse/dev.c
63397 +++ b/fs/fuse/dev.c
63398 @@ -1318,7 +1318,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63399 ret = 0;
63400 pipe_lock(pipe);
63401
63402 - if (!pipe->readers) {
63403 + if (!atomic_read(&pipe->readers)) {
63404 send_sig(SIGPIPE, current, 0);
63405 if (!ret)
63406 ret = -EPIPE;
63407 @@ -1347,7 +1347,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63408 page_nr++;
63409 ret += buf->len;
63410
63411 - if (pipe->files)
63412 + if (atomic_read(&pipe->files))
63413 do_wakeup = 1;
63414 }
63415
63416 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
63417 index dbab798..fefa22b 100644
63418 --- a/fs/fuse/dir.c
63419 +++ b/fs/fuse/dir.c
63420 @@ -1474,7 +1474,7 @@ static char *read_link(struct dentry *dentry)
63421 return link;
63422 }
63423
63424 -static void free_link(char *link)
63425 +static void free_link(const char *link)
63426 {
63427 if (!IS_ERR(link))
63428 free_page((unsigned long) link);
63429 diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
63430 index fd62cae..3494dfa 100644
63431 --- a/fs/hostfs/hostfs_kern.c
63432 +++ b/fs/hostfs/hostfs_kern.c
63433 @@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
63434
63435 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
63436 {
63437 - char *s = nd_get_link(nd);
63438 + const char *s = nd_get_link(nd);
63439 if (!IS_ERR(s))
63440 __putname(s);
63441 }
63442 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
63443 index 1e2872b..7aea000 100644
63444 --- a/fs/hugetlbfs/inode.c
63445 +++ b/fs/hugetlbfs/inode.c
63446 @@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63447 struct mm_struct *mm = current->mm;
63448 struct vm_area_struct *vma;
63449 struct hstate *h = hstate_file(file);
63450 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
63451 struct vm_unmapped_area_info info;
63452
63453 if (len & ~huge_page_mask(h))
63454 @@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63455 return addr;
63456 }
63457
63458 +#ifdef CONFIG_PAX_RANDMMAP
63459 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
63460 +#endif
63461 +
63462 if (addr) {
63463 addr = ALIGN(addr, huge_page_size(h));
63464 vma = find_vma(mm, addr);
63465 - if (TASK_SIZE - len >= addr &&
63466 - (!vma || addr + len <= vma->vm_start))
63467 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
63468 return addr;
63469 }
63470
63471 info.flags = 0;
63472 info.length = len;
63473 info.low_limit = TASK_UNMAPPED_BASE;
63474 +
63475 +#ifdef CONFIG_PAX_RANDMMAP
63476 + if (mm->pax_flags & MF_PAX_RANDMMAP)
63477 + info.low_limit += mm->delta_mmap;
63478 +#endif
63479 +
63480 info.high_limit = TASK_SIZE;
63481 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
63482 info.align_offset = 0;
63483 @@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
63484 };
63485 MODULE_ALIAS_FS("hugetlbfs");
63486
63487 -static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63488 +struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63489
63490 static int can_do_hugetlb_shm(void)
63491 {
63492 diff --git a/fs/inode.c b/fs/inode.c
63493 index 26753ba..d19eb34 100644
63494 --- a/fs/inode.c
63495 +++ b/fs/inode.c
63496 @@ -840,16 +840,20 @@ unsigned int get_next_ino(void)
63497 unsigned int *p = &get_cpu_var(last_ino);
63498 unsigned int res = *p;
63499
63500 +start:
63501 +
63502 #ifdef CONFIG_SMP
63503 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
63504 - static atomic_t shared_last_ino;
63505 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
63506 + static atomic_unchecked_t shared_last_ino;
63507 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
63508
63509 res = next - LAST_INO_BATCH;
63510 }
63511 #endif
63512
63513 - *p = ++res;
63514 + if (unlikely(!++res))
63515 + goto start; /* never zero */
63516 + *p = res;
63517 put_cpu_var(last_ino);
63518 return res;
63519 }
63520 diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
63521 index f488bba..bb63254 100644
63522 --- a/fs/isofs/rock.c
63523 +++ b/fs/isofs/rock.c
63524 @@ -30,6 +30,7 @@ struct rock_state {
63525 int cont_size;
63526 int cont_extent;
63527 int cont_offset;
63528 + int cont_loops;
63529 struct inode *inode;
63530 };
63531
63532 @@ -73,6 +74,9 @@ static void init_rock_state(struct rock_state *rs, struct inode *inode)
63533 rs->inode = inode;
63534 }
63535
63536 +/* Maximum number of Rock Ridge continuation entries */
63537 +#define RR_MAX_CE_ENTRIES 32
63538 +
63539 /*
63540 * Returns 0 if the caller should continue scanning, 1 if the scan must end
63541 * and -ve on error.
63542 @@ -105,6 +109,8 @@ static int rock_continue(struct rock_state *rs)
63543 goto out;
63544 }
63545 ret = -EIO;
63546 + if (++rs->cont_loops >= RR_MAX_CE_ENTRIES)
63547 + goto out;
63548 bh = sb_bread(rs->inode->i_sb, rs->cont_extent);
63549 if (bh) {
63550 memcpy(rs->buffer, bh->b_data + rs->cont_offset,
63551 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
63552 index 4a6cf28..d3a29d3 100644
63553 --- a/fs/jffs2/erase.c
63554 +++ b/fs/jffs2/erase.c
63555 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
63556 struct jffs2_unknown_node marker = {
63557 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
63558 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63559 - .totlen = cpu_to_je32(c->cleanmarker_size)
63560 + .totlen = cpu_to_je32(c->cleanmarker_size),
63561 + .hdr_crc = cpu_to_je32(0)
63562 };
63563
63564 jffs2_prealloc_raw_node_refs(c, jeb, 1);
63565 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
63566 index 09ed551..45684f8 100644
63567 --- a/fs/jffs2/wbuf.c
63568 +++ b/fs/jffs2/wbuf.c
63569 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
63570 {
63571 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
63572 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63573 - .totlen = constant_cpu_to_je32(8)
63574 + .totlen = constant_cpu_to_je32(8),
63575 + .hdr_crc = constant_cpu_to_je32(0)
63576 };
63577
63578 /*
63579 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
63580 index 93e897e..a863de4 100644
63581 --- a/fs/jfs/super.c
63582 +++ b/fs/jfs/super.c
63583 @@ -893,7 +893,7 @@ static int __init init_jfs_fs(void)
63584
63585 jfs_inode_cachep =
63586 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
63587 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
63588 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
63589 init_once);
63590 if (jfs_inode_cachep == NULL)
63591 return -ENOMEM;
63592 diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
63593 index 1c77193..5cfb7b57 100644
63594 --- a/fs/kernfs/dir.c
63595 +++ b/fs/kernfs/dir.c
63596 @@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
63597 *
63598 * Returns 31 bit hash of ns + name (so it fits in an off_t )
63599 */
63600 -static unsigned int kernfs_name_hash(const char *name, const void *ns)
63601 +static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
63602 {
63603 unsigned long hash = init_name_hash();
63604 unsigned int len = strlen(name);
63605 @@ -829,6 +829,10 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
63606 ret = scops->mkdir(parent, dentry->d_name.name, mode);
63607
63608 kernfs_put_active(parent);
63609 +
63610 + if (!ret)
63611 + ret = kernfs_iop_lookup(dir, dentry, 0);
63612 +
63613 return ret;
63614 }
63615
63616 diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
63617 index 4429d6d..9831f52 100644
63618 --- a/fs/kernfs/file.c
63619 +++ b/fs/kernfs/file.c
63620 @@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
63621
63622 struct kernfs_open_node {
63623 atomic_t refcnt;
63624 - atomic_t event;
63625 + atomic_unchecked_t event;
63626 wait_queue_head_t poll;
63627 struct list_head files; /* goes through kernfs_open_file.list */
63628 };
63629 @@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
63630 {
63631 struct kernfs_open_file *of = sf->private;
63632
63633 - of->event = atomic_read(&of->kn->attr.open->event);
63634 + of->event = atomic_read_unchecked(&of->kn->attr.open->event);
63635
63636 return of->kn->attr.ops->seq_show(sf, v);
63637 }
63638 @@ -375,12 +375,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
63639 return ret;
63640 }
63641
63642 -static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63643 - void *buf, int len, int write)
63644 +static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63645 + void *buf, size_t len, int write)
63646 {
63647 struct file *file = vma->vm_file;
63648 struct kernfs_open_file *of = kernfs_of(file);
63649 - int ret;
63650 + ssize_t ret;
63651
63652 if (!of->vm_ops)
63653 return -EINVAL;
63654 @@ -581,7 +581,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
63655 return -ENOMEM;
63656
63657 atomic_set(&new_on->refcnt, 0);
63658 - atomic_set(&new_on->event, 1);
63659 + atomic_set_unchecked(&new_on->event, 1);
63660 init_waitqueue_head(&new_on->poll);
63661 INIT_LIST_HEAD(&new_on->files);
63662 goto retry;
63663 @@ -787,7 +787,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
63664
63665 kernfs_put_active(kn);
63666
63667 - if (of->event != atomic_read(&on->event))
63668 + if (of->event != atomic_read_unchecked(&on->event))
63669 goto trigger;
63670
63671 return DEFAULT_POLLMASK;
63672 @@ -818,7 +818,7 @@ repeat:
63673
63674 on = kn->attr.open;
63675 if (on) {
63676 - atomic_inc(&on->event);
63677 + atomic_inc_unchecked(&on->event);
63678 wake_up_interruptible(&on->poll);
63679 }
63680
63681 diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
63682 index 8a19889..4c3069a 100644
63683 --- a/fs/kernfs/symlink.c
63684 +++ b/fs/kernfs/symlink.c
63685 @@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
63686 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
63687 void *cookie)
63688 {
63689 - char *page = nd_get_link(nd);
63690 + const char *page = nd_get_link(nd);
63691 if (!IS_ERR(page))
63692 free_page((unsigned long)page);
63693 }
63694 diff --git a/fs/libfs.c b/fs/libfs.c
63695 index 005843c..06c4191 100644
63696 --- a/fs/libfs.c
63697 +++ b/fs/libfs.c
63698 @@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63699
63700 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
63701 struct dentry *next = list_entry(p, struct dentry, d_child);
63702 + char d_name[sizeof(next->d_iname)];
63703 + const unsigned char *name;
63704 +
63705 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
63706 if (!simple_positive(next)) {
63707 spin_unlock(&next->d_lock);
63708 @@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63709
63710 spin_unlock(&next->d_lock);
63711 spin_unlock(&dentry->d_lock);
63712 - if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
63713 + name = next->d_name.name;
63714 + if (name == next->d_iname) {
63715 + memcpy(d_name, name, next->d_name.len);
63716 + name = d_name;
63717 + }
63718 + if (!dir_emit(ctx, name, next->d_name.len,
63719 next->d_inode->i_ino, dt_type(next->d_inode)))
63720 return 0;
63721 spin_lock(&dentry->d_lock);
63722 @@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
63723 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
63724 void *cookie)
63725 {
63726 - char *s = nd_get_link(nd);
63727 + const char *s = nd_get_link(nd);
63728 if (!IS_ERR(s))
63729 kfree(s);
63730 }
63731 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
63732 index acd3947..1f896e2 100644
63733 --- a/fs/lockd/clntproc.c
63734 +++ b/fs/lockd/clntproc.c
63735 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
63736 /*
63737 * Cookie counter for NLM requests
63738 */
63739 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
63740 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
63741
63742 void nlmclnt_next_cookie(struct nlm_cookie *c)
63743 {
63744 - u32 cookie = atomic_inc_return(&nlm_cookie);
63745 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
63746
63747 memcpy(c->data, &cookie, 4);
63748 c->len=4;
63749 diff --git a/fs/locks.c b/fs/locks.c
63750 index 735b8d3..dfc44a2 100644
63751 --- a/fs/locks.c
63752 +++ b/fs/locks.c
63753 @@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
63754 locks_remove_posix(filp, filp);
63755
63756 if (filp->f_op->flock) {
63757 - struct file_lock fl = {
63758 + struct file_lock flock = {
63759 .fl_owner = filp,
63760 .fl_pid = current->tgid,
63761 .fl_file = filp,
63762 @@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
63763 .fl_type = F_UNLCK,
63764 .fl_end = OFFSET_MAX,
63765 };
63766 - filp->f_op->flock(filp, F_SETLKW, &fl);
63767 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
63768 - fl.fl_ops->fl_release_private(&fl);
63769 + filp->f_op->flock(filp, F_SETLKW, &flock);
63770 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
63771 + flock.fl_ops->fl_release_private(&flock);
63772 }
63773
63774 spin_lock(&inode->i_lock);
63775 diff --git a/fs/mount.h b/fs/mount.h
63776 index f82c628..9492b99 100644
63777 --- a/fs/mount.h
63778 +++ b/fs/mount.h
63779 @@ -11,7 +11,7 @@ struct mnt_namespace {
63780 u64 seq; /* Sequence number to prevent loops */
63781 wait_queue_head_t poll;
63782 u64 event;
63783 -};
63784 +} __randomize_layout;
63785
63786 struct mnt_pcp {
63787 int mnt_count;
63788 @@ -62,7 +62,7 @@ struct mount {
63789 int mnt_expiry_mark; /* true if marked for expiry */
63790 struct hlist_head mnt_pins;
63791 struct path mnt_ex_mountpoint;
63792 -};
63793 +} __randomize_layout;
63794
63795 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
63796
63797 diff --git a/fs/namei.c b/fs/namei.c
63798 index db5fe86..d3dcc14 100644
63799 --- a/fs/namei.c
63800 +++ b/fs/namei.c
63801 @@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
63802 if (ret != -EACCES)
63803 return ret;
63804
63805 +#ifdef CONFIG_GRKERNSEC
63806 + /* we'll block if we have to log due to a denied capability use */
63807 + if (mask & MAY_NOT_BLOCK)
63808 + return -ECHILD;
63809 +#endif
63810 +
63811 if (S_ISDIR(inode->i_mode)) {
63812 /* DACs are overridable for directories */
63813 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63814 - return 0;
63815 if (!(mask & MAY_WRITE))
63816 - if (capable_wrt_inode_uidgid(inode,
63817 - CAP_DAC_READ_SEARCH))
63818 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63819 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63820 return 0;
63821 + if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63822 + return 0;
63823 return -EACCES;
63824 }
63825 /*
63826 + * Searching includes executable on directories, else just read.
63827 + */
63828 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63829 + if (mask == MAY_READ)
63830 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63831 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63832 + return 0;
63833 +
63834 + /*
63835 * Read/write DACs are always overridable.
63836 * Executable DACs are overridable when there is
63837 * at least one exec bit set.
63838 @@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
63839 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63840 return 0;
63841
63842 - /*
63843 - * Searching includes executable on directories, else just read.
63844 - */
63845 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63846 - if (mask == MAY_READ)
63847 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63848 - return 0;
63849 -
63850 return -EACCES;
63851 }
63852 EXPORT_SYMBOL(generic_permission);
63853 @@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63854 {
63855 struct dentry *dentry = link->dentry;
63856 int error;
63857 - char *s;
63858 + const char *s;
63859
63860 BUG_ON(nd->flags & LOOKUP_RCU);
63861
63862 @@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63863 if (error)
63864 goto out_put_nd_path;
63865
63866 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
63867 + dentry->d_inode, dentry, nd->path.mnt)) {
63868 + error = -EACCES;
63869 + goto out_put_nd_path;
63870 + }
63871 +
63872 nd->last_type = LAST_BIND;
63873 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
63874 error = PTR_ERR(*p);
63875 @@ -1608,6 +1621,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
63876 if (res)
63877 break;
63878 res = walk_component(nd, path, LOOKUP_FOLLOW);
63879 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
63880 + res = -EACCES;
63881 put_link(nd, &link, cookie);
63882 } while (res > 0);
63883
63884 @@ -1680,7 +1695,7 @@ EXPORT_SYMBOL(full_name_hash);
63885 static inline u64 hash_name(const char *name)
63886 {
63887 unsigned long a, b, adata, bdata, mask, hash, len;
63888 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63889 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63890
63891 hash = a = 0;
63892 len = -sizeof(unsigned long);
63893 @@ -1969,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
63894 if (err)
63895 break;
63896 err = lookup_last(nd, &path);
63897 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
63898 + err = -EACCES;
63899 put_link(nd, &link, cookie);
63900 }
63901 }
63902 @@ -1976,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
63903 if (!err)
63904 err = complete_walk(nd);
63905
63906 + if (!err && !(nd->flags & LOOKUP_PARENT)) {
63907 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
63908 + path_put(&nd->path);
63909 + err = -ENOENT;
63910 + }
63911 + }
63912 +
63913 if (!err && nd->flags & LOOKUP_DIRECTORY) {
63914 if (!d_can_lookup(nd->path.dentry)) {
63915 path_put(&nd->path);
63916 @@ -2004,8 +2028,15 @@ static int filename_lookup(int dfd, struct filename *name,
63917 retval = path_lookupat(dfd, name->name,
63918 flags | LOOKUP_REVAL, nd);
63919
63920 - if (likely(!retval))
63921 + if (likely(!retval)) {
63922 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
63923 + if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
63924 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
63925 + path_put(&nd->path);
63926 + return -ENOENT;
63927 + }
63928 + }
63929 + }
63930 return retval;
63931 }
63932
63933 @@ -2582,6 +2613,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
63934 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
63935 return -EPERM;
63936
63937 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
63938 + return -EPERM;
63939 + if (gr_handle_rawio(inode))
63940 + return -EPERM;
63941 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
63942 + return -EACCES;
63943 +
63944 return 0;
63945 }
63946
63947 @@ -2813,7 +2851,7 @@ looked_up:
63948 * cleared otherwise prior to returning.
63949 */
63950 static int lookup_open(struct nameidata *nd, struct path *path,
63951 - struct file *file,
63952 + struct path *link, struct file *file,
63953 const struct open_flags *op,
63954 bool got_write, int *opened)
63955 {
63956 @@ -2848,6 +2886,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63957 /* Negative dentry, just create the file */
63958 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
63959 umode_t mode = op->mode;
63960 +
63961 + if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
63962 + error = -EACCES;
63963 + goto out_dput;
63964 + }
63965 +
63966 + if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
63967 + error = -EACCES;
63968 + goto out_dput;
63969 + }
63970 +
63971 if (!IS_POSIXACL(dir->d_inode))
63972 mode &= ~current_umask();
63973 /*
63974 @@ -2869,6 +2918,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63975 nd->flags & LOOKUP_EXCL);
63976 if (error)
63977 goto out_dput;
63978 + else
63979 + gr_handle_create(dentry, nd->path.mnt);
63980 }
63981 out_no_open:
63982 path->dentry = dentry;
63983 @@ -2883,7 +2934,7 @@ out_dput:
63984 /*
63985 * Handle the last step of open()
63986 */
63987 -static int do_last(struct nameidata *nd, struct path *path,
63988 +static int do_last(struct nameidata *nd, struct path *path, struct path *link,
63989 struct file *file, const struct open_flags *op,
63990 int *opened, struct filename *name)
63991 {
63992 @@ -2933,6 +2984,15 @@ static int do_last(struct nameidata *nd, struct path *path,
63993 if (error)
63994 return error;
63995
63996 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
63997 + error = -ENOENT;
63998 + goto out;
63999 + }
64000 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
64001 + error = -EACCES;
64002 + goto out;
64003 + }
64004 +
64005 audit_inode(name, dir, LOOKUP_PARENT);
64006 error = -EISDIR;
64007 /* trailing slashes? */
64008 @@ -2952,7 +3012,7 @@ retry_lookup:
64009 */
64010 }
64011 mutex_lock(&dir->d_inode->i_mutex);
64012 - error = lookup_open(nd, path, file, op, got_write, opened);
64013 + error = lookup_open(nd, path, link, file, op, got_write, opened);
64014 mutex_unlock(&dir->d_inode->i_mutex);
64015
64016 if (error <= 0) {
64017 @@ -2976,11 +3036,28 @@ retry_lookup:
64018 goto finish_open_created;
64019 }
64020
64021 + if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
64022 + error = -ENOENT;
64023 + goto exit_dput;
64024 + }
64025 + if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
64026 + error = -EACCES;
64027 + goto exit_dput;
64028 + }
64029 +
64030 /*
64031 * create/update audit record if it already exists.
64032 */
64033 - if (d_is_positive(path->dentry))
64034 + if (d_is_positive(path->dentry)) {
64035 + /* only check if O_CREAT is specified, all other checks need to go
64036 + into may_open */
64037 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
64038 + error = -EACCES;
64039 + goto exit_dput;
64040 + }
64041 +
64042 audit_inode(name, path->dentry, 0);
64043 + }
64044
64045 /*
64046 * If atomic_open() acquired write access it is dropped now due to
64047 @@ -3021,6 +3098,11 @@ finish_lookup:
64048 }
64049 }
64050 BUG_ON(inode != path->dentry->d_inode);
64051 + /* if we're resolving a symlink to another symlink */
64052 + if (link && gr_handle_symlink_owner(link, inode)) {
64053 + error = -EACCES;
64054 + goto out;
64055 + }
64056 return 1;
64057 }
64058
64059 @@ -3040,7 +3122,18 @@ finish_open:
64060 path_put(&save_parent);
64061 return error;
64062 }
64063 +
64064 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64065 + error = -ENOENT;
64066 + goto out;
64067 + }
64068 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
64069 + error = -EACCES;
64070 + goto out;
64071 + }
64072 +
64073 audit_inode(name, nd->path.dentry, 0);
64074 +
64075 error = -EISDIR;
64076 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
64077 goto out;
64078 @@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64079 if (unlikely(error))
64080 goto out;
64081
64082 - error = do_last(nd, &path, file, op, &opened, pathname);
64083 + error = do_last(nd, &path, NULL, file, op, &opened, pathname);
64084 while (unlikely(error > 0)) { /* trailing symlink */
64085 struct path link = path;
64086 void *cookie;
64087 @@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64088 error = follow_link(&link, nd, &cookie);
64089 if (unlikely(error))
64090 break;
64091 - error = do_last(nd, &path, file, op, &opened, pathname);
64092 + error = do_last(nd, &path, &link, file, op, &opened, pathname);
64093 put_link(nd, &link, cookie);
64094 }
64095 out:
64096 @@ -3325,9 +3418,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
64097 goto unlock;
64098
64099 error = -EEXIST;
64100 - if (d_is_positive(dentry))
64101 + if (d_is_positive(dentry)) {
64102 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64103 + error = -ENOENT;
64104 goto fail;
64105 -
64106 + }
64107 /*
64108 * Special case - lookup gave negative, but... we had foo/bar/
64109 * From the vfs_mknod() POV we just have a negative dentry -
64110 @@ -3379,6 +3474,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64111 }
64112 EXPORT_SYMBOL(user_path_create);
64113
64114 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64115 +{
64116 + struct filename *tmp = getname(pathname);
64117 + struct dentry *res;
64118 + if (IS_ERR(tmp))
64119 + return ERR_CAST(tmp);
64120 + res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64121 + if (IS_ERR(res))
64122 + putname(tmp);
64123 + else
64124 + *to = tmp;
64125 + return res;
64126 +}
64127 +
64128 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64129 {
64130 int error = may_create(dir, dentry);
64131 @@ -3442,6 +3551,17 @@ retry:
64132
64133 if (!IS_POSIXACL(path.dentry->d_inode))
64134 mode &= ~current_umask();
64135 +
64136 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64137 + error = -EPERM;
64138 + goto out;
64139 + }
64140 +
64141 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64142 + error = -EACCES;
64143 + goto out;
64144 + }
64145 +
64146 error = security_path_mknod(&path, dentry, mode, dev);
64147 if (error)
64148 goto out;
64149 @@ -3457,6 +3577,8 @@ retry:
64150 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64151 break;
64152 }
64153 + if (!error)
64154 + gr_handle_create(dentry, path.mnt);
64155 out:
64156 done_path_create(&path, dentry);
64157 if (retry_estale(error, lookup_flags)) {
64158 @@ -3511,9 +3633,16 @@ retry:
64159
64160 if (!IS_POSIXACL(path.dentry->d_inode))
64161 mode &= ~current_umask();
64162 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64163 + error = -EACCES;
64164 + goto out;
64165 + }
64166 error = security_path_mkdir(&path, dentry, mode);
64167 if (!error)
64168 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64169 + if (!error)
64170 + gr_handle_create(dentry, path.mnt);
64171 +out:
64172 done_path_create(&path, dentry);
64173 if (retry_estale(error, lookup_flags)) {
64174 lookup_flags |= LOOKUP_REVAL;
64175 @@ -3597,6 +3726,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64176 struct filename *name;
64177 struct dentry *dentry;
64178 struct nameidata nd;
64179 + ino_t saved_ino = 0;
64180 + dev_t saved_dev = 0;
64181 unsigned int lookup_flags = 0;
64182 retry:
64183 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64184 @@ -3629,10 +3760,21 @@ retry:
64185 error = -ENOENT;
64186 goto exit3;
64187 }
64188 +
64189 + saved_ino = dentry->d_inode->i_ino;
64190 + saved_dev = gr_get_dev_from_dentry(dentry);
64191 +
64192 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64193 + error = -EACCES;
64194 + goto exit3;
64195 + }
64196 +
64197 error = security_path_rmdir(&nd.path, dentry);
64198 if (error)
64199 goto exit3;
64200 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64201 + if (!error && (saved_dev || saved_ino))
64202 + gr_handle_delete(saved_ino, saved_dev);
64203 exit3:
64204 dput(dentry);
64205 exit2:
64206 @@ -3725,6 +3867,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64207 struct nameidata nd;
64208 struct inode *inode = NULL;
64209 struct inode *delegated_inode = NULL;
64210 + ino_t saved_ino = 0;
64211 + dev_t saved_dev = 0;
64212 unsigned int lookup_flags = 0;
64213 retry:
64214 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64215 @@ -3751,10 +3895,22 @@ retry_deleg:
64216 if (d_is_negative(dentry))
64217 goto slashes;
64218 ihold(inode);
64219 +
64220 + if (inode->i_nlink <= 1) {
64221 + saved_ino = inode->i_ino;
64222 + saved_dev = gr_get_dev_from_dentry(dentry);
64223 + }
64224 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64225 + error = -EACCES;
64226 + goto exit2;
64227 + }
64228 +
64229 error = security_path_unlink(&nd.path, dentry);
64230 if (error)
64231 goto exit2;
64232 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64233 + if (!error && (saved_ino || saved_dev))
64234 + gr_handle_delete(saved_ino, saved_dev);
64235 exit2:
64236 dput(dentry);
64237 }
64238 @@ -3843,9 +3999,17 @@ retry:
64239 if (IS_ERR(dentry))
64240 goto out_putname;
64241
64242 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64243 + error = -EACCES;
64244 + goto out;
64245 + }
64246 +
64247 error = security_path_symlink(&path, dentry, from->name);
64248 if (!error)
64249 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
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 lookup_flags |= LOOKUP_REVAL;
64256 @@ -3949,6 +4113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64257 struct dentry *new_dentry;
64258 struct path old_path, new_path;
64259 struct inode *delegated_inode = NULL;
64260 + struct filename *to = NULL;
64261 int how = 0;
64262 int error;
64263
64264 @@ -3972,7 +4137,7 @@ retry:
64265 if (error)
64266 return error;
64267
64268 - new_dentry = user_path_create(newdfd, newname, &new_path,
64269 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64270 (how & LOOKUP_REVAL));
64271 error = PTR_ERR(new_dentry);
64272 if (IS_ERR(new_dentry))
64273 @@ -3984,11 +4149,28 @@ retry:
64274 error = may_linkat(&old_path);
64275 if (unlikely(error))
64276 goto out_dput;
64277 +
64278 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64279 + old_path.dentry->d_inode,
64280 + old_path.dentry->d_inode->i_mode, to)) {
64281 + error = -EACCES;
64282 + goto out_dput;
64283 + }
64284 +
64285 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64286 + old_path.dentry, old_path.mnt, to)) {
64287 + error = -EACCES;
64288 + goto out_dput;
64289 + }
64290 +
64291 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64292 if (error)
64293 goto out_dput;
64294 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64295 + if (!error)
64296 + gr_handle_create(new_dentry, new_path.mnt);
64297 out_dput:
64298 + putname(to);
64299 done_path_create(&new_path, new_dentry);
64300 if (delegated_inode) {
64301 error = break_deleg_wait(&delegated_inode);
64302 @@ -4304,6 +4486,12 @@ retry_deleg:
64303 if (new_dentry == trap)
64304 goto exit5;
64305
64306 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64307 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
64308 + to, flags);
64309 + if (error)
64310 + goto exit5;
64311 +
64312 error = security_path_rename(&oldnd.path, old_dentry,
64313 &newnd.path, new_dentry, flags);
64314 if (error)
64315 @@ -4311,6 +4499,9 @@ retry_deleg:
64316 error = vfs_rename(old_dir->d_inode, old_dentry,
64317 new_dir->d_inode, new_dentry,
64318 &delegated_inode, flags);
64319 + if (!error)
64320 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64321 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64322 exit5:
64323 dput(new_dentry);
64324 exit4:
64325 @@ -4367,14 +4558,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64326
64327 int readlink_copy(char __user *buffer, int buflen, const char *link)
64328 {
64329 + char tmpbuf[64];
64330 + const char *newlink;
64331 int len = PTR_ERR(link);
64332 +
64333 if (IS_ERR(link))
64334 goto out;
64335
64336 len = strlen(link);
64337 if (len > (unsigned) buflen)
64338 len = buflen;
64339 - if (copy_to_user(buffer, link, len))
64340 +
64341 + if (len < sizeof(tmpbuf)) {
64342 + memcpy(tmpbuf, link, len);
64343 + newlink = tmpbuf;
64344 + } else
64345 + newlink = link;
64346 +
64347 + if (copy_to_user(buffer, newlink, len))
64348 len = -EFAULT;
64349 out:
64350 return len;
64351 diff --git a/fs/namespace.c b/fs/namespace.c
64352 index 5b66b2b..4d8290d 100644
64353 --- a/fs/namespace.c
64354 +++ b/fs/namespace.c
64355 @@ -1369,6 +1369,8 @@ void umount_tree(struct mount *mnt, int how)
64356 }
64357 if (last) {
64358 last->mnt_hash.next = unmounted.first;
64359 + if (unmounted.first)
64360 + unmounted.first->pprev = &last->mnt_hash.next;
64361 unmounted.first = tmp_list.first;
64362 unmounted.first->pprev = &unmounted.first;
64363 }
64364 @@ -1445,6 +1447,9 @@ static int do_umount(struct mount *mnt, int flags)
64365 if (!(sb->s_flags & MS_RDONLY))
64366 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64367 up_write(&sb->s_umount);
64368 +
64369 + gr_log_remount(mnt->mnt_devname, retval);
64370 +
64371 return retval;
64372 }
64373
64374 @@ -1467,6 +1472,9 @@ static int do_umount(struct mount *mnt, int flags)
64375 }
64376 unlock_mount_hash();
64377 namespace_unlock();
64378 +
64379 + gr_log_unmount(mnt->mnt_devname, retval);
64380 +
64381 return retval;
64382 }
64383
64384 @@ -1517,7 +1525,7 @@ static inline bool may_mount(void)
64385 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
64386 */
64387
64388 -SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
64389 +SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
64390 {
64391 struct path path;
64392 struct mount *mnt;
64393 @@ -1559,7 +1567,7 @@ out:
64394 /*
64395 * The 2.0 compatible umount. No flags.
64396 */
64397 -SYSCALL_DEFINE1(oldumount, char __user *, name)
64398 +SYSCALL_DEFINE1(oldumount, const char __user *, name)
64399 {
64400 return sys_umount(name, 0);
64401 }
64402 @@ -2621,6 +2629,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64403 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
64404 MS_STRICTATIME);
64405
64406 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
64407 + retval = -EPERM;
64408 + goto dput_out;
64409 + }
64410 +
64411 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
64412 + retval = -EPERM;
64413 + goto dput_out;
64414 + }
64415 +
64416 if (flags & MS_REMOUNT)
64417 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
64418 data_page);
64419 @@ -2634,7 +2652,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64420 retval = do_new_mount(&path, type_page, flags, mnt_flags,
64421 dev_name, data_page);
64422 dput_out:
64423 + gr_log_mount(dev_name, &path, retval);
64424 +
64425 path_put(&path);
64426 +
64427 return retval;
64428 }
64429
64430 @@ -2652,7 +2673,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
64431 * number incrementing at 10Ghz will take 12,427 years to wrap which
64432 * is effectively never, so we can ignore the possibility.
64433 */
64434 -static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
64435 +static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
64436
64437 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64438 {
64439 @@ -2667,7 +2688,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64440 kfree(new_ns);
64441 return ERR_PTR(ret);
64442 }
64443 - new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
64444 + new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
64445 atomic_set(&new_ns->count, 1);
64446 new_ns->root = NULL;
64447 INIT_LIST_HEAD(&new_ns->list);
64448 @@ -2677,7 +2698,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64449 return new_ns;
64450 }
64451
64452 -struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64453 +__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64454 struct user_namespace *user_ns, struct fs_struct *new_fs)
64455 {
64456 struct mnt_namespace *new_ns;
64457 @@ -2798,8 +2819,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
64458 }
64459 EXPORT_SYMBOL(mount_subtree);
64460
64461 -SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
64462 - char __user *, type, unsigned long, flags, void __user *, data)
64463 +SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
64464 + const char __user *, type, unsigned long, flags, void __user *, data)
64465 {
64466 int ret;
64467 char *kernel_type;
64468 @@ -2905,6 +2926,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
64469 if (error)
64470 goto out2;
64471
64472 + if (gr_handle_chroot_pivot()) {
64473 + error = -EPERM;
64474 + goto out2;
64475 + }
64476 +
64477 get_fs_root(current->fs, &root);
64478 old_mp = lock_mount(&old);
64479 error = PTR_ERR(old_mp);
64480 @@ -3176,7 +3202,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
64481 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
64482 return -EPERM;
64483
64484 - if (fs->users != 1)
64485 + if (atomic_read(&fs->users) != 1)
64486 return -EINVAL;
64487
64488 get_mnt_ns(mnt_ns);
64489 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
64490 index f4ccfe6..a5cf064 100644
64491 --- a/fs/nfs/callback_xdr.c
64492 +++ b/fs/nfs/callback_xdr.c
64493 @@ -51,7 +51,7 @@ struct callback_op {
64494 callback_decode_arg_t decode_args;
64495 callback_encode_res_t encode_res;
64496 long res_maxsize;
64497 -};
64498 +} __do_const;
64499
64500 static struct callback_op callback_ops[];
64501
64502 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
64503 index 00689a8..b162632 100644
64504 --- a/fs/nfs/inode.c
64505 +++ b/fs/nfs/inode.c
64506 @@ -1232,16 +1232,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
64507 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
64508 }
64509
64510 -static atomic_long_t nfs_attr_generation_counter;
64511 +static atomic_long_unchecked_t nfs_attr_generation_counter;
64512
64513 static unsigned long nfs_read_attr_generation_counter(void)
64514 {
64515 - return atomic_long_read(&nfs_attr_generation_counter);
64516 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
64517 }
64518
64519 unsigned long nfs_inc_attr_generation_counter(void)
64520 {
64521 - return atomic_long_inc_return(&nfs_attr_generation_counter);
64522 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
64523 }
64524
64525 void nfs_fattr_init(struct nfs_fattr *fattr)
64526 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
64527 index 0beb023..3f685ec 100644
64528 --- a/fs/nfsd/nfs4proc.c
64529 +++ b/fs/nfsd/nfs4proc.c
64530 @@ -1198,7 +1198,7 @@ struct nfsd4_operation {
64531 nfsd4op_rsize op_rsize_bop;
64532 stateid_getter op_get_currentstateid;
64533 stateid_setter op_set_currentstateid;
64534 -};
64535 +} __do_const;
64536
64537 static struct nfsd4_operation nfsd4_ops[];
64538
64539 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
64540 index eeea7a9..f3ba422 100644
64541 --- a/fs/nfsd/nfs4xdr.c
64542 +++ b/fs/nfsd/nfs4xdr.c
64543 @@ -1543,7 +1543,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
64544
64545 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
64546
64547 -static nfsd4_dec nfsd4_dec_ops[] = {
64548 +static const nfsd4_dec nfsd4_dec_ops[] = {
64549 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
64550 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
64551 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
64552 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
64553 index 122f691..a00e2e0 100644
64554 --- a/fs/nfsd/nfscache.c
64555 +++ b/fs/nfsd/nfscache.c
64556 @@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64557 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
64558 u32 hash;
64559 struct nfsd_drc_bucket *b;
64560 - int len;
64561 + long len;
64562 size_t bufsize = 0;
64563
64564 if (!rp)
64565 @@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64566 hash = nfsd_cache_hash(rp->c_xid);
64567 b = &drc_hashtbl[hash];
64568
64569 - len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
64570 - len >>= 2;
64571 + if (statp) {
64572 + len = (char*)statp - (char*)resv->iov_base;
64573 + len = resv->iov_len - len;
64574 + len >>= 2;
64575 + }
64576
64577 /* Don't cache excessive amounts of data and XDR failures */
64578 - if (!statp || len > (256 >> 2)) {
64579 + if (!statp || len > (256 >> 2) || len < 0) {
64580 nfsd_reply_cache_free(b, rp);
64581 return;
64582 }
64583 @@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64584 switch (cachetype) {
64585 case RC_REPLSTAT:
64586 if (len != 1)
64587 - printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
64588 + printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
64589 rp->c_replstat = *statp;
64590 break;
64591 case RC_REPLBUFF:
64592 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
64593 index 989129e..42e019e 100644
64594 --- a/fs/nfsd/vfs.c
64595 +++ b/fs/nfsd/vfs.c
64596 @@ -872,7 +872,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
64597
64598 oldfs = get_fs();
64599 set_fs(KERNEL_DS);
64600 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
64601 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
64602 set_fs(oldfs);
64603 return nfsd_finish_read(file, count, host_err);
64604 }
64605 @@ -960,7 +960,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
64606
64607 /* Write the data. */
64608 oldfs = get_fs(); set_fs(KERNEL_DS);
64609 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
64610 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
64611 set_fs(oldfs);
64612 if (host_err < 0)
64613 goto out_nfserr;
64614 @@ -1502,7 +1502,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
64615 */
64616
64617 oldfs = get_fs(); set_fs(KERNEL_DS);
64618 - host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
64619 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
64620 set_fs(oldfs);
64621
64622 if (host_err < 0)
64623 diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
64624 index 52ccd34..7a6b202 100644
64625 --- a/fs/nls/nls_base.c
64626 +++ b/fs/nls/nls_base.c
64627 @@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
64628
64629 int __register_nls(struct nls_table *nls, struct module *owner)
64630 {
64631 - struct nls_table ** tmp = &tables;
64632 + struct nls_table *tmp = tables;
64633
64634 if (nls->next)
64635 return -EBUSY;
64636
64637 - nls->owner = owner;
64638 + pax_open_kernel();
64639 + *(void **)&nls->owner = owner;
64640 + pax_close_kernel();
64641 spin_lock(&nls_lock);
64642 - while (*tmp) {
64643 - if (nls == *tmp) {
64644 + while (tmp) {
64645 + if (nls == tmp) {
64646 spin_unlock(&nls_lock);
64647 return -EBUSY;
64648 }
64649 - tmp = &(*tmp)->next;
64650 + tmp = tmp->next;
64651 }
64652 - nls->next = tables;
64653 + pax_open_kernel();
64654 + *(struct nls_table **)&nls->next = tables;
64655 + pax_close_kernel();
64656 tables = nls;
64657 spin_unlock(&nls_lock);
64658 return 0;
64659 @@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
64660
64661 int unregister_nls(struct nls_table * nls)
64662 {
64663 - struct nls_table ** tmp = &tables;
64664 + struct nls_table * const * tmp = &tables;
64665
64666 spin_lock(&nls_lock);
64667 while (*tmp) {
64668 if (nls == *tmp) {
64669 - *tmp = nls->next;
64670 + pax_open_kernel();
64671 + *(struct nls_table **)tmp = nls->next;
64672 + pax_close_kernel();
64673 spin_unlock(&nls_lock);
64674 return 0;
64675 }
64676 @@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
64677 return -EINVAL;
64678 }
64679
64680 -static struct nls_table *find_nls(char *charset)
64681 +static struct nls_table *find_nls(const char *charset)
64682 {
64683 struct nls_table *nls;
64684 spin_lock(&nls_lock);
64685 @@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
64686 return nls;
64687 }
64688
64689 -struct nls_table *load_nls(char *charset)
64690 +struct nls_table *load_nls(const char *charset)
64691 {
64692 return try_then_request_module(find_nls(charset), "nls_%s", charset);
64693 }
64694 diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
64695 index 162b3f1..6076a7c 100644
64696 --- a/fs/nls/nls_euc-jp.c
64697 +++ b/fs/nls/nls_euc-jp.c
64698 @@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
64699 p_nls = load_nls("cp932");
64700
64701 if (p_nls) {
64702 - table.charset2upper = p_nls->charset2upper;
64703 - table.charset2lower = p_nls->charset2lower;
64704 + pax_open_kernel();
64705 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64706 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64707 + pax_close_kernel();
64708 return register_nls(&table);
64709 }
64710
64711 diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
64712 index a80a741..7b96e1b 100644
64713 --- a/fs/nls/nls_koi8-ru.c
64714 +++ b/fs/nls/nls_koi8-ru.c
64715 @@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
64716 p_nls = load_nls("koi8-u");
64717
64718 if (p_nls) {
64719 - table.charset2upper = p_nls->charset2upper;
64720 - table.charset2lower = p_nls->charset2lower;
64721 + pax_open_kernel();
64722 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64723 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64724 + pax_close_kernel();
64725 return register_nls(&table);
64726 }
64727
64728 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
64729 index c991616..5ae51af 100644
64730 --- a/fs/notify/fanotify/fanotify_user.c
64731 +++ b/fs/notify/fanotify/fanotify_user.c
64732 @@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
64733
64734 fd = fanotify_event_metadata.fd;
64735 ret = -EFAULT;
64736 - if (copy_to_user(buf, &fanotify_event_metadata,
64737 - fanotify_event_metadata.event_len))
64738 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
64739 + copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
64740 goto out_close_fd;
64741
64742 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
64743 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
64744 index a95d8e0..a91a5fd 100644
64745 --- a/fs/notify/notification.c
64746 +++ b/fs/notify/notification.c
64747 @@ -48,7 +48,7 @@
64748 #include <linux/fsnotify_backend.h>
64749 #include "fsnotify.h"
64750
64751 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64752 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64753
64754 /**
64755 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
64756 @@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64757 */
64758 u32 fsnotify_get_cookie(void)
64759 {
64760 - return atomic_inc_return(&fsnotify_sync_cookie);
64761 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
64762 }
64763 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
64764
64765 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
64766 index 9e38daf..5727cae 100644
64767 --- a/fs/ntfs/dir.c
64768 +++ b/fs/ntfs/dir.c
64769 @@ -1310,7 +1310,7 @@ find_next_index_buffer:
64770 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
64771 ~(s64)(ndir->itype.index.block_size - 1)));
64772 /* Bounds checks. */
64773 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64774 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64775 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
64776 "inode 0x%lx or driver bug.", vdir->i_ino);
64777 goto err_out;
64778 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
64779 index 643faa4..ef9027e 100644
64780 --- a/fs/ntfs/file.c
64781 +++ b/fs/ntfs/file.c
64782 @@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
64783 char *addr;
64784 size_t total = 0;
64785 unsigned len;
64786 - int left;
64787 + unsigned left;
64788
64789 do {
64790 len = PAGE_CACHE_SIZE - ofs;
64791 diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
64792 index 9e1e112..241a52a 100644
64793 --- a/fs/ntfs/super.c
64794 +++ b/fs/ntfs/super.c
64795 @@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64796 if (!silent)
64797 ntfs_error(sb, "Primary boot sector is invalid.");
64798 } else if (!silent)
64799 - ntfs_error(sb, read_err_str, "primary");
64800 + ntfs_error(sb, read_err_str, "%s", "primary");
64801 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
64802 if (bh_primary)
64803 brelse(bh_primary);
64804 @@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64805 goto hotfix_primary_boot_sector;
64806 brelse(bh_backup);
64807 } else if (!silent)
64808 - ntfs_error(sb, read_err_str, "backup");
64809 + ntfs_error(sb, read_err_str, "%s", "backup");
64810 /* Try to read NT3.51- backup boot sector. */
64811 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
64812 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
64813 @@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64814 "sector.");
64815 brelse(bh_backup);
64816 } else if (!silent)
64817 - ntfs_error(sb, read_err_str, "backup");
64818 + ntfs_error(sb, read_err_str, "%s", "backup");
64819 /* We failed. Cleanup and return. */
64820 if (bh_primary)
64821 brelse(bh_primary);
64822 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
64823 index 0440134..d52c93a 100644
64824 --- a/fs/ocfs2/localalloc.c
64825 +++ b/fs/ocfs2/localalloc.c
64826 @@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
64827 goto bail;
64828 }
64829
64830 - atomic_inc(&osb->alloc_stats.moves);
64831 + atomic_inc_unchecked(&osb->alloc_stats.moves);
64832
64833 bail:
64834 if (handle)
64835 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
64836 index bbec539..7b266d5 100644
64837 --- a/fs/ocfs2/ocfs2.h
64838 +++ b/fs/ocfs2/ocfs2.h
64839 @@ -236,11 +236,11 @@ enum ocfs2_vol_state
64840
64841 struct ocfs2_alloc_stats
64842 {
64843 - atomic_t moves;
64844 - atomic_t local_data;
64845 - atomic_t bitmap_data;
64846 - atomic_t bg_allocs;
64847 - atomic_t bg_extends;
64848 + atomic_unchecked_t moves;
64849 + atomic_unchecked_t local_data;
64850 + atomic_unchecked_t bitmap_data;
64851 + atomic_unchecked_t bg_allocs;
64852 + atomic_unchecked_t bg_extends;
64853 };
64854
64855 enum ocfs2_local_alloc_state
64856 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
64857 index 0cb889a..6a26b24 100644
64858 --- a/fs/ocfs2/suballoc.c
64859 +++ b/fs/ocfs2/suballoc.c
64860 @@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
64861 mlog_errno(status);
64862 goto bail;
64863 }
64864 - atomic_inc(&osb->alloc_stats.bg_extends);
64865 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
64866
64867 /* You should never ask for this much metadata */
64868 BUG_ON(bits_wanted >
64869 @@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
64870 mlog_errno(status);
64871 goto bail;
64872 }
64873 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64874 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64875
64876 *suballoc_loc = res.sr_bg_blkno;
64877 *suballoc_bit_start = res.sr_bit_offset;
64878 @@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
64879 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
64880 res->sr_bits);
64881
64882 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64883 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64884
64885 BUG_ON(res->sr_bits != 1);
64886
64887 @@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
64888 mlog_errno(status);
64889 goto bail;
64890 }
64891 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64892 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64893
64894 BUG_ON(res.sr_bits != 1);
64895
64896 @@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64897 cluster_start,
64898 num_clusters);
64899 if (!status)
64900 - atomic_inc(&osb->alloc_stats.local_data);
64901 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
64902 } else {
64903 if (min_clusters > (osb->bitmap_cpg - 1)) {
64904 /* The only paths asking for contiguousness
64905 @@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64906 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
64907 res.sr_bg_blkno,
64908 res.sr_bit_offset);
64909 - atomic_inc(&osb->alloc_stats.bitmap_data);
64910 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
64911 *num_clusters = res.sr_bits;
64912 }
64913 }
64914 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
64915 index 93c85bc..02f68a4 100644
64916 --- a/fs/ocfs2/super.c
64917 +++ b/fs/ocfs2/super.c
64918 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
64919 "%10s => GlobalAllocs: %d LocalAllocs: %d "
64920 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
64921 "Stats",
64922 - atomic_read(&osb->alloc_stats.bitmap_data),
64923 - atomic_read(&osb->alloc_stats.local_data),
64924 - atomic_read(&osb->alloc_stats.bg_allocs),
64925 - atomic_read(&osb->alloc_stats.moves),
64926 - atomic_read(&osb->alloc_stats.bg_extends));
64927 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
64928 + atomic_read_unchecked(&osb->alloc_stats.local_data),
64929 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
64930 + atomic_read_unchecked(&osb->alloc_stats.moves),
64931 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
64932
64933 out += snprintf(buf + out, len - out,
64934 "%10s => State: %u Descriptor: %llu Size: %u bits "
64935 @@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
64936
64937 mutex_init(&osb->system_file_mutex);
64938
64939 - atomic_set(&osb->alloc_stats.moves, 0);
64940 - atomic_set(&osb->alloc_stats.local_data, 0);
64941 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
64942 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
64943 - atomic_set(&osb->alloc_stats.bg_extends, 0);
64944 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
64945 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
64946 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
64947 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
64948 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
64949
64950 /* Copy the blockcheck stats from the superblock probe */
64951 osb->osb_ecc_stats = *stats;
64952 diff --git a/fs/open.c b/fs/open.c
64953 index de92c13..52d2a6c 100644
64954 --- a/fs/open.c
64955 +++ b/fs/open.c
64956 @@ -32,6 +32,8 @@
64957 #include <linux/dnotify.h>
64958 #include <linux/compat.h>
64959
64960 +#define CREATE_TRACE_POINTS
64961 +#include <trace/events/fs.h>
64962 #include "internal.h"
64963
64964 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
64965 @@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
64966 error = locks_verify_truncate(inode, NULL, length);
64967 if (!error)
64968 error = security_path_truncate(path);
64969 + if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
64970 + error = -EACCES;
64971 if (!error)
64972 error = do_truncate(path->dentry, length, 0, NULL);
64973
64974 @@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
64975 error = locks_verify_truncate(inode, f.file, length);
64976 if (!error)
64977 error = security_path_truncate(&f.file->f_path);
64978 + if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
64979 + error = -EACCES;
64980 if (!error)
64981 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
64982 sb_end_write(inode->i_sb);
64983 @@ -380,6 +386,9 @@ retry:
64984 if (__mnt_is_readonly(path.mnt))
64985 res = -EROFS;
64986
64987 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
64988 + res = -EACCES;
64989 +
64990 out_path_release:
64991 path_put(&path);
64992 if (retry_estale(res, lookup_flags)) {
64993 @@ -411,6 +420,8 @@ retry:
64994 if (error)
64995 goto dput_and_out;
64996
64997 + gr_log_chdir(path.dentry, path.mnt);
64998 +
64999 set_fs_pwd(current->fs, &path);
65000
65001 dput_and_out:
65002 @@ -440,6 +451,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
65003 goto out_putf;
65004
65005 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
65006 +
65007 + if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
65008 + error = -EPERM;
65009 +
65010 + if (!error)
65011 + gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
65012 +
65013 if (!error)
65014 set_fs_pwd(current->fs, &f.file->f_path);
65015 out_putf:
65016 @@ -469,7 +487,13 @@ retry:
65017 if (error)
65018 goto dput_and_out;
65019
65020 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
65021 + goto dput_and_out;
65022 +
65023 set_fs_root(current->fs, &path);
65024 +
65025 + gr_handle_chroot_chdir(&path);
65026 +
65027 error = 0;
65028 dput_and_out:
65029 path_put(&path);
65030 @@ -493,6 +517,16 @@ static int chmod_common(struct path *path, umode_t mode)
65031 return error;
65032 retry_deleg:
65033 mutex_lock(&inode->i_mutex);
65034 +
65035 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
65036 + error = -EACCES;
65037 + goto out_unlock;
65038 + }
65039 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
65040 + error = -EACCES;
65041 + goto out_unlock;
65042 + }
65043 +
65044 error = security_path_chmod(path, mode);
65045 if (error)
65046 goto out_unlock;
65047 @@ -558,6 +592,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
65048 uid = make_kuid(current_user_ns(), user);
65049 gid = make_kgid(current_user_ns(), group);
65050
65051 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
65052 + return -EACCES;
65053 +
65054 newattrs.ia_valid = ATTR_CTIME;
65055 if (user != (uid_t) -1) {
65056 if (!uid_valid(uid))
65057 @@ -1002,6 +1039,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
65058 } else {
65059 fsnotify_open(f);
65060 fd_install(fd, f);
65061 + trace_do_sys_open(tmp->name, flags, mode);
65062 }
65063 }
65064 putname(tmp);
65065 diff --git a/fs/pipe.c b/fs/pipe.c
65066 index 21981e5..3d5f55c 100644
65067 --- a/fs/pipe.c
65068 +++ b/fs/pipe.c
65069 @@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
65070
65071 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
65072 {
65073 - if (pipe->files)
65074 + if (atomic_read(&pipe->files))
65075 mutex_lock_nested(&pipe->mutex, subclass);
65076 }
65077
65078 @@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
65079
65080 void pipe_unlock(struct pipe_inode_info *pipe)
65081 {
65082 - if (pipe->files)
65083 + if (atomic_read(&pipe->files))
65084 mutex_unlock(&pipe->mutex);
65085 }
65086 EXPORT_SYMBOL(pipe_unlock);
65087 @@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
65088 }
65089 if (bufs) /* More to do? */
65090 continue;
65091 - if (!pipe->writers)
65092 + if (!atomic_read(&pipe->writers))
65093 break;
65094 - if (!pipe->waiting_writers) {
65095 + if (!atomic_read(&pipe->waiting_writers)) {
65096 /* syscall merging: Usually we must not sleep
65097 * if O_NONBLOCK is set, or if we got some data.
65098 * But if a writer sleeps in kernel space, then
65099 @@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65100
65101 __pipe_lock(pipe);
65102
65103 - if (!pipe->readers) {
65104 + if (!atomic_read(&pipe->readers)) {
65105 send_sig(SIGPIPE, current, 0);
65106 ret = -EPIPE;
65107 goto out;
65108 @@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65109 for (;;) {
65110 int bufs;
65111
65112 - if (!pipe->readers) {
65113 + if (!atomic_read(&pipe->readers)) {
65114 send_sig(SIGPIPE, current, 0);
65115 if (!ret)
65116 ret = -EPIPE;
65117 @@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65118 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65119 do_wakeup = 0;
65120 }
65121 - pipe->waiting_writers++;
65122 + atomic_inc(&pipe->waiting_writers);
65123 pipe_wait(pipe);
65124 - pipe->waiting_writers--;
65125 + atomic_dec(&pipe->waiting_writers);
65126 }
65127 out:
65128 __pipe_unlock(pipe);
65129 @@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65130 mask = 0;
65131 if (filp->f_mode & FMODE_READ) {
65132 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65133 - if (!pipe->writers && filp->f_version != pipe->w_counter)
65134 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65135 mask |= POLLHUP;
65136 }
65137
65138 @@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65139 * Most Unices do not set POLLERR for FIFOs but on Linux they
65140 * behave exactly like pipes for poll().
65141 */
65142 - if (!pipe->readers)
65143 + if (!atomic_read(&pipe->readers))
65144 mask |= POLLERR;
65145 }
65146
65147 @@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65148 int kill = 0;
65149
65150 spin_lock(&inode->i_lock);
65151 - if (!--pipe->files) {
65152 + if (atomic_dec_and_test(&pipe->files)) {
65153 inode->i_pipe = NULL;
65154 kill = 1;
65155 }
65156 @@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65157
65158 __pipe_lock(pipe);
65159 if (file->f_mode & FMODE_READ)
65160 - pipe->readers--;
65161 + atomic_dec(&pipe->readers);
65162 if (file->f_mode & FMODE_WRITE)
65163 - pipe->writers--;
65164 + atomic_dec(&pipe->writers);
65165
65166 - if (pipe->readers || pipe->writers) {
65167 + if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65168 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65169 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65170 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65171 @@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65172 kfree(pipe);
65173 }
65174
65175 -static struct vfsmount *pipe_mnt __read_mostly;
65176 +struct vfsmount *pipe_mnt __read_mostly;
65177
65178 /*
65179 * pipefs_dname() is called from d_path().
65180 @@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65181 goto fail_iput;
65182
65183 inode->i_pipe = pipe;
65184 - pipe->files = 2;
65185 - pipe->readers = pipe->writers = 1;
65186 + atomic_set(&pipe->files, 2);
65187 + atomic_set(&pipe->readers, 1);
65188 + atomic_set(&pipe->writers, 1);
65189 inode->i_fop = &pipefifo_fops;
65190
65191 /*
65192 @@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65193 spin_lock(&inode->i_lock);
65194 if (inode->i_pipe) {
65195 pipe = inode->i_pipe;
65196 - pipe->files++;
65197 + atomic_inc(&pipe->files);
65198 spin_unlock(&inode->i_lock);
65199 } else {
65200 spin_unlock(&inode->i_lock);
65201 pipe = alloc_pipe_info();
65202 if (!pipe)
65203 return -ENOMEM;
65204 - pipe->files = 1;
65205 + atomic_set(&pipe->files, 1);
65206 spin_lock(&inode->i_lock);
65207 if (unlikely(inode->i_pipe)) {
65208 - inode->i_pipe->files++;
65209 + atomic_inc(&inode->i_pipe->files);
65210 spin_unlock(&inode->i_lock);
65211 free_pipe_info(pipe);
65212 pipe = inode->i_pipe;
65213 @@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65214 * opened, even when there is no process writing the FIFO.
65215 */
65216 pipe->r_counter++;
65217 - if (pipe->readers++ == 0)
65218 + if (atomic_inc_return(&pipe->readers) == 1)
65219 wake_up_partner(pipe);
65220
65221 - if (!is_pipe && !pipe->writers) {
65222 + if (!is_pipe && !atomic_read(&pipe->writers)) {
65223 if ((filp->f_flags & O_NONBLOCK)) {
65224 /* suppress POLLHUP until we have
65225 * seen a writer */
65226 @@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65227 * errno=ENXIO when there is no process reading the FIFO.
65228 */
65229 ret = -ENXIO;
65230 - if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65231 + if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65232 goto err;
65233
65234 pipe->w_counter++;
65235 - if (!pipe->writers++)
65236 + if (atomic_inc_return(&pipe->writers) == 1)
65237 wake_up_partner(pipe);
65238
65239 - if (!is_pipe && !pipe->readers) {
65240 + if (!is_pipe && !atomic_read(&pipe->readers)) {
65241 if (wait_for_partner(pipe, &pipe->r_counter))
65242 goto err_wr;
65243 }
65244 @@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65245 * the process can at least talk to itself.
65246 */
65247
65248 - pipe->readers++;
65249 - pipe->writers++;
65250 + atomic_inc(&pipe->readers);
65251 + atomic_inc(&pipe->writers);
65252 pipe->r_counter++;
65253 pipe->w_counter++;
65254 - if (pipe->readers == 1 || pipe->writers == 1)
65255 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65256 wake_up_partner(pipe);
65257 break;
65258
65259 @@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65260 return 0;
65261
65262 err_rd:
65263 - if (!--pipe->readers)
65264 + if (atomic_dec_and_test(&pipe->readers))
65265 wake_up_interruptible(&pipe->wait);
65266 ret = -ERESTARTSYS;
65267 goto err;
65268
65269 err_wr:
65270 - if (!--pipe->writers)
65271 + if (atomic_dec_and_test(&pipe->writers))
65272 wake_up_interruptible(&pipe->wait);
65273 ret = -ERESTARTSYS;
65274 goto err;
65275 diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65276 index 0855f77..6787d50 100644
65277 --- a/fs/posix_acl.c
65278 +++ b/fs/posix_acl.c
65279 @@ -20,6 +20,7 @@
65280 #include <linux/xattr.h>
65281 #include <linux/export.h>
65282 #include <linux/user_namespace.h>
65283 +#include <linux/grsecurity.h>
65284
65285 struct posix_acl **acl_by_type(struct inode *inode, int type)
65286 {
65287 @@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65288 }
65289 }
65290 if (mode_p)
65291 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65292 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65293 return not_equiv;
65294 }
65295 EXPORT_SYMBOL(posix_acl_equiv_mode);
65296 @@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65297 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65298 }
65299
65300 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65301 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65302 return not_equiv;
65303 }
65304
65305 @@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65306 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65307 int err = -ENOMEM;
65308 if (clone) {
65309 + *mode_p &= ~gr_acl_umask();
65310 +
65311 err = posix_acl_create_masq(clone, mode_p);
65312 if (err < 0) {
65313 posix_acl_release(clone);
65314 @@ -659,11 +662,12 @@ struct posix_acl *
65315 posix_acl_from_xattr(struct user_namespace *user_ns,
65316 const void *value, size_t size)
65317 {
65318 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65319 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65320 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65321 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65322 int count;
65323 struct posix_acl *acl;
65324 struct posix_acl_entry *acl_e;
65325 + umode_t umask = gr_acl_umask();
65326
65327 if (!value)
65328 return NULL;
65329 @@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65330
65331 switch(acl_e->e_tag) {
65332 case ACL_USER_OBJ:
65333 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65334 + break;
65335 case ACL_GROUP_OBJ:
65336 case ACL_MASK:
65337 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65338 + break;
65339 case ACL_OTHER:
65340 + acl_e->e_perm &= ~(umask & S_IRWXO);
65341 break;
65342
65343 case ACL_USER:
65344 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65345 acl_e->e_uid =
65346 make_kuid(user_ns,
65347 le32_to_cpu(entry->e_id));
65348 @@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65349 goto fail;
65350 break;
65351 case ACL_GROUP:
65352 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65353 acl_e->e_gid =
65354 make_kgid(user_ns,
65355 le32_to_cpu(entry->e_id));
65356 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65357 index 2183fcf..3c32a98 100644
65358 --- a/fs/proc/Kconfig
65359 +++ b/fs/proc/Kconfig
65360 @@ -30,7 +30,7 @@ config PROC_FS
65361
65362 config PROC_KCORE
65363 bool "/proc/kcore support" if !ARM
65364 - depends on PROC_FS && MMU
65365 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
65366 help
65367 Provides a virtual ELF core file of the live kernel. This can
65368 be read with gdb and other ELF tools. No modifications can be
65369 @@ -38,8 +38,8 @@ config PROC_KCORE
65370
65371 config PROC_VMCORE
65372 bool "/proc/vmcore support"
65373 - depends on PROC_FS && CRASH_DUMP
65374 - default y
65375 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
65376 + default n
65377 help
65378 Exports the dump image of crashed kernel in ELF format.
65379
65380 @@ -63,8 +63,8 @@ config PROC_SYSCTL
65381 limited in memory.
65382
65383 config PROC_PAGE_MONITOR
65384 - default y
65385 - depends on PROC_FS && MMU
65386 + default n
65387 + depends on PROC_FS && MMU && !GRKERNSEC
65388 bool "Enable /proc page monitoring" if EXPERT
65389 help
65390 Various /proc files exist to monitor process memory utilization:
65391 diff --git a/fs/proc/array.c b/fs/proc/array.c
65392 index cd3653e..9b9b79a 100644
65393 --- a/fs/proc/array.c
65394 +++ b/fs/proc/array.c
65395 @@ -60,6 +60,7 @@
65396 #include <linux/tty.h>
65397 #include <linux/string.h>
65398 #include <linux/mman.h>
65399 +#include <linux/grsecurity.h>
65400 #include <linux/proc_fs.h>
65401 #include <linux/ioport.h>
65402 #include <linux/uaccess.h>
65403 @@ -347,6 +348,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
65404 seq_putc(m, '\n');
65405 }
65406
65407 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65408 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
65409 +{
65410 + if (p->mm)
65411 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
65412 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
65413 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
65414 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
65415 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
65416 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
65417 + else
65418 + seq_printf(m, "PaX:\t-----\n");
65419 +}
65420 +#endif
65421 +
65422 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65423 struct pid *pid, struct task_struct *task)
65424 {
65425 @@ -365,9 +381,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65426 task_cpus_allowed(m, task);
65427 cpuset_task_status_allowed(m, task);
65428 task_context_switch_counts(m, task);
65429 +
65430 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65431 + task_pax(m, task);
65432 +#endif
65433 +
65434 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
65435 + task_grsec_rbac(m, task);
65436 +#endif
65437 +
65438 return 0;
65439 }
65440
65441 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65442 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65443 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
65444 + _mm->pax_flags & MF_PAX_SEGMEXEC))
65445 +#endif
65446 +
65447 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65448 struct pid *pid, struct task_struct *task, int whole)
65449 {
65450 @@ -389,6 +420,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65451 char tcomm[sizeof(task->comm)];
65452 unsigned long flags;
65453
65454 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65455 + if (current->exec_id != m->exec_id) {
65456 + gr_log_badprocpid("stat");
65457 + return 0;
65458 + }
65459 +#endif
65460 +
65461 state = *get_task_state(task);
65462 vsize = eip = esp = 0;
65463 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65464 @@ -459,6 +497,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65465 gtime = task_gtime(task);
65466 }
65467
65468 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65469 + if (PAX_RAND_FLAGS(mm)) {
65470 + eip = 0;
65471 + esp = 0;
65472 + wchan = 0;
65473 + }
65474 +#endif
65475 +#ifdef CONFIG_GRKERNSEC_HIDESYM
65476 + wchan = 0;
65477 + eip =0;
65478 + esp =0;
65479 +#endif
65480 +
65481 /* scale priority and nice values from timeslices to -20..20 */
65482 /* to make it look like a "normal" Unix priority/nice value */
65483 priority = task_prio(task);
65484 @@ -490,9 +541,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65485 seq_put_decimal_ull(m, ' ', vsize);
65486 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
65487 seq_put_decimal_ull(m, ' ', rsslim);
65488 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65489 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
65490 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
65491 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
65492 +#else
65493 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
65494 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
65495 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
65496 +#endif
65497 seq_put_decimal_ull(m, ' ', esp);
65498 seq_put_decimal_ull(m, ' ', eip);
65499 /* The signal information here is obsolete.
65500 @@ -514,7 +571,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65501 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
65502 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
65503
65504 - if (mm && permitted) {
65505 + if (mm && permitted
65506 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65507 + && !PAX_RAND_FLAGS(mm)
65508 +#endif
65509 + ) {
65510 seq_put_decimal_ull(m, ' ', mm->start_data);
65511 seq_put_decimal_ull(m, ' ', mm->end_data);
65512 seq_put_decimal_ull(m, ' ', mm->start_brk);
65513 @@ -552,8 +613,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65514 struct pid *pid, struct task_struct *task)
65515 {
65516 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
65517 - struct mm_struct *mm = get_task_mm(task);
65518 + struct mm_struct *mm;
65519
65520 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65521 + if (current->exec_id != m->exec_id) {
65522 + gr_log_badprocpid("statm");
65523 + return 0;
65524 + }
65525 +#endif
65526 + mm = get_task_mm(task);
65527 if (mm) {
65528 size = task_statm(mm, &shared, &text, &data, &resident);
65529 mmput(mm);
65530 @@ -576,6 +644,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65531 return 0;
65532 }
65533
65534 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65535 +int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
65536 +{
65537 + unsigned long flags;
65538 + u32 curr_ip = 0;
65539 +
65540 + if (lock_task_sighand(task, &flags)) {
65541 + curr_ip = task->signal->curr_ip;
65542 + unlock_task_sighand(task, &flags);
65543 + }
65544 + return seq_printf(m, "%pI4\n", &curr_ip);
65545 +}
65546 +#endif
65547 +
65548 #ifdef CONFIG_CHECKPOINT_RESTORE
65549 static struct pid *
65550 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
65551 diff --git a/fs/proc/base.c b/fs/proc/base.c
65552 index 772efa4..e7f1a5c 100644
65553 --- a/fs/proc/base.c
65554 +++ b/fs/proc/base.c
65555 @@ -113,6 +113,14 @@ struct pid_entry {
65556 union proc_op op;
65557 };
65558
65559 +struct getdents_callback {
65560 + struct linux_dirent __user * current_dir;
65561 + struct linux_dirent __user * previous;
65562 + struct file * file;
65563 + int count;
65564 + int error;
65565 +};
65566 +
65567 #define NOD(NAME, MODE, IOP, FOP, OP) { \
65568 .name = (NAME), \
65569 .len = sizeof(NAME) - 1, \
65570 @@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
65571 return 0;
65572 }
65573
65574 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65575 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65576 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
65577 + _mm->pax_flags & MF_PAX_SEGMEXEC))
65578 +#endif
65579 +
65580 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65581 struct pid *pid, struct task_struct *task)
65582 {
65583 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
65584 if (mm && !IS_ERR(mm)) {
65585 unsigned int nwords = 0;
65586 +
65587 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65588 + /* allow if we're currently ptracing this task */
65589 + if (PAX_RAND_FLAGS(mm) &&
65590 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
65591 + mmput(mm);
65592 + return 0;
65593 + }
65594 +#endif
65595 +
65596 do {
65597 nwords += 2;
65598 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
65599 @@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65600 }
65601
65602
65603 -#ifdef CONFIG_KALLSYMS
65604 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65605 /*
65606 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
65607 * Returns the resolved symbol. If that fails, simply return the address.
65608 @@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
65609 mutex_unlock(&task->signal->cred_guard_mutex);
65610 }
65611
65612 -#ifdef CONFIG_STACKTRACE
65613 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65614
65615 #define MAX_STACK_TRACE_DEPTH 64
65616
65617 @@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
65618 return 0;
65619 }
65620
65621 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65622 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65623 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65624 struct pid *pid, struct task_struct *task)
65625 {
65626 @@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65627 /************************************************************************/
65628
65629 /* permission checks */
65630 -static int proc_fd_access_allowed(struct inode *inode)
65631 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
65632 {
65633 struct task_struct *task;
65634 int allowed = 0;
65635 @@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
65636 */
65637 task = get_proc_task(inode);
65638 if (task) {
65639 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65640 + if (log)
65641 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65642 + else
65643 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65644 put_task_struct(task);
65645 }
65646 return allowed;
65647 @@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
65648 struct task_struct *task,
65649 int hide_pid_min)
65650 {
65651 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65652 + return false;
65653 +
65654 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65655 + rcu_read_lock();
65656 + {
65657 + const struct cred *tmpcred = current_cred();
65658 + const struct cred *cred = __task_cred(task);
65659 +
65660 + if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
65661 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65662 + || in_group_p(grsec_proc_gid)
65663 +#endif
65664 + ) {
65665 + rcu_read_unlock();
65666 + return true;
65667 + }
65668 + }
65669 + rcu_read_unlock();
65670 +
65671 + if (!pid->hide_pid)
65672 + return false;
65673 +#endif
65674 +
65675 if (pid->hide_pid < hide_pid_min)
65676 return true;
65677 if (in_group_p(pid->pid_gid))
65678 return true;
65679 +
65680 return ptrace_may_access(task, PTRACE_MODE_READ);
65681 }
65682
65683 @@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
65684 put_task_struct(task);
65685
65686 if (!has_perms) {
65687 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65688 + {
65689 +#else
65690 if (pid->hide_pid == 2) {
65691 +#endif
65692 /*
65693 * Let's make getdents(), stat(), and open()
65694 * consistent with each other. If a process
65695 @@ -609,6 +665,8 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
65696
65697 if (task) {
65698 mm = mm_access(task, mode);
65699 + if (gr_acl_handle_procpidmem(task))
65700 + mm = ERR_PTR(-EPERM);
65701 put_task_struct(task);
65702
65703 if (!IS_ERR_OR_NULL(mm)) {
65704 @@ -630,6 +688,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
65705 return PTR_ERR(mm);
65706
65707 file->private_data = mm;
65708 +
65709 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65710 + file->f_version = current->exec_id;
65711 +#endif
65712 +
65713 return 0;
65714 }
65715
65716 @@ -651,6 +714,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65717 ssize_t copied;
65718 char *page;
65719
65720 +#ifdef CONFIG_GRKERNSEC
65721 + if (write)
65722 + return -EPERM;
65723 +#endif
65724 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65725 + if (file->f_version != current->exec_id) {
65726 + gr_log_badprocpid("mem");
65727 + return 0;
65728 + }
65729 +#endif
65730 +
65731 if (!mm)
65732 return 0;
65733
65734 @@ -663,7 +737,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65735 goto free;
65736
65737 while (count > 0) {
65738 - int this_len = min_t(int, count, PAGE_SIZE);
65739 + ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
65740
65741 if (write && copy_from_user(page, buf, this_len)) {
65742 copied = -EFAULT;
65743 @@ -755,6 +829,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65744 if (!mm)
65745 return 0;
65746
65747 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65748 + if (file->f_version != current->exec_id) {
65749 + gr_log_badprocpid("environ");
65750 + return 0;
65751 + }
65752 +#endif
65753 +
65754 page = (char *)__get_free_page(GFP_TEMPORARY);
65755 if (!page)
65756 return -ENOMEM;
65757 @@ -764,7 +845,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65758 goto free;
65759 while (count > 0) {
65760 size_t this_len, max_len;
65761 - int retval;
65762 + ssize_t retval;
65763
65764 if (src >= (mm->env_end - mm->env_start))
65765 break;
65766 @@ -1378,7 +1459,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
65767 int error = -EACCES;
65768
65769 /* Are we allowed to snoop on the tasks file descriptors? */
65770 - if (!proc_fd_access_allowed(inode))
65771 + if (!proc_fd_access_allowed(inode, 0))
65772 goto out;
65773
65774 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65775 @@ -1422,8 +1503,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
65776 struct path path;
65777
65778 /* Are we allowed to snoop on the tasks file descriptors? */
65779 - if (!proc_fd_access_allowed(inode))
65780 - goto out;
65781 + /* logging this is needed for learning on chromium to work properly,
65782 + but we don't want to flood the logs from 'ps' which does a readlink
65783 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
65784 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
65785 + */
65786 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
65787 + if (!proc_fd_access_allowed(inode,0))
65788 + goto out;
65789 + } else {
65790 + if (!proc_fd_access_allowed(inode,1))
65791 + goto out;
65792 + }
65793
65794 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65795 if (error)
65796 @@ -1473,7 +1564,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
65797 rcu_read_lock();
65798 cred = __task_cred(task);
65799 inode->i_uid = cred->euid;
65800 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65801 + inode->i_gid = grsec_proc_gid;
65802 +#else
65803 inode->i_gid = cred->egid;
65804 +#endif
65805 rcu_read_unlock();
65806 }
65807 security_task_to_inode(task, inode);
65808 @@ -1509,10 +1604,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
65809 return -ENOENT;
65810 }
65811 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65812 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65813 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65814 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65815 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65816 +#endif
65817 task_dumpable(task)) {
65818 cred = __task_cred(task);
65819 stat->uid = cred->euid;
65820 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65821 + stat->gid = grsec_proc_gid;
65822 +#else
65823 stat->gid = cred->egid;
65824 +#endif
65825 }
65826 }
65827 rcu_read_unlock();
65828 @@ -1550,11 +1654,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
65829
65830 if (task) {
65831 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65832 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65833 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65834 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65835 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65836 +#endif
65837 task_dumpable(task)) {
65838 rcu_read_lock();
65839 cred = __task_cred(task);
65840 inode->i_uid = cred->euid;
65841 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65842 + inode->i_gid = grsec_proc_gid;
65843 +#else
65844 inode->i_gid = cred->egid;
65845 +#endif
65846 rcu_read_unlock();
65847 } else {
65848 inode->i_uid = GLOBAL_ROOT_UID;
65849 @@ -2085,6 +2198,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
65850 if (!task)
65851 goto out_no_task;
65852
65853 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65854 + goto out;
65855 +
65856 /*
65857 * Yes, it does not scale. And it should not. Don't add
65858 * new entries into /proc/<tgid>/ without very good reasons.
65859 @@ -2115,6 +2231,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
65860 if (!task)
65861 return -ENOENT;
65862
65863 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65864 + goto out;
65865 +
65866 if (!dir_emit_dots(file, ctx))
65867 goto out;
65868
65869 @@ -2506,7 +2625,7 @@ static const struct pid_entry tgid_base_stuff[] = {
65870 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
65871 #endif
65872 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65873 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65874 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65875 ONE("syscall", S_IRUSR, proc_pid_syscall),
65876 #endif
65877 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65878 @@ -2531,10 +2650,10 @@ static const struct pid_entry tgid_base_stuff[] = {
65879 #ifdef CONFIG_SECURITY
65880 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65881 #endif
65882 -#ifdef CONFIG_KALLSYMS
65883 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65884 ONE("wchan", S_IRUGO, proc_pid_wchan),
65885 #endif
65886 -#ifdef CONFIG_STACKTRACE
65887 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65888 ONE("stack", S_IRUSR, proc_pid_stack),
65889 #endif
65890 #ifdef CONFIG_SCHEDSTATS
65891 @@ -2568,6 +2687,9 @@ static const struct pid_entry tgid_base_stuff[] = {
65892 #ifdef CONFIG_HARDWALL
65893 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
65894 #endif
65895 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65896 + ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
65897 +#endif
65898 #ifdef CONFIG_USER_NS
65899 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
65900 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
65901 @@ -2696,7 +2818,14 @@ static int proc_pid_instantiate(struct inode *dir,
65902 if (!inode)
65903 goto out;
65904
65905 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65906 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
65907 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65908 + inode->i_gid = grsec_proc_gid;
65909 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
65910 +#else
65911 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
65912 +#endif
65913 inode->i_op = &proc_tgid_base_inode_operations;
65914 inode->i_fop = &proc_tgid_base_operations;
65915 inode->i_flags|=S_IMMUTABLE;
65916 @@ -2734,7 +2863,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
65917 if (!task)
65918 goto out;
65919
65920 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65921 + goto out_put_task;
65922 +
65923 result = proc_pid_instantiate(dir, dentry, task, NULL);
65924 +out_put_task:
65925 put_task_struct(task);
65926 out:
65927 return ERR_PTR(result);
65928 @@ -2848,7 +2981,7 @@ static const struct pid_entry tid_base_stuff[] = {
65929 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
65930 #endif
65931 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65932 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65933 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65934 ONE("syscall", S_IRUSR, proc_pid_syscall),
65935 #endif
65936 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65937 @@ -2875,10 +3008,10 @@ static const struct pid_entry tid_base_stuff[] = {
65938 #ifdef CONFIG_SECURITY
65939 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65940 #endif
65941 -#ifdef CONFIG_KALLSYMS
65942 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65943 ONE("wchan", S_IRUGO, proc_pid_wchan),
65944 #endif
65945 -#ifdef CONFIG_STACKTRACE
65946 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65947 ONE("stack", S_IRUSR, proc_pid_stack),
65948 #endif
65949 #ifdef CONFIG_SCHEDSTATS
65950 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
65951 index cbd82df..c0407d2 100644
65952 --- a/fs/proc/cmdline.c
65953 +++ b/fs/proc/cmdline.c
65954 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
65955
65956 static int __init proc_cmdline_init(void)
65957 {
65958 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
65959 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
65960 +#else
65961 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
65962 +#endif
65963 return 0;
65964 }
65965 fs_initcall(proc_cmdline_init);
65966 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
65967 index 50493ed..248166b 100644
65968 --- a/fs/proc/devices.c
65969 +++ b/fs/proc/devices.c
65970 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
65971
65972 static int __init proc_devices_init(void)
65973 {
65974 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
65975 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
65976 +#else
65977 proc_create("devices", 0, NULL, &proc_devinfo_operations);
65978 +#endif
65979 return 0;
65980 }
65981 fs_initcall(proc_devices_init);
65982 diff --git a/fs/proc/fd.c b/fs/proc/fd.c
65983 index e11d7c5..9128ce06 100644
65984 --- a/fs/proc/fd.c
65985 +++ b/fs/proc/fd.c
65986 @@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
65987 if (!task)
65988 return -ENOENT;
65989
65990 - files = get_files_struct(task);
65991 + if (!gr_acl_handle_procpidmem(task))
65992 + files = get_files_struct(task);
65993 put_task_struct(task);
65994
65995 if (files) {
65996 @@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
65997 */
65998 int proc_fd_permission(struct inode *inode, int mask)
65999 {
66000 + struct task_struct *task;
66001 int rv = generic_permission(inode, mask);
66002 - if (rv == 0)
66003 - return 0;
66004 +
66005 if (task_tgid(current) == proc_pid(inode))
66006 rv = 0;
66007 +
66008 + task = get_proc_task(inode);
66009 + if (task == NULL)
66010 + return rv;
66011 +
66012 + if (gr_acl_handle_procpidmem(task))
66013 + rv = -EACCES;
66014 +
66015 + put_task_struct(task);
66016 +
66017 return rv;
66018 }
66019
66020 diff --git a/fs/proc/generic.c b/fs/proc/generic.c
66021 index 317b726..e329aed 100644
66022 --- a/fs/proc/generic.c
66023 +++ b/fs/proc/generic.c
66024 @@ -23,6 +23,7 @@
66025 #include <linux/bitops.h>
66026 #include <linux/spinlock.h>
66027 #include <linux/completion.h>
66028 +#include <linux/grsecurity.h>
66029 #include <asm/uaccess.h>
66030
66031 #include "internal.h"
66032 @@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
66033 return proc_lookup_de(PDE(dir), dir, dentry);
66034 }
66035
66036 +struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
66037 + unsigned int flags)
66038 +{
66039 + if (gr_proc_is_restricted())
66040 + return ERR_PTR(-EACCES);
66041 +
66042 + return proc_lookup_de(PDE(dir), dir, dentry);
66043 +}
66044 +
66045 /*
66046 * This returns non-zero if at EOF, so that the /proc
66047 * root directory can use this and check if it should
66048 @@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
66049 return proc_readdir_de(PDE(inode), file, ctx);
66050 }
66051
66052 +int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
66053 +{
66054 + struct inode *inode = file_inode(file);
66055 +
66056 + if (gr_proc_is_restricted())
66057 + return -EACCES;
66058 +
66059 + return proc_readdir_de(PDE(inode), file, ctx);
66060 +}
66061 +
66062 /*
66063 * These are the generic /proc directory operations. They
66064 * use the in-memory "struct proc_dir_entry" tree to parse
66065 @@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
66066 .iterate = proc_readdir,
66067 };
66068
66069 +static const struct file_operations proc_dir_restricted_operations = {
66070 + .llseek = generic_file_llseek,
66071 + .read = generic_read_dir,
66072 + .iterate = proc_readdir_restrict,
66073 +};
66074 +
66075 /*
66076 * proc directories can do almost nothing..
66077 */
66078 @@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
66079 .setattr = proc_notify_change,
66080 };
66081
66082 +static const struct inode_operations proc_dir_restricted_inode_operations = {
66083 + .lookup = proc_lookup_restrict,
66084 + .getattr = proc_getattr,
66085 + .setattr = proc_notify_change,
66086 +};
66087 +
66088 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
66089 {
66090 struct proc_dir_entry *tmp;
66091 @@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
66092 return ret;
66093
66094 if (S_ISDIR(dp->mode)) {
66095 - dp->proc_fops = &proc_dir_operations;
66096 - dp->proc_iops = &proc_dir_inode_operations;
66097 + if (dp->restricted) {
66098 + dp->proc_fops = &proc_dir_restricted_operations;
66099 + dp->proc_iops = &proc_dir_restricted_inode_operations;
66100 + } else {
66101 + dp->proc_fops = &proc_dir_operations;
66102 + dp->proc_iops = &proc_dir_inode_operations;
66103 + }
66104 dir->nlink++;
66105 } else if (S_ISLNK(dp->mode)) {
66106 dp->proc_iops = &proc_link_inode_operations;
66107 @@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66108 }
66109 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66110
66111 +struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66112 + struct proc_dir_entry *parent, void *data)
66113 +{
66114 + struct proc_dir_entry *ent;
66115 +
66116 + if (mode == 0)
66117 + mode = S_IRUGO | S_IXUGO;
66118 +
66119 + ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66120 + if (ent) {
66121 + ent->data = data;
66122 + ent->restricted = 1;
66123 + if (proc_register(parent, ent) < 0) {
66124 + kfree(ent);
66125 + ent = NULL;
66126 + }
66127 + }
66128 + return ent;
66129 +}
66130 +EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66131 +
66132 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66133 struct proc_dir_entry *parent)
66134 {
66135 @@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66136 }
66137 EXPORT_SYMBOL(proc_mkdir);
66138
66139 +struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66140 + struct proc_dir_entry *parent)
66141 +{
66142 + return proc_mkdir_data_restrict(name, 0, parent, NULL);
66143 +}
66144 +EXPORT_SYMBOL(proc_mkdir_restrict);
66145 +
66146 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66147 struct proc_dir_entry *parent,
66148 const struct file_operations *proc_fops,
66149 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66150 index 333080d..0a35ec4 100644
66151 --- a/fs/proc/inode.c
66152 +++ b/fs/proc/inode.c
66153 @@ -23,11 +23,17 @@
66154 #include <linux/slab.h>
66155 #include <linux/mount.h>
66156 #include <linux/magic.h>
66157 +#include <linux/grsecurity.h>
66158
66159 #include <asm/uaccess.h>
66160
66161 #include "internal.h"
66162
66163 +#ifdef CONFIG_PROC_SYSCTL
66164 +extern const struct inode_operations proc_sys_inode_operations;
66165 +extern const struct inode_operations proc_sys_dir_operations;
66166 +#endif
66167 +
66168 static void proc_evict_inode(struct inode *inode)
66169 {
66170 struct proc_dir_entry *de;
66171 @@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
66172 ns = PROC_I(inode)->ns.ns;
66173 if (ns_ops && ns)
66174 ns_ops->put(ns);
66175 +
66176 +#ifdef CONFIG_PROC_SYSCTL
66177 + if (inode->i_op == &proc_sys_inode_operations ||
66178 + inode->i_op == &proc_sys_dir_operations)
66179 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66180 +#endif
66181 +
66182 }
66183
66184 static struct kmem_cache * proc_inode_cachep;
66185 @@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66186 if (de->mode) {
66187 inode->i_mode = de->mode;
66188 inode->i_uid = de->uid;
66189 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66190 + inode->i_gid = grsec_proc_gid;
66191 +#else
66192 inode->i_gid = de->gid;
66193 +#endif
66194 }
66195 if (de->size)
66196 inode->i_size = de->size;
66197 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66198 index aa7a0ee..f2318df 100644
66199 --- a/fs/proc/internal.h
66200 +++ b/fs/proc/internal.h
66201 @@ -46,9 +46,10 @@ struct proc_dir_entry {
66202 struct completion *pde_unload_completion;
66203 struct list_head pde_openers; /* who did ->open, but not ->release */
66204 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66205 + u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66206 u8 namelen;
66207 char name[];
66208 -};
66209 +} __randomize_layout;
66210
66211 union proc_op {
66212 int (*proc_get_link)(struct dentry *, struct path *);
66213 @@ -66,7 +67,7 @@ struct proc_inode {
66214 struct ctl_table *sysctl_entry;
66215 struct proc_ns ns;
66216 struct inode vfs_inode;
66217 -};
66218 +} __randomize_layout;
66219
66220 /*
66221 * General functions
66222 @@ -154,6 +155,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66223 struct pid *, struct task_struct *);
66224 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66225 struct pid *, struct task_struct *);
66226 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66227 +extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66228 + struct pid *, struct task_struct *);
66229 +#endif
66230
66231 /*
66232 * base.c
66233 @@ -178,9 +183,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66234 * generic.c
66235 */
66236 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66237 +extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66238 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66239 struct dentry *);
66240 extern int proc_readdir(struct file *, struct dir_context *);
66241 +extern int proc_readdir_restrict(struct file *, struct dir_context *);
66242 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66243
66244 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66245 diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66246 index a352d57..cb94a5c 100644
66247 --- a/fs/proc/interrupts.c
66248 +++ b/fs/proc/interrupts.c
66249 @@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66250
66251 static int __init proc_interrupts_init(void)
66252 {
66253 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66254 + proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66255 +#else
66256 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66257 +#endif
66258 return 0;
66259 }
66260 fs_initcall(proc_interrupts_init);
66261 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66262 index 91a4e64..cb007c0 100644
66263 --- a/fs/proc/kcore.c
66264 +++ b/fs/proc/kcore.c
66265 @@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66266 * the addresses in the elf_phdr on our list.
66267 */
66268 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66269 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66270 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66271 + if (tsz > buflen)
66272 tsz = buflen;
66273 -
66274 +
66275 while (buflen) {
66276 struct kcore_list *m;
66277
66278 @@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66279 kfree(elf_buf);
66280 } else {
66281 if (kern_addr_valid(start)) {
66282 - unsigned long n;
66283 + char *elf_buf;
66284 + mm_segment_t oldfs;
66285
66286 - n = copy_to_user(buffer, (char *)start, tsz);
66287 - /*
66288 - * We cannot distinguish between fault on source
66289 - * and fault on destination. When this happens
66290 - * we clear too and hope it will trigger the
66291 - * EFAULT again.
66292 - */
66293 - if (n) {
66294 - if (clear_user(buffer + tsz - n,
66295 - n))
66296 + elf_buf = kmalloc(tsz, GFP_KERNEL);
66297 + if (!elf_buf)
66298 + return -ENOMEM;
66299 + oldfs = get_fs();
66300 + set_fs(KERNEL_DS);
66301 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66302 + set_fs(oldfs);
66303 + if (copy_to_user(buffer, elf_buf, tsz)) {
66304 + kfree(elf_buf);
66305 return -EFAULT;
66306 + }
66307 }
66308 + set_fs(oldfs);
66309 + kfree(elf_buf);
66310 } else {
66311 if (clear_user(buffer, tsz))
66312 return -EFAULT;
66313 @@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66314
66315 static int open_kcore(struct inode *inode, struct file *filp)
66316 {
66317 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66318 + return -EPERM;
66319 +#endif
66320 if (!capable(CAP_SYS_RAWIO))
66321 return -EPERM;
66322 if (kcore_need_update)
66323 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66324 index aa1eee0..03dda72 100644
66325 --- a/fs/proc/meminfo.c
66326 +++ b/fs/proc/meminfo.c
66327 @@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66328 vmi.used >> 10,
66329 vmi.largest_chunk >> 10
66330 #ifdef CONFIG_MEMORY_FAILURE
66331 - ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66332 + ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66333 #endif
66334 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66335 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66336 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66337 index d4a3574..b421ce9 100644
66338 --- a/fs/proc/nommu.c
66339 +++ b/fs/proc/nommu.c
66340 @@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66341
66342 if (file) {
66343 seq_pad(m, ' ');
66344 - seq_path(m, &file->f_path, "");
66345 + seq_path(m, &file->f_path, "\n\\");
66346 }
66347
66348 seq_putc(m, '\n');
66349 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66350 index a63af3e..b4f262a 100644
66351 --- a/fs/proc/proc_net.c
66352 +++ b/fs/proc/proc_net.c
66353 @@ -23,9 +23,27 @@
66354 #include <linux/nsproxy.h>
66355 #include <net/net_namespace.h>
66356 #include <linux/seq_file.h>
66357 +#include <linux/grsecurity.h>
66358
66359 #include "internal.h"
66360
66361 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66362 +static struct seq_operations *ipv6_seq_ops_addr;
66363 +
66364 +void register_ipv6_seq_ops_addr(struct seq_operations *addr)
66365 +{
66366 + ipv6_seq_ops_addr = addr;
66367 +}
66368 +
66369 +void unregister_ipv6_seq_ops_addr(void)
66370 +{
66371 + ipv6_seq_ops_addr = NULL;
66372 +}
66373 +
66374 +EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
66375 +EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
66376 +#endif
66377 +
66378 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
66379 {
66380 return pde->parent->data;
66381 @@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
66382 return maybe_get_net(PDE_NET(PDE(inode)));
66383 }
66384
66385 +extern const struct seq_operations dev_seq_ops;
66386 +
66387 int seq_open_net(struct inode *ino, struct file *f,
66388 const struct seq_operations *ops, int size)
66389 {
66390 @@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
66391
66392 BUG_ON(size < sizeof(*p));
66393
66394 + /* only permit access to /proc/net/dev */
66395 + if (
66396 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66397 + ops != ipv6_seq_ops_addr &&
66398 +#endif
66399 + ops != &dev_seq_ops && gr_proc_is_restricted())
66400 + return -EACCES;
66401 +
66402 net = get_proc_net(ino);
66403 if (net == NULL)
66404 return -ENXIO;
66405 @@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
66406 int err;
66407 struct net *net;
66408
66409 + if (gr_proc_is_restricted())
66410 + return -EACCES;
66411 +
66412 err = -ENXIO;
66413 net = get_proc_net(inode);
66414 if (net == NULL)
66415 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
66416 index f92d5dd..26398ac 100644
66417 --- a/fs/proc/proc_sysctl.c
66418 +++ b/fs/proc/proc_sysctl.c
66419 @@ -11,13 +11,21 @@
66420 #include <linux/namei.h>
66421 #include <linux/mm.h>
66422 #include <linux/module.h>
66423 +#include <linux/nsproxy.h>
66424 +#ifdef CONFIG_GRKERNSEC
66425 +#include <net/net_namespace.h>
66426 +#endif
66427 #include "internal.h"
66428
66429 +extern int gr_handle_chroot_sysctl(const int op);
66430 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66431 + const int op);
66432 +
66433 static const struct dentry_operations proc_sys_dentry_operations;
66434 static const struct file_operations proc_sys_file_operations;
66435 -static const struct inode_operations proc_sys_inode_operations;
66436 +const struct inode_operations proc_sys_inode_operations;
66437 static const struct file_operations proc_sys_dir_file_operations;
66438 -static const struct inode_operations proc_sys_dir_operations;
66439 +const struct inode_operations proc_sys_dir_operations;
66440
66441 void proc_sys_poll_notify(struct ctl_table_poll *poll)
66442 {
66443 @@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
66444
66445 err = NULL;
66446 d_set_d_op(dentry, &proc_sys_dentry_operations);
66447 +
66448 + gr_handle_proc_create(dentry, inode);
66449 +
66450 d_add(dentry, inode);
66451
66452 out:
66453 @@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66454 struct inode *inode = file_inode(filp);
66455 struct ctl_table_header *head = grab_header(inode);
66456 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
66457 + int op = write ? MAY_WRITE : MAY_READ;
66458 ssize_t error;
66459 size_t res;
66460
66461 @@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66462 * and won't be until we finish.
66463 */
66464 error = -EPERM;
66465 - if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
66466 + if (sysctl_perm(head, table, op))
66467 goto out;
66468
66469 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
66470 @@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66471 if (!table->proc_handler)
66472 goto out;
66473
66474 +#ifdef CONFIG_GRKERNSEC
66475 + error = -EPERM;
66476 + if (gr_handle_chroot_sysctl(op))
66477 + goto out;
66478 + dget(filp->f_path.dentry);
66479 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
66480 + dput(filp->f_path.dentry);
66481 + goto out;
66482 + }
66483 + dput(filp->f_path.dentry);
66484 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
66485 + goto out;
66486 + if (write) {
66487 + if (current->nsproxy->net_ns != table->extra2) {
66488 + if (!capable(CAP_SYS_ADMIN))
66489 + goto out;
66490 + } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
66491 + goto out;
66492 + }
66493 +#endif
66494 +
66495 /* careful: calling conventions are nasty here */
66496 res = count;
66497 error = table->proc_handler(table, write, buf, &res, ppos);
66498 @@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
66499 return false;
66500 } else {
66501 d_set_d_op(child, &proc_sys_dentry_operations);
66502 +
66503 + gr_handle_proc_create(child, inode);
66504 +
66505 d_add(child, inode);
66506 }
66507 } else {
66508 @@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
66509 if ((*pos)++ < ctx->pos)
66510 return true;
66511
66512 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
66513 + return 0;
66514 +
66515 if (unlikely(S_ISLNK(table->mode)))
66516 res = proc_sys_link_fill_cache(file, ctx, head, table);
66517 else
66518 @@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
66519 if (IS_ERR(head))
66520 return PTR_ERR(head);
66521
66522 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
66523 + return -ENOENT;
66524 +
66525 generic_fillattr(inode, stat);
66526 if (table)
66527 stat->mode = (stat->mode & S_IFMT) | table->mode;
66528 @@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
66529 .llseek = generic_file_llseek,
66530 };
66531
66532 -static const struct inode_operations proc_sys_inode_operations = {
66533 +const struct inode_operations proc_sys_inode_operations = {
66534 .permission = proc_sys_permission,
66535 .setattr = proc_sys_setattr,
66536 .getattr = proc_sys_getattr,
66537 };
66538
66539 -static const struct inode_operations proc_sys_dir_operations = {
66540 +const struct inode_operations proc_sys_dir_operations = {
66541 .lookup = proc_sys_lookup,
66542 .permission = proc_sys_permission,
66543 .setattr = proc_sys_setattr,
66544 @@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
66545 static struct ctl_dir *new_dir(struct ctl_table_set *set,
66546 const char *name, int namelen)
66547 {
66548 - struct ctl_table *table;
66549 + ctl_table_no_const *table;
66550 struct ctl_dir *new;
66551 struct ctl_node *node;
66552 char *new_name;
66553 @@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
66554 return NULL;
66555
66556 node = (struct ctl_node *)(new + 1);
66557 - table = (struct ctl_table *)(node + 1);
66558 + table = (ctl_table_no_const *)(node + 1);
66559 new_name = (char *)(table + 2);
66560 memcpy(new_name, name, namelen);
66561 new_name[namelen] = '\0';
66562 @@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
66563 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
66564 struct ctl_table_root *link_root)
66565 {
66566 - struct ctl_table *link_table, *entry, *link;
66567 + ctl_table_no_const *link_table, *link;
66568 + struct ctl_table *entry;
66569 struct ctl_table_header *links;
66570 struct ctl_node *node;
66571 char *link_name;
66572 @@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
66573 return NULL;
66574
66575 node = (struct ctl_node *)(links + 1);
66576 - link_table = (struct ctl_table *)(node + nr_entries);
66577 + link_table = (ctl_table_no_const *)(node + nr_entries);
66578 link_name = (char *)&link_table[nr_entries + 1];
66579
66580 for (link = link_table, entry = table; entry->procname; link++, entry++) {
66581 @@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66582 struct ctl_table_header ***subheader, struct ctl_table_set *set,
66583 struct ctl_table *table)
66584 {
66585 - struct ctl_table *ctl_table_arg = NULL;
66586 - struct ctl_table *entry, *files;
66587 + ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
66588 + struct ctl_table *entry;
66589 int nr_files = 0;
66590 int nr_dirs = 0;
66591 int err = -ENOMEM;
66592 @@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66593 nr_files++;
66594 }
66595
66596 - files = table;
66597 /* If there are mixed files and directories we need a new table */
66598 if (nr_dirs && nr_files) {
66599 - struct ctl_table *new;
66600 + ctl_table_no_const *new;
66601 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
66602 GFP_KERNEL);
66603 if (!files)
66604 @@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66605 /* Register everything except a directory full of subdirectories */
66606 if (nr_files || !nr_dirs) {
66607 struct ctl_table_header *header;
66608 - header = __register_sysctl_table(set, path, files);
66609 + header = __register_sysctl_table(set, path, files ? files : table);
66610 if (!header) {
66611 kfree(ctl_table_arg);
66612 goto out;
66613 diff --git a/fs/proc/root.c b/fs/proc/root.c
66614 index 094e44d..085a877 100644
66615 --- a/fs/proc/root.c
66616 +++ b/fs/proc/root.c
66617 @@ -188,7 +188,15 @@ void __init proc_root_init(void)
66618 proc_mkdir("openprom", NULL);
66619 #endif
66620 proc_tty_init();
66621 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66622 +#ifdef CONFIG_GRKERNSEC_PROC_USER
66623 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
66624 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66625 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
66626 +#endif
66627 +#else
66628 proc_mkdir("bus", NULL);
66629 +#endif
66630 proc_sys_init();
66631 }
66632
66633 diff --git a/fs/proc/stat.c b/fs/proc/stat.c
66634 index bf2d03f..f058f9c 100644
66635 --- a/fs/proc/stat.c
66636 +++ b/fs/proc/stat.c
66637 @@ -11,6 +11,7 @@
66638 #include <linux/irqnr.h>
66639 #include <linux/cputime.h>
66640 #include <linux/tick.h>
66641 +#include <linux/grsecurity.h>
66642
66643 #ifndef arch_irq_stat_cpu
66644 #define arch_irq_stat_cpu(cpu) 0
66645 @@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
66646 u64 sum_softirq = 0;
66647 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
66648 struct timespec boottime;
66649 + int unrestricted = 1;
66650 +
66651 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66652 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66653 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
66654 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66655 + && !in_group_p(grsec_proc_gid)
66656 +#endif
66657 + )
66658 + unrestricted = 0;
66659 +#endif
66660 +#endif
66661
66662 user = nice = system = idle = iowait =
66663 irq = softirq = steal = 0;
66664 @@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
66665 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66666 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66667 idle += get_idle_time(i);
66668 - iowait += get_iowait_time(i);
66669 - irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66670 - softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66671 - steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66672 - guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66673 - guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66674 - sum += kstat_cpu_irqs_sum(i);
66675 - sum += arch_irq_stat_cpu(i);
66676 + if (unrestricted) {
66677 + iowait += get_iowait_time(i);
66678 + irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66679 + softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66680 + steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66681 + guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66682 + guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66683 + sum += kstat_cpu_irqs_sum(i);
66684 + sum += arch_irq_stat_cpu(i);
66685 + for (j = 0; j < NR_SOFTIRQS; j++) {
66686 + unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66687
66688 - for (j = 0; j < NR_SOFTIRQS; j++) {
66689 - unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66690 -
66691 - per_softirq_sums[j] += softirq_stat;
66692 - sum_softirq += softirq_stat;
66693 + per_softirq_sums[j] += softirq_stat;
66694 + sum_softirq += softirq_stat;
66695 + }
66696 }
66697 }
66698 - sum += arch_irq_stat();
66699 + if (unrestricted)
66700 + sum += arch_irq_stat();
66701
66702 seq_puts(p, "cpu ");
66703 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66704 @@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
66705 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66706 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66707 idle = get_idle_time(i);
66708 - iowait = get_iowait_time(i);
66709 - irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66710 - softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66711 - steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66712 - guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66713 - guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66714 + if (unrestricted) {
66715 + iowait = get_iowait_time(i);
66716 + irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66717 + softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66718 + steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66719 + guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66720 + guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66721 + }
66722 seq_printf(p, "cpu%d", i);
66723 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66724 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
66725 @@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
66726
66727 /* sum again ? it could be updated? */
66728 for_each_irq_nr(j)
66729 - seq_put_decimal_ull(p, ' ', kstat_irqs(j));
66730 + seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
66731
66732 seq_printf(p,
66733 "\nctxt %llu\n"
66734 @@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
66735 "processes %lu\n"
66736 "procs_running %lu\n"
66737 "procs_blocked %lu\n",
66738 - nr_context_switches(),
66739 + unrestricted ? nr_context_switches() : 0ULL,
66740 (unsigned long)jif,
66741 - total_forks,
66742 - nr_running(),
66743 - nr_iowait());
66744 + unrestricted ? total_forks : 0UL,
66745 + unrestricted ? nr_running() : 0UL,
66746 + unrestricted ? nr_iowait() : 0UL);
66747
66748 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
66749
66750 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
66751 index 4e0388c..fc6a0e1 100644
66752 --- a/fs/proc/task_mmu.c
66753 +++ b/fs/proc/task_mmu.c
66754 @@ -13,12 +13,19 @@
66755 #include <linux/swap.h>
66756 #include <linux/swapops.h>
66757 #include <linux/mmu_notifier.h>
66758 +#include <linux/grsecurity.h>
66759
66760 #include <asm/elf.h>
66761 #include <asm/uaccess.h>
66762 #include <asm/tlbflush.h>
66763 #include "internal.h"
66764
66765 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66766 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66767 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
66768 + _mm->pax_flags & MF_PAX_SEGMEXEC))
66769 +#endif
66770 +
66771 void task_mem(struct seq_file *m, struct mm_struct *mm)
66772 {
66773 unsigned long data, text, lib, swap;
66774 @@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66775 "VmExe:\t%8lu kB\n"
66776 "VmLib:\t%8lu kB\n"
66777 "VmPTE:\t%8lu kB\n"
66778 - "VmSwap:\t%8lu kB\n",
66779 - hiwater_vm << (PAGE_SHIFT-10),
66780 + "VmSwap:\t%8lu kB\n"
66781 +
66782 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66783 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
66784 +#endif
66785 +
66786 + ,hiwater_vm << (PAGE_SHIFT-10),
66787 total_vm << (PAGE_SHIFT-10),
66788 mm->locked_vm << (PAGE_SHIFT-10),
66789 mm->pinned_vm << (PAGE_SHIFT-10),
66790 @@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66791 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
66792 (PTRS_PER_PTE * sizeof(pte_t) *
66793 atomic_long_read(&mm->nr_ptes)) >> 10,
66794 - swap << (PAGE_SHIFT-10));
66795 + swap << (PAGE_SHIFT-10)
66796 +
66797 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66798 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66799 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
66800 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
66801 +#else
66802 + , mm->context.user_cs_base
66803 + , mm->context.user_cs_limit
66804 +#endif
66805 +#endif
66806 +
66807 + );
66808 }
66809
66810 unsigned long task_vsize(struct mm_struct *mm)
66811 @@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66812 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
66813 }
66814
66815 - /* We don't show the stack guard page in /proc/maps */
66816 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66817 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
66818 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
66819 +#else
66820 start = vma->vm_start;
66821 - if (stack_guard_page_start(vma, start))
66822 - start += PAGE_SIZE;
66823 end = vma->vm_end;
66824 - if (stack_guard_page_end(vma, end))
66825 - end -= PAGE_SIZE;
66826 +#endif
66827
66828 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
66829 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
66830 @@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66831 flags & VM_WRITE ? 'w' : '-',
66832 flags & VM_EXEC ? 'x' : '-',
66833 flags & VM_MAYSHARE ? 's' : 'p',
66834 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66835 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
66836 +#else
66837 pgoff,
66838 +#endif
66839 MAJOR(dev), MINOR(dev), ino);
66840
66841 /*
66842 @@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66843 */
66844 if (file) {
66845 seq_pad(m, ' ');
66846 - seq_path(m, &file->f_path, "\n");
66847 + seq_path(m, &file->f_path, "\n\\");
66848 goto done;
66849 }
66850
66851 @@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66852 * Thread stack in /proc/PID/task/TID/maps or
66853 * the main process stack.
66854 */
66855 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
66856 - vma->vm_end >= mm->start_stack)) {
66857 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
66858 + (vma->vm_start <= mm->start_stack &&
66859 + vma->vm_end >= mm->start_stack)) {
66860 name = "[stack]";
66861 } else {
66862 /* Thread stack in /proc/PID/maps */
66863 @@ -359,6 +388,12 @@ done:
66864
66865 static int show_map(struct seq_file *m, void *v, int is_pid)
66866 {
66867 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66868 + if (current->exec_id != m->exec_id) {
66869 + gr_log_badprocpid("maps");
66870 + return 0;
66871 + }
66872 +#endif
66873 show_map_vma(m, v, is_pid);
66874 m_cache_vma(m, v);
66875 return 0;
66876 @@ -594,12 +629,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66877 .private = &mss,
66878 };
66879
66880 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66881 + if (current->exec_id != m->exec_id) {
66882 + gr_log_badprocpid("smaps");
66883 + return 0;
66884 + }
66885 +#endif
66886 memset(&mss, 0, sizeof mss);
66887 - mss.vma = vma;
66888 - /* mmap_sem is held in m_start */
66889 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66890 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66891 -
66892 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66893 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
66894 +#endif
66895 + mss.vma = vma;
66896 + /* mmap_sem is held in m_start */
66897 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66898 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66899 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66900 + }
66901 +#endif
66902 show_map_vma(m, vma, is_pid);
66903
66904 seq_printf(m,
66905 @@ -617,7 +663,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66906 "KernelPageSize: %8lu kB\n"
66907 "MMUPageSize: %8lu kB\n"
66908 "Locked: %8lu kB\n",
66909 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66910 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
66911 +#else
66912 (vma->vm_end - vma->vm_start) >> 10,
66913 +#endif
66914 mss.resident >> 10,
66915 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
66916 mss.shared_clean >> 10,
66917 @@ -1447,6 +1497,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66918 char buffer[64];
66919 int nid;
66920
66921 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66922 + if (current->exec_id != m->exec_id) {
66923 + gr_log_badprocpid("numa_maps");
66924 + return 0;
66925 + }
66926 +#endif
66927 +
66928 if (!mm)
66929 return 0;
66930
66931 @@ -1468,11 +1525,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66932 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
66933 }
66934
66935 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66936 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
66937 +#else
66938 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
66939 +#endif
66940
66941 if (file) {
66942 seq_puts(m, " file=");
66943 - seq_path(m, &file->f_path, "\n\t= ");
66944 + seq_path(m, &file->f_path, "\n\t\\= ");
66945 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
66946 seq_puts(m, " heap");
66947 } else {
66948 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
66949 index 599ec2e..f1413ae 100644
66950 --- a/fs/proc/task_nommu.c
66951 +++ b/fs/proc/task_nommu.c
66952 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66953 else
66954 bytes += kobjsize(mm);
66955
66956 - if (current->fs && current->fs->users > 1)
66957 + if (current->fs && atomic_read(&current->fs->users) > 1)
66958 sbytes += kobjsize(current->fs);
66959 else
66960 bytes += kobjsize(current->fs);
66961 @@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
66962
66963 if (file) {
66964 seq_pad(m, ' ');
66965 - seq_path(m, &file->f_path, "");
66966 + seq_path(m, &file->f_path, "\n\\");
66967 } else if (mm) {
66968 pid_t tid = pid_of_stack(priv, vma, is_pid);
66969
66970 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
66971 index a90d6d35..d08047c 100644
66972 --- a/fs/proc/vmcore.c
66973 +++ b/fs/proc/vmcore.c
66974 @@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
66975 nr_bytes = count;
66976
66977 /* If pfn is not ram, return zeros for sparse dump files */
66978 - if (pfn_is_ram(pfn) == 0)
66979 - memset(buf, 0, nr_bytes);
66980 - else {
66981 + if (pfn_is_ram(pfn) == 0) {
66982 + if (userbuf) {
66983 + if (clear_user((char __force_user *)buf, nr_bytes))
66984 + return -EFAULT;
66985 + } else
66986 + memset(buf, 0, nr_bytes);
66987 + } else {
66988 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
66989 offset, userbuf);
66990 if (tmp < 0)
66991 @@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
66992 static int copy_to(void *target, void *src, size_t size, int userbuf)
66993 {
66994 if (userbuf) {
66995 - if (copy_to_user((char __user *) target, src, size))
66996 + if (copy_to_user((char __force_user *) target, src, size))
66997 return -EFAULT;
66998 } else {
66999 memcpy(target, src, size);
67000 @@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67001 if (*fpos < m->offset + m->size) {
67002 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
67003 start = m->paddr + *fpos - m->offset;
67004 - tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
67005 + tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
67006 if (tmp < 0)
67007 return tmp;
67008 buflen -= tsz;
67009 @@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67010 static ssize_t read_vmcore(struct file *file, char __user *buffer,
67011 size_t buflen, loff_t *fpos)
67012 {
67013 - return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
67014 + return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
67015 }
67016
67017 /*
67018 diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
67019 index d3fb2b6..43a8140 100644
67020 --- a/fs/qnx6/qnx6.h
67021 +++ b/fs/qnx6/qnx6.h
67022 @@ -74,7 +74,7 @@ enum {
67023 BYTESEX_BE,
67024 };
67025
67026 -static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67027 +static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67028 {
67029 if (sbi->s_bytesex == BYTESEX_LE)
67030 return le64_to_cpu((__force __le64)n);
67031 @@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
67032 return (__force __fs64)cpu_to_be64(n);
67033 }
67034
67035 -static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67036 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67037 {
67038 if (sbi->s_bytesex == BYTESEX_LE)
67039 return le32_to_cpu((__force __le32)n);
67040 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
67041 index bb2869f..d34ada8 100644
67042 --- a/fs/quota/netlink.c
67043 +++ b/fs/quota/netlink.c
67044 @@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
67045 void quota_send_warning(struct kqid qid, dev_t dev,
67046 const char warntype)
67047 {
67048 - static atomic_t seq;
67049 + static atomic_unchecked_t seq;
67050 struct sk_buff *skb;
67051 void *msg_head;
67052 int ret;
67053 @@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
67054 "VFS: Not enough memory to send quota warning.\n");
67055 return;
67056 }
67057 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
67058 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
67059 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
67060 if (!msg_head) {
67061 printk(KERN_ERR
67062 diff --git a/fs/read_write.c b/fs/read_write.c
67063 index 7d9318c..51b336f 100644
67064 --- a/fs/read_write.c
67065 +++ b/fs/read_write.c
67066 @@ -495,7 +495,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
67067
67068 old_fs = get_fs();
67069 set_fs(get_ds());
67070 - p = (__force const char __user *)buf;
67071 + p = (const char __force_user *)buf;
67072 if (count > MAX_RW_COUNT)
67073 count = MAX_RW_COUNT;
67074 if (file->f_op->write)
67075 diff --git a/fs/readdir.c b/fs/readdir.c
67076 index 33fd922..e0d6094 100644
67077 --- a/fs/readdir.c
67078 +++ b/fs/readdir.c
67079 @@ -18,6 +18,7 @@
67080 #include <linux/security.h>
67081 #include <linux/syscalls.h>
67082 #include <linux/unistd.h>
67083 +#include <linux/namei.h>
67084
67085 #include <asm/uaccess.h>
67086
67087 @@ -71,6 +72,7 @@ struct old_linux_dirent {
67088 struct readdir_callback {
67089 struct dir_context ctx;
67090 struct old_linux_dirent __user * dirent;
67091 + struct file * file;
67092 int result;
67093 };
67094
67095 @@ -88,6 +90,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
67096 buf->result = -EOVERFLOW;
67097 return -EOVERFLOW;
67098 }
67099 +
67100 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67101 + return 0;
67102 +
67103 buf->result++;
67104 dirent = buf->dirent;
67105 if (!access_ok(VERIFY_WRITE, dirent,
67106 @@ -119,6 +125,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
67107 if (!f.file)
67108 return -EBADF;
67109
67110 + buf.file = f.file;
67111 error = iterate_dir(f.file, &buf.ctx);
67112 if (buf.result)
67113 error = buf.result;
67114 @@ -144,6 +151,7 @@ struct getdents_callback {
67115 struct dir_context ctx;
67116 struct linux_dirent __user * current_dir;
67117 struct linux_dirent __user * previous;
67118 + struct file * file;
67119 int count;
67120 int error;
67121 };
67122 @@ -165,6 +173,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
67123 buf->error = -EOVERFLOW;
67124 return -EOVERFLOW;
67125 }
67126 +
67127 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67128 + return 0;
67129 +
67130 dirent = buf->previous;
67131 if (dirent) {
67132 if (__put_user(offset, &dirent->d_off))
67133 @@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67134 if (!f.file)
67135 return -EBADF;
67136
67137 + buf.file = f.file;
67138 error = iterate_dir(f.file, &buf.ctx);
67139 if (error >= 0)
67140 error = buf.error;
67141 @@ -228,6 +241,7 @@ struct getdents_callback64 {
67142 struct dir_context ctx;
67143 struct linux_dirent64 __user * current_dir;
67144 struct linux_dirent64 __user * previous;
67145 + struct file *file;
67146 int count;
67147 int error;
67148 };
67149 @@ -243,6 +257,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
67150 buf->error = -EINVAL; /* only used if we fail.. */
67151 if (reclen > buf->count)
67152 return -EINVAL;
67153 +
67154 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67155 + return 0;
67156 +
67157 dirent = buf->previous;
67158 if (dirent) {
67159 if (__put_user(offset, &dirent->d_off))
67160 @@ -290,6 +308,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67161 if (!f.file)
67162 return -EBADF;
67163
67164 + buf.file = f.file;
67165 error = iterate_dir(f.file, &buf.ctx);
67166 if (error >= 0)
67167 error = buf.error;
67168 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67169 index 9c02d96..6562c10 100644
67170 --- a/fs/reiserfs/do_balan.c
67171 +++ b/fs/reiserfs/do_balan.c
67172 @@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67173 return;
67174 }
67175
67176 - atomic_inc(&fs_generation(tb->tb_sb));
67177 + atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67178 do_balance_starts(tb);
67179
67180 /*
67181 diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67182 index aca73dd..e3c558d 100644
67183 --- a/fs/reiserfs/item_ops.c
67184 +++ b/fs/reiserfs/item_ops.c
67185 @@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67186 }
67187
67188 static struct item_operations errcatch_ops = {
67189 - errcatch_bytes_number,
67190 - errcatch_decrement_key,
67191 - errcatch_is_left_mergeable,
67192 - errcatch_print_item,
67193 - errcatch_check_item,
67194 + .bytes_number = errcatch_bytes_number,
67195 + .decrement_key = errcatch_decrement_key,
67196 + .is_left_mergeable = errcatch_is_left_mergeable,
67197 + .print_item = errcatch_print_item,
67198 + .check_item = errcatch_check_item,
67199
67200 - errcatch_create_vi,
67201 - errcatch_check_left,
67202 - errcatch_check_right,
67203 - errcatch_part_size,
67204 - errcatch_unit_num,
67205 - errcatch_print_vi
67206 + .create_vi = errcatch_create_vi,
67207 + .check_left = errcatch_check_left,
67208 + .check_right = errcatch_check_right,
67209 + .part_size = errcatch_part_size,
67210 + .unit_num = errcatch_unit_num,
67211 + .print_vi = errcatch_print_vi
67212 };
67213
67214 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67215 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67216 index 621b9f3..af527fd 100644
67217 --- a/fs/reiserfs/procfs.c
67218 +++ b/fs/reiserfs/procfs.c
67219 @@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67220 "SMALL_TAILS " : "NO_TAILS ",
67221 replay_only(sb) ? "REPLAY_ONLY " : "",
67222 convert_reiserfs(sb) ? "CONV " : "",
67223 - atomic_read(&r->s_generation_counter),
67224 + atomic_read_unchecked(&r->s_generation_counter),
67225 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67226 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67227 SF(s_good_search_by_key_reada), SF(s_bmaps),
67228 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67229 index 1894d96..1dfd1c2 100644
67230 --- a/fs/reiserfs/reiserfs.h
67231 +++ b/fs/reiserfs/reiserfs.h
67232 @@ -576,7 +576,7 @@ struct reiserfs_sb_info {
67233 /* Comment? -Hans */
67234 wait_queue_head_t s_wait;
67235 /* increased by one every time the tree gets re-balanced */
67236 - atomic_t s_generation_counter;
67237 + atomic_unchecked_t s_generation_counter;
67238
67239 /* File system properties. Currently holds on-disk FS format */
67240 unsigned long s_properties;
67241 @@ -2297,7 +2297,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67242 #define REISERFS_USER_MEM 1 /* user memory mode */
67243
67244 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67245 -#define get_generation(s) atomic_read (&fs_generation(s))
67246 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67247 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67248 #define __fs_changed(gen,s) (gen != get_generation (s))
67249 #define fs_changed(gen,s) \
67250 diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67251 index f1376c9..f9378e9 100644
67252 --- a/fs/reiserfs/super.c
67253 +++ b/fs/reiserfs/super.c
67254 @@ -1857,6 +1857,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67255 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67256 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67257 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67258 +#ifdef CONFIG_REISERFS_FS_XATTR
67259 + /* turn on user xattrs by default */
67260 + sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67261 +#endif
67262 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67263 sbi->s_alloc_options.preallocmin = 0;
67264 /* Preallocate by 16 blocks (17-1) at once */
67265 diff --git a/fs/select.c b/fs/select.c
67266 index 467bb1c..cf9d65a 100644
67267 --- a/fs/select.c
67268 +++ b/fs/select.c
67269 @@ -20,6 +20,7 @@
67270 #include <linux/export.h>
67271 #include <linux/slab.h>
67272 #include <linux/poll.h>
67273 +#include <linux/security.h>
67274 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67275 #include <linux/file.h>
67276 #include <linux/fdtable.h>
67277 @@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67278 struct poll_list *walk = head;
67279 unsigned long todo = nfds;
67280
67281 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67282 if (nfds > rlimit(RLIMIT_NOFILE))
67283 return -EINVAL;
67284
67285 diff --git a/fs/seq_file.c b/fs/seq_file.c
67286 index 3857b72..0b7281e 100644
67287 --- a/fs/seq_file.c
67288 +++ b/fs/seq_file.c
67289 @@ -12,6 +12,8 @@
67290 #include <linux/slab.h>
67291 #include <linux/cred.h>
67292 #include <linux/mm.h>
67293 +#include <linux/sched.h>
67294 +#include <linux/grsecurity.h>
67295
67296 #include <asm/uaccess.h>
67297 #include <asm/page.h>
67298 @@ -34,12 +36,7 @@ static void seq_set_overflow(struct seq_file *m)
67299
67300 static void *seq_buf_alloc(unsigned long size)
67301 {
67302 - void *buf;
67303 -
67304 - buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
67305 - if (!buf && size > PAGE_SIZE)
67306 - buf = vmalloc(size);
67307 - return buf;
67308 + return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67309 }
67310
67311 /**
67312 @@ -72,6 +69,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67313 #ifdef CONFIG_USER_NS
67314 p->user_ns = file->f_cred->user_ns;
67315 #endif
67316 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67317 + p->exec_id = current->exec_id;
67318 +#endif
67319
67320 /*
67321 * Wrappers around seq_open(e.g. swaps_open) need to be
67322 @@ -94,6 +94,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67323 }
67324 EXPORT_SYMBOL(seq_open);
67325
67326 +
67327 +int seq_open_restrict(struct file *file, const struct seq_operations *op)
67328 +{
67329 + if (gr_proc_is_restricted())
67330 + return -EACCES;
67331 +
67332 + return seq_open(file, op);
67333 +}
67334 +EXPORT_SYMBOL(seq_open_restrict);
67335 +
67336 static int traverse(struct seq_file *m, loff_t offset)
67337 {
67338 loff_t pos = 0, index;
67339 @@ -165,7 +175,7 @@ Eoverflow:
67340 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67341 {
67342 struct seq_file *m = file->private_data;
67343 - size_t copied = 0;
67344 + ssize_t copied = 0;
67345 loff_t pos;
67346 size_t n;
67347 void *p;
67348 @@ -596,7 +606,7 @@ static void single_stop(struct seq_file *p, void *v)
67349 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67350 void *data)
67351 {
67352 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
67353 + seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
67354 int res = -ENOMEM;
67355
67356 if (op) {
67357 @@ -632,6 +642,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
67358 }
67359 EXPORT_SYMBOL(single_open_size);
67360
67361 +int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
67362 + void *data)
67363 +{
67364 + if (gr_proc_is_restricted())
67365 + return -EACCES;
67366 +
67367 + return single_open(file, show, data);
67368 +}
67369 +EXPORT_SYMBOL(single_open_restrict);
67370 +
67371 +
67372 int single_release(struct inode *inode, struct file *file)
67373 {
67374 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
67375 diff --git a/fs/splice.c b/fs/splice.c
67376 index 75c6058..770d40c 100644
67377 --- a/fs/splice.c
67378 +++ b/fs/splice.c
67379 @@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67380 pipe_lock(pipe);
67381
67382 for (;;) {
67383 - if (!pipe->readers) {
67384 + if (!atomic_read(&pipe->readers)) {
67385 send_sig(SIGPIPE, current, 0);
67386 if (!ret)
67387 ret = -EPIPE;
67388 @@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67389 page_nr++;
67390 ret += buf->len;
67391
67392 - if (pipe->files)
67393 + if (atomic_read(&pipe->files))
67394 do_wakeup = 1;
67395
67396 if (!--spd->nr_pages)
67397 @@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67398 do_wakeup = 0;
67399 }
67400
67401 - pipe->waiting_writers++;
67402 + atomic_inc(&pipe->waiting_writers);
67403 pipe_wait(pipe);
67404 - pipe->waiting_writers--;
67405 + atomic_dec(&pipe->waiting_writers);
67406 }
67407
67408 pipe_unlock(pipe);
67409 @@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
67410 old_fs = get_fs();
67411 set_fs(get_ds());
67412 /* The cast to a user pointer is valid due to the set_fs() */
67413 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
67414 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
67415 set_fs(old_fs);
67416
67417 return res;
67418 @@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
67419 old_fs = get_fs();
67420 set_fs(get_ds());
67421 /* The cast to a user pointer is valid due to the set_fs() */
67422 - res = vfs_write(file, (__force const char __user *)buf, count, &pos);
67423 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
67424 set_fs(old_fs);
67425
67426 return res;
67427 @@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
67428 goto err;
67429
67430 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
67431 - vec[i].iov_base = (void __user *) page_address(page);
67432 + vec[i].iov_base = (void __force_user *) page_address(page);
67433 vec[i].iov_len = this_len;
67434 spd.pages[i] = page;
67435 spd.nr_pages++;
67436 @@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67437 ops->release(pipe, buf);
67438 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67439 pipe->nrbufs--;
67440 - if (pipe->files)
67441 + if (atomic_read(&pipe->files))
67442 sd->need_wakeup = true;
67443 }
67444
67445 @@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67446 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
67447 {
67448 while (!pipe->nrbufs) {
67449 - if (!pipe->writers)
67450 + if (!atomic_read(&pipe->writers))
67451 return 0;
67452
67453 - if (!pipe->waiting_writers && sd->num_spliced)
67454 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
67455 return 0;
67456
67457 if (sd->flags & SPLICE_F_NONBLOCK)
67458 @@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
67459 ops->release(pipe, buf);
67460 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67461 pipe->nrbufs--;
67462 - if (pipe->files)
67463 + if (atomic_read(&pipe->files))
67464 sd.need_wakeup = true;
67465 } else {
67466 buf->offset += ret;
67467 @@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
67468 * out of the pipe right after the splice_to_pipe(). So set
67469 * PIPE_READERS appropriately.
67470 */
67471 - pipe->readers = 1;
67472 + atomic_set(&pipe->readers, 1);
67473
67474 current->splice_pipe = pipe;
67475 }
67476 @@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
67477
67478 partial[buffers].offset = off;
67479 partial[buffers].len = plen;
67480 + partial[buffers].private = 0;
67481
67482 off = 0;
67483 len -= plen;
67484 @@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67485 ret = -ERESTARTSYS;
67486 break;
67487 }
67488 - if (!pipe->writers)
67489 + if (!atomic_read(&pipe->writers))
67490 break;
67491 - if (!pipe->waiting_writers) {
67492 + if (!atomic_read(&pipe->waiting_writers)) {
67493 if (flags & SPLICE_F_NONBLOCK) {
67494 ret = -EAGAIN;
67495 break;
67496 @@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67497 pipe_lock(pipe);
67498
67499 while (pipe->nrbufs >= pipe->buffers) {
67500 - if (!pipe->readers) {
67501 + if (!atomic_read(&pipe->readers)) {
67502 send_sig(SIGPIPE, current, 0);
67503 ret = -EPIPE;
67504 break;
67505 @@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67506 ret = -ERESTARTSYS;
67507 break;
67508 }
67509 - pipe->waiting_writers++;
67510 + atomic_inc(&pipe->waiting_writers);
67511 pipe_wait(pipe);
67512 - pipe->waiting_writers--;
67513 + atomic_dec(&pipe->waiting_writers);
67514 }
67515
67516 pipe_unlock(pipe);
67517 @@ -1818,14 +1819,14 @@ retry:
67518 pipe_double_lock(ipipe, opipe);
67519
67520 do {
67521 - if (!opipe->readers) {
67522 + if (!atomic_read(&opipe->readers)) {
67523 send_sig(SIGPIPE, current, 0);
67524 if (!ret)
67525 ret = -EPIPE;
67526 break;
67527 }
67528
67529 - if (!ipipe->nrbufs && !ipipe->writers)
67530 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
67531 break;
67532
67533 /*
67534 @@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67535 pipe_double_lock(ipipe, opipe);
67536
67537 do {
67538 - if (!opipe->readers) {
67539 + if (!atomic_read(&opipe->readers)) {
67540 send_sig(SIGPIPE, current, 0);
67541 if (!ret)
67542 ret = -EPIPE;
67543 @@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67544 * return EAGAIN if we have the potential of some data in the
67545 * future, otherwise just return 0
67546 */
67547 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
67548 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
67549 ret = -EAGAIN;
67550
67551 pipe_unlock(ipipe);
67552 diff --git a/fs/stat.c b/fs/stat.c
67553 index ae0c3ce..9ee641c 100644
67554 --- a/fs/stat.c
67555 +++ b/fs/stat.c
67556 @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
67557 stat->gid = inode->i_gid;
67558 stat->rdev = inode->i_rdev;
67559 stat->size = i_size_read(inode);
67560 - stat->atime = inode->i_atime;
67561 - stat->mtime = inode->i_mtime;
67562 + if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67563 + stat->atime = inode->i_ctime;
67564 + stat->mtime = inode->i_ctime;
67565 + } else {
67566 + stat->atime = inode->i_atime;
67567 + stat->mtime = inode->i_mtime;
67568 + }
67569 stat->ctime = inode->i_ctime;
67570 stat->blksize = (1 << inode->i_blkbits);
67571 stat->blocks = inode->i_blocks;
67572 @@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
67573 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
67574 {
67575 struct inode *inode = path->dentry->d_inode;
67576 + int retval;
67577
67578 - if (inode->i_op->getattr)
67579 - return inode->i_op->getattr(path->mnt, path->dentry, stat);
67580 + if (inode->i_op->getattr) {
67581 + retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
67582 + if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67583 + stat->atime = stat->ctime;
67584 + stat->mtime = stat->ctime;
67585 + }
67586 + return retval;
67587 + }
67588
67589 generic_fillattr(inode, stat);
67590 return 0;
67591 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
67592 index 0b45ff4..847de5b 100644
67593 --- a/fs/sysfs/dir.c
67594 +++ b/fs/sysfs/dir.c
67595 @@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
67596 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67597 {
67598 struct kernfs_node *parent, *kn;
67599 + const char *name;
67600 + umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
67601 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67602 + const char *parent_name;
67603 +#endif
67604
67605 BUG_ON(!kobj);
67606
67607 + name = kobject_name(kobj);
67608 +
67609 if (kobj->parent)
67610 parent = kobj->parent->sd;
67611 else
67612 @@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67613 if (!parent)
67614 return -ENOENT;
67615
67616 - kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
67617 - S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
67618 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67619 + parent_name = parent->name;
67620 + mode = S_IRWXU;
67621 +
67622 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
67623 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
67624 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
67625 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
67626 + mode = S_IRWXU | S_IRUGO | S_IXUGO;
67627 +#endif
67628 +
67629 + kn = kernfs_create_dir_ns(parent, name,
67630 + mode, kobj, ns);
67631 if (IS_ERR(kn)) {
67632 if (PTR_ERR(kn) == -EEXIST)
67633 - sysfs_warn_dup(parent, kobject_name(kobj));
67634 + sysfs_warn_dup(parent, name);
67635 return PTR_ERR(kn);
67636 }
67637
67638 diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
67639 index 69d4889..a810bd4 100644
67640 --- a/fs/sysv/sysv.h
67641 +++ b/fs/sysv/sysv.h
67642 @@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
67643 #endif
67644 }
67645
67646 -static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67647 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67648 {
67649 if (sbi->s_bytesex == BYTESEX_PDP)
67650 return PDP_swab((__force __u32)n);
67651 diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
67652 index fb08b0c..65fcc7e 100644
67653 --- a/fs/ubifs/io.c
67654 +++ b/fs/ubifs/io.c
67655 @@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
67656 return err;
67657 }
67658
67659 -int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67660 +int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67661 {
67662 int err;
67663
67664 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
67665 index c175b4d..8f36a16 100644
67666 --- a/fs/udf/misc.c
67667 +++ b/fs/udf/misc.c
67668 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
67669
67670 u8 udf_tag_checksum(const struct tag *t)
67671 {
67672 - u8 *data = (u8 *)t;
67673 + const u8 *data = (const u8 *)t;
67674 u8 checksum = 0;
67675 int i;
67676 for (i = 0; i < sizeof(struct tag); ++i)
67677 diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
67678 index 8d974c4..b82f6ec 100644
67679 --- a/fs/ufs/swab.h
67680 +++ b/fs/ufs/swab.h
67681 @@ -22,7 +22,7 @@ enum {
67682 BYTESEX_BE
67683 };
67684
67685 -static inline u64
67686 +static inline u64 __intentional_overflow(-1)
67687 fs64_to_cpu(struct super_block *sbp, __fs64 n)
67688 {
67689 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67690 @@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
67691 return (__force __fs64)cpu_to_be64(n);
67692 }
67693
67694 -static inline u32
67695 +static inline u32 __intentional_overflow(-1)
67696 fs32_to_cpu(struct super_block *sbp, __fs32 n)
67697 {
67698 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67699 diff --git a/fs/utimes.c b/fs/utimes.c
67700 index aa138d6..5f3a811 100644
67701 --- a/fs/utimes.c
67702 +++ b/fs/utimes.c
67703 @@ -1,6 +1,7 @@
67704 #include <linux/compiler.h>
67705 #include <linux/file.h>
67706 #include <linux/fs.h>
67707 +#include <linux/security.h>
67708 #include <linux/linkage.h>
67709 #include <linux/mount.h>
67710 #include <linux/namei.h>
67711 @@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
67712 }
67713 }
67714 retry_deleg:
67715 +
67716 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
67717 + error = -EACCES;
67718 + goto mnt_drop_write_and_out;
67719 + }
67720 +
67721 mutex_lock(&inode->i_mutex);
67722 error = notify_change(path->dentry, &newattrs, &delegated_inode);
67723 mutex_unlock(&inode->i_mutex);
67724 diff --git a/fs/xattr.c b/fs/xattr.c
67725 index 64e83ef..b6be154 100644
67726 --- a/fs/xattr.c
67727 +++ b/fs/xattr.c
67728 @@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
67729 return rc;
67730 }
67731
67732 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
67733 +ssize_t
67734 +pax_getxattr(struct dentry *dentry, void *value, size_t size)
67735 +{
67736 + struct inode *inode = dentry->d_inode;
67737 + ssize_t error;
67738 +
67739 + error = inode_permission(inode, MAY_EXEC);
67740 + if (error)
67741 + return error;
67742 +
67743 + if (inode->i_op->getxattr)
67744 + error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
67745 + else
67746 + error = -EOPNOTSUPP;
67747 +
67748 + return error;
67749 +}
67750 +EXPORT_SYMBOL(pax_getxattr);
67751 +#endif
67752 +
67753 ssize_t
67754 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
67755 {
67756 @@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
67757 * Extended attribute SET operations
67758 */
67759 static long
67760 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
67761 +setxattr(struct path *path, const char __user *name, const void __user *value,
67762 size_t size, int flags)
67763 {
67764 int error;
67765 @@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
67766 posix_acl_fix_xattr_from_user(kvalue, size);
67767 }
67768
67769 - error = vfs_setxattr(d, kname, kvalue, size, flags);
67770 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
67771 + error = -EACCES;
67772 + goto out;
67773 + }
67774 +
67775 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
67776 out:
67777 if (vvalue)
67778 vfree(vvalue);
67779 @@ -376,7 +402,7 @@ retry:
67780 return error;
67781 error = mnt_want_write(path.mnt);
67782 if (!error) {
67783 - error = setxattr(path.dentry, name, value, size, flags);
67784 + error = setxattr(&path, name, value, size, flags);
67785 mnt_drop_write(path.mnt);
67786 }
67787 path_put(&path);
67788 @@ -405,16 +431,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
67789 const void __user *,value, size_t, size, int, flags)
67790 {
67791 struct fd f = fdget(fd);
67792 - struct dentry *dentry;
67793 int error = -EBADF;
67794
67795 if (!f.file)
67796 return error;
67797 - dentry = f.file->f_path.dentry;
67798 - audit_inode(NULL, dentry, 0);
67799 + audit_inode(NULL, f.file->f_path.dentry, 0);
67800 error = mnt_want_write_file(f.file);
67801 if (!error) {
67802 - error = setxattr(dentry, name, value, size, flags);
67803 + error = setxattr(&f.file->f_path, name, value, size, flags);
67804 mnt_drop_write_file(f.file);
67805 }
67806 fdput(f);
67807 @@ -600,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
67808 * Extended attribute REMOVE operations
67809 */
67810 static long
67811 -removexattr(struct dentry *d, const char __user *name)
67812 +removexattr(struct path *path, const char __user *name)
67813 {
67814 int error;
67815 char kname[XATTR_NAME_MAX + 1];
67816 @@ -611,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
67817 if (error < 0)
67818 return error;
67819
67820 - return vfs_removexattr(d, kname);
67821 + if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
67822 + return -EACCES;
67823 +
67824 + return vfs_removexattr(path->dentry, kname);
67825 }
67826
67827 static int path_removexattr(const char __user *pathname,
67828 @@ -625,7 +652,7 @@ retry:
67829 return error;
67830 error = mnt_want_write(path.mnt);
67831 if (!error) {
67832 - error = removexattr(path.dentry, name);
67833 + error = removexattr(&path, name);
67834 mnt_drop_write(path.mnt);
67835 }
67836 path_put(&path);
67837 @@ -651,16 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
67838 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
67839 {
67840 struct fd f = fdget(fd);
67841 - struct dentry *dentry;
67842 + struct path *path;
67843 int error = -EBADF;
67844
67845 if (!f.file)
67846 return error;
67847 - dentry = f.file->f_path.dentry;
67848 - audit_inode(NULL, dentry, 0);
67849 + path = &f.file->f_path;
67850 + audit_inode(NULL, path->dentry, 0);
67851 error = mnt_want_write_file(f.file);
67852 if (!error) {
67853 - error = removexattr(dentry, name);
67854 + error = removexattr(path, name);
67855 mnt_drop_write_file(f.file);
67856 }
67857 fdput(f);
67858 diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
67859 index 79c9819..22226b4 100644
67860 --- a/fs/xfs/libxfs/xfs_bmap.c
67861 +++ b/fs/xfs/libxfs/xfs_bmap.c
67862 @@ -583,7 +583,7 @@ xfs_bmap_validate_ret(
67863
67864 #else
67865 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
67866 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
67867 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
67868 #endif /* DEBUG */
67869
67870 /*
67871 diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
67872 index f1b69ed..3d0222f 100644
67873 --- a/fs/xfs/xfs_dir2_readdir.c
67874 +++ b/fs/xfs/xfs_dir2_readdir.c
67875 @@ -159,7 +159,12 @@ xfs_dir2_sf_getdents(
67876 ino = dp->d_ops->sf_get_ino(sfp, sfep);
67877 filetype = dp->d_ops->sf_get_ftype(sfep);
67878 ctx->pos = off & 0x7fffffff;
67879 - if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67880 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
67881 + char name[sfep->namelen];
67882 + memcpy(name, sfep->name, sfep->namelen);
67883 + if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
67884 + return 0;
67885 + } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67886 xfs_dir3_get_dtype(dp->i_mount, filetype)))
67887 return 0;
67888 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
67889 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
67890 index 24c926b6..8726af88 100644
67891 --- a/fs/xfs/xfs_ioctl.c
67892 +++ b/fs/xfs/xfs_ioctl.c
67893 @@ -122,7 +122,7 @@ xfs_find_handle(
67894 }
67895
67896 error = -EFAULT;
67897 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
67898 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
67899 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
67900 goto out_put;
67901
67902 diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
67903 index 6a51619..9592e1b 100644
67904 --- a/fs/xfs/xfs_linux.h
67905 +++ b/fs/xfs/xfs_linux.h
67906 @@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
67907 * of the compiler which do not like us using do_div in the middle
67908 * of large functions.
67909 */
67910 -static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67911 +static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67912 {
67913 __u32 mod;
67914
67915 @@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
67916 return 0;
67917 }
67918 #else
67919 -static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67920 +static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67921 {
67922 __u32 mod;
67923
67924 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
67925 new file mode 100644
67926 index 0000000..f27264e
67927 --- /dev/null
67928 +++ b/grsecurity/Kconfig
67929 @@ -0,0 +1,1166 @@
67930 +#
67931 +# grecurity configuration
67932 +#
67933 +menu "Memory Protections"
67934 +depends on GRKERNSEC
67935 +
67936 +config GRKERNSEC_KMEM
67937 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
67938 + default y if GRKERNSEC_CONFIG_AUTO
67939 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
67940 + help
67941 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
67942 + be written to or read from to modify or leak the contents of the running
67943 + kernel. /dev/port will also not be allowed to be opened, writing to
67944 + /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
67945 + If you have module support disabled, enabling this will close up several
67946 + ways that are currently used to insert malicious code into the running
67947 + kernel.
67948 +
67949 + Even with this feature enabled, we still highly recommend that
67950 + you use the RBAC system, as it is still possible for an attacker to
67951 + modify the running kernel through other more obscure methods.
67952 +
67953 + It is highly recommended that you say Y here if you meet all the
67954 + conditions above.
67955 +
67956 +config GRKERNSEC_VM86
67957 + bool "Restrict VM86 mode"
67958 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67959 + depends on X86_32
67960 +
67961 + help
67962 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
67963 + make use of a special execution mode on 32bit x86 processors called
67964 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
67965 + video cards and will still work with this option enabled. The purpose
67966 + of the option is to prevent exploitation of emulation errors in
67967 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
67968 + Nearly all users should be able to enable this option.
67969 +
67970 +config GRKERNSEC_IO
67971 + bool "Disable privileged I/O"
67972 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67973 + depends on X86
67974 + select RTC_CLASS
67975 + select RTC_INTF_DEV
67976 + select RTC_DRV_CMOS
67977 +
67978 + help
67979 + If you say Y here, all ioperm and iopl calls will return an error.
67980 + Ioperm and iopl can be used to modify the running kernel.
67981 + Unfortunately, some programs need this access to operate properly,
67982 + the most notable of which are XFree86 and hwclock. hwclock can be
67983 + remedied by having RTC support in the kernel, so real-time
67984 + clock support is enabled if this option is enabled, to ensure
67985 + that hwclock operates correctly. If hwclock still does not work,
67986 + either update udev or symlink /dev/rtc to /dev/rtc0.
67987 +
67988 + If you're using XFree86 or a version of Xorg from 2012 or earlier,
67989 + you may not be able to boot into a graphical environment with this
67990 + option enabled. In this case, you should use the RBAC system instead.
67991 +
67992 +config GRKERNSEC_BPF_HARDEN
67993 + bool "Harden BPF interpreter"
67994 + default y if GRKERNSEC_CONFIG_AUTO
67995 + help
67996 + Unlike previous versions of grsecurity that hardened both the BPF
67997 + interpreted code against corruption at rest as well as the JIT code
67998 + against JIT-spray attacks and attacker-controlled immediate values
67999 + for ROP, this feature will enforce disabling of the new eBPF JIT engine
68000 + and will ensure the interpreted code is read-only at rest. This feature
68001 + may be removed at a later time when eBPF stabilizes to entirely revert
68002 + back to the more secure pre-3.16 BPF interpreter/JIT.
68003 +
68004 + If you're using KERNEXEC, it's recommended that you enable this option
68005 + to supplement the hardening of the kernel.
68006 +
68007 +config GRKERNSEC_PERF_HARDEN
68008 + bool "Disable unprivileged PERF_EVENTS usage by default"
68009 + default y if GRKERNSEC_CONFIG_AUTO
68010 + depends on PERF_EVENTS
68011 + help
68012 + If you say Y here, the range of acceptable values for the
68013 + /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
68014 + default to a new value: 3. When the sysctl is set to this value, no
68015 + unprivileged use of the PERF_EVENTS syscall interface will be permitted.
68016 +
68017 + Though PERF_EVENTS can be used legitimately for performance monitoring
68018 + and low-level application profiling, it is forced on regardless of
68019 + configuration, has been at fault for several vulnerabilities, and
68020 + creates new opportunities for side channels and other information leaks.
68021 +
68022 + This feature puts PERF_EVENTS into a secure default state and permits
68023 + the administrator to change out of it temporarily if unprivileged
68024 + application profiling is needed.
68025 +
68026 +config GRKERNSEC_RAND_THREADSTACK
68027 + bool "Insert random gaps between thread stacks"
68028 + default y if GRKERNSEC_CONFIG_AUTO
68029 + depends on PAX_RANDMMAP && !PPC
68030 + help
68031 + If you say Y here, a random-sized gap will be enforced between allocated
68032 + thread stacks. Glibc's NPTL and other threading libraries that
68033 + pass MAP_STACK to the kernel for thread stack allocation are supported.
68034 + The implementation currently provides 8 bits of entropy for the gap.
68035 +
68036 + Many distributions do not compile threaded remote services with the
68037 + -fstack-check argument to GCC, causing the variable-sized stack-based
68038 + allocator, alloca(), to not probe the stack on allocation. This
68039 + permits an unbounded alloca() to skip over any guard page and potentially
68040 + modify another thread's stack reliably. An enforced random gap
68041 + reduces the reliability of such an attack and increases the chance
68042 + that such a read/write to another thread's stack instead lands in
68043 + an unmapped area, causing a crash and triggering grsecurity's
68044 + anti-bruteforcing logic.
68045 +
68046 +config GRKERNSEC_PROC_MEMMAP
68047 + bool "Harden ASLR against information leaks and entropy reduction"
68048 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
68049 + depends on PAX_NOEXEC || PAX_ASLR
68050 + help
68051 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
68052 + give no information about the addresses of its mappings if
68053 + PaX features that rely on random addresses are enabled on the task.
68054 + In addition to sanitizing this information and disabling other
68055 + dangerous sources of information, this option causes reads of sensitive
68056 + /proc/<pid> entries where the file descriptor was opened in a different
68057 + task than the one performing the read. Such attempts are logged.
68058 + This option also limits argv/env strings for suid/sgid binaries
68059 + to 512KB to prevent a complete exhaustion of the stack entropy provided
68060 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
68061 + binaries to prevent alternative mmap layouts from being abused.
68062 +
68063 + If you use PaX it is essential that you say Y here as it closes up
68064 + several holes that make full ASLR useless locally.
68065 +
68066 +
68067 +config GRKERNSEC_KSTACKOVERFLOW
68068 + bool "Prevent kernel stack overflows"
68069 + default y if GRKERNSEC_CONFIG_AUTO
68070 + depends on !IA64 && 64BIT
68071 + help
68072 + If you say Y here, the kernel's process stacks will be allocated
68073 + with vmalloc instead of the kernel's default allocator. This
68074 + introduces guard pages that in combination with the alloca checking
68075 + of the STACKLEAK feature prevents all forms of kernel process stack
68076 + overflow abuse. Note that this is different from kernel stack
68077 + buffer overflows.
68078 +
68079 +config GRKERNSEC_BRUTE
68080 + bool "Deter exploit bruteforcing"
68081 + default y if GRKERNSEC_CONFIG_AUTO
68082 + help
68083 + If you say Y here, attempts to bruteforce exploits against forking
68084 + daemons such as apache or sshd, as well as against suid/sgid binaries
68085 + will be deterred. When a child of a forking daemon is killed by PaX
68086 + or crashes due to an illegal instruction or other suspicious signal,
68087 + the parent process will be delayed 30 seconds upon every subsequent
68088 + fork until the administrator is able to assess the situation and
68089 + restart the daemon.
68090 + In the suid/sgid case, the attempt is logged, the user has all their
68091 + existing instances of the suid/sgid binary terminated and will
68092 + be unable to execute any suid/sgid binaries for 15 minutes.
68093 +
68094 + It is recommended that you also enable signal logging in the auditing
68095 + section so that logs are generated when a process triggers a suspicious
68096 + signal.
68097 + If the sysctl option is enabled, a sysctl option with name
68098 + "deter_bruteforce" is created.
68099 +
68100 +config GRKERNSEC_MODHARDEN
68101 + bool "Harden module auto-loading"
68102 + default y if GRKERNSEC_CONFIG_AUTO
68103 + depends on MODULES
68104 + help
68105 + If you say Y here, module auto-loading in response to use of some
68106 + feature implemented by an unloaded module will be restricted to
68107 + root users. Enabling this option helps defend against attacks
68108 + by unprivileged users who abuse the auto-loading behavior to
68109 + cause a vulnerable module to load that is then exploited.
68110 +
68111 + If this option prevents a legitimate use of auto-loading for a
68112 + non-root user, the administrator can execute modprobe manually
68113 + with the exact name of the module mentioned in the alert log.
68114 + Alternatively, the administrator can add the module to the list
68115 + of modules loaded at boot by modifying init scripts.
68116 +
68117 + Modification of init scripts will most likely be needed on
68118 + Ubuntu servers with encrypted home directory support enabled,
68119 + as the first non-root user logging in will cause the ecb(aes),
68120 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68121 +
68122 +config GRKERNSEC_HIDESYM
68123 + bool "Hide kernel symbols"
68124 + default y if GRKERNSEC_CONFIG_AUTO
68125 + select PAX_USERCOPY_SLABS
68126 + help
68127 + If you say Y here, getting information on loaded modules, and
68128 + displaying all kernel symbols through a syscall will be restricted
68129 + to users with CAP_SYS_MODULE. For software compatibility reasons,
68130 + /proc/kallsyms will be restricted to the root user. The RBAC
68131 + system can hide that entry even from root.
68132 +
68133 + This option also prevents leaking of kernel addresses through
68134 + several /proc entries.
68135 +
68136 + Note that this option is only effective provided the following
68137 + conditions are met:
68138 + 1) The kernel using grsecurity is not precompiled by some distribution
68139 + 2) You have also enabled GRKERNSEC_DMESG
68140 + 3) You are using the RBAC system and hiding other files such as your
68141 + kernel image and System.map. Alternatively, enabling this option
68142 + causes the permissions on /boot, /lib/modules, and the kernel
68143 + source directory to change at compile time to prevent
68144 + reading by non-root users.
68145 + If the above conditions are met, this option will aid in providing a
68146 + useful protection against local kernel exploitation of overflows
68147 + and arbitrary read/write vulnerabilities.
68148 +
68149 + It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68150 + in addition to this feature.
68151 +
68152 +config GRKERNSEC_RANDSTRUCT
68153 + bool "Randomize layout of sensitive kernel structures"
68154 + default y if GRKERNSEC_CONFIG_AUTO
68155 + select GRKERNSEC_HIDESYM
68156 + select MODVERSIONS if MODULES
68157 + help
68158 + If you say Y here, the layouts of a number of sensitive kernel
68159 + structures (task, fs, cred, etc) and all structures composed entirely
68160 + of function pointers (aka "ops" structs) will be randomized at compile-time.
68161 + This can introduce the requirement of an additional infoleak
68162 + vulnerability for exploits targeting these structure types.
68163 +
68164 + Enabling this feature will introduce some performance impact, slightly
68165 + increase memory usage, and prevent the use of forensic tools like
68166 + Volatility against the system (unless the kernel source tree isn't
68167 + cleaned after kernel installation).
68168 +
68169 + The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68170 + It remains after a make clean to allow for external modules to be compiled
68171 + with the existing seed and will be removed by a make mrproper or
68172 + make distclean.
68173 +
68174 + Note that the implementation requires gcc 4.6.4. or newer. You may need
68175 + to install the supporting headers explicitly in addition to the normal
68176 + gcc package.
68177 +
68178 +config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68179 + bool "Use cacheline-aware structure randomization"
68180 + depends on GRKERNSEC_RANDSTRUCT
68181 + default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68182 + help
68183 + If you say Y here, the RANDSTRUCT randomization will make a best effort
68184 + at restricting randomization to cacheline-sized groups of elements. It
68185 + will further not randomize bitfields in structures. This reduces the
68186 + performance hit of RANDSTRUCT at the cost of weakened randomization.
68187 +
68188 +config GRKERNSEC_KERN_LOCKOUT
68189 + bool "Active kernel exploit response"
68190 + default y if GRKERNSEC_CONFIG_AUTO
68191 + depends on X86 || ARM || PPC || SPARC
68192 + help
68193 + If you say Y here, when a PaX alert is triggered due to suspicious
68194 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68195 + or an OOPS occurs due to bad memory accesses, instead of just
68196 + terminating the offending process (and potentially allowing
68197 + a subsequent exploit from the same user), we will take one of two
68198 + actions:
68199 + If the user was root, we will panic the system
68200 + If the user was non-root, we will log the attempt, terminate
68201 + all processes owned by the user, then prevent them from creating
68202 + any new processes until the system is restarted
68203 + This deters repeated kernel exploitation/bruteforcing attempts
68204 + and is useful for later forensics.
68205 +
68206 +config GRKERNSEC_OLD_ARM_USERLAND
68207 + bool "Old ARM userland compatibility"
68208 + depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68209 + help
68210 + If you say Y here, stubs of executable code to perform such operations
68211 + as "compare-exchange" will be placed at fixed locations in the ARM vector
68212 + table. This is unfortunately needed for old ARM userland meant to run
68213 + across a wide range of processors. Without this option enabled,
68214 + the get_tls and data memory barrier stubs will be emulated by the kernel,
68215 + which is enough for Linaro userlands or other userlands designed for v6
68216 + and newer ARM CPUs. It's recommended that you try without this option enabled
68217 + first, and only enable it if your userland does not boot (it will likely fail
68218 + at init time).
68219 +
68220 +endmenu
68221 +menu "Role Based Access Control Options"
68222 +depends on GRKERNSEC
68223 +
68224 +config GRKERNSEC_RBAC_DEBUG
68225 + bool
68226 +
68227 +config GRKERNSEC_NO_RBAC
68228 + bool "Disable RBAC system"
68229 + help
68230 + If you say Y here, the /dev/grsec device will be removed from the kernel,
68231 + preventing the RBAC system from being enabled. You should only say Y
68232 + here if you have no intention of using the RBAC system, so as to prevent
68233 + an attacker with root access from misusing the RBAC system to hide files
68234 + and processes when loadable module support and /dev/[k]mem have been
68235 + locked down.
68236 +
68237 +config GRKERNSEC_ACL_HIDEKERN
68238 + bool "Hide kernel processes"
68239 + help
68240 + If you say Y here, all kernel threads will be hidden to all
68241 + processes but those whose subject has the "view hidden processes"
68242 + flag.
68243 +
68244 +config GRKERNSEC_ACL_MAXTRIES
68245 + int "Maximum tries before password lockout"
68246 + default 3
68247 + help
68248 + This option enforces the maximum number of times a user can attempt
68249 + to authorize themselves with the grsecurity RBAC system before being
68250 + denied the ability to attempt authorization again for a specified time.
68251 + The lower the number, the harder it will be to brute-force a password.
68252 +
68253 +config GRKERNSEC_ACL_TIMEOUT
68254 + int "Time to wait after max password tries, in seconds"
68255 + default 30
68256 + help
68257 + This option specifies the time the user must wait after attempting to
68258 + authorize to the RBAC system with the maximum number of invalid
68259 + passwords. The higher the number, the harder it will be to brute-force
68260 + a password.
68261 +
68262 +endmenu
68263 +menu "Filesystem Protections"
68264 +depends on GRKERNSEC
68265 +
68266 +config GRKERNSEC_PROC
68267 + bool "Proc restrictions"
68268 + default y if GRKERNSEC_CONFIG_AUTO
68269 + help
68270 + If you say Y here, the permissions of the /proc filesystem
68271 + will be altered to enhance system security and privacy. You MUST
68272 + choose either a user only restriction or a user and group restriction.
68273 + Depending upon the option you choose, you can either restrict users to
68274 + see only the processes they themselves run, or choose a group that can
68275 + view all processes and files normally restricted to root if you choose
68276 + the "restrict to user only" option. NOTE: If you're running identd or
68277 + ntpd as a non-root user, you will have to run it as the group you
68278 + specify here.
68279 +
68280 +config GRKERNSEC_PROC_USER
68281 + bool "Restrict /proc to user only"
68282 + depends on GRKERNSEC_PROC
68283 + help
68284 + If you say Y here, non-root users will only be able to view their own
68285 + processes, and restricts them from viewing network-related information,
68286 + and viewing kernel symbol and module information.
68287 +
68288 +config GRKERNSEC_PROC_USERGROUP
68289 + bool "Allow special group"
68290 + default y if GRKERNSEC_CONFIG_AUTO
68291 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68292 + help
68293 + If you say Y here, you will be able to select a group that will be
68294 + able to view all processes and network-related information. If you've
68295 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68296 + remain hidden. This option is useful if you want to run identd as
68297 + a non-root user. The group you select may also be chosen at boot time
68298 + via "grsec_proc_gid=" on the kernel commandline.
68299 +
68300 +config GRKERNSEC_PROC_GID
68301 + int "GID for special group"
68302 + depends on GRKERNSEC_PROC_USERGROUP
68303 + default 1001
68304 +
68305 +config GRKERNSEC_PROC_ADD
68306 + bool "Additional restrictions"
68307 + default y if GRKERNSEC_CONFIG_AUTO
68308 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68309 + help
68310 + If you say Y here, additional restrictions will be placed on
68311 + /proc that keep normal users from viewing device information and
68312 + slabinfo information that could be useful for exploits.
68313 +
68314 +config GRKERNSEC_LINK
68315 + bool "Linking restrictions"
68316 + default y if GRKERNSEC_CONFIG_AUTO
68317 + help
68318 + If you say Y here, /tmp race exploits will be prevented, since users
68319 + will no longer be able to follow symlinks owned by other users in
68320 + world-writable +t directories (e.g. /tmp), unless the owner of the
68321 + symlink is the owner of the directory. users will also not be
68322 + able to hardlink to files they do not own. If the sysctl option is
68323 + enabled, a sysctl option with name "linking_restrictions" is created.
68324 +
68325 +config GRKERNSEC_SYMLINKOWN
68326 + bool "Kernel-enforced SymlinksIfOwnerMatch"
68327 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68328 + help
68329 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
68330 + that prevents it from being used as a security feature. As Apache
68331 + verifies the symlink by performing a stat() against the target of
68332 + the symlink before it is followed, an attacker can setup a symlink
68333 + to point to a same-owned file, then replace the symlink with one
68334 + that targets another user's file just after Apache "validates" the
68335 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
68336 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68337 + will be in place for the group you specify. If the sysctl option
68338 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
68339 + created.
68340 +
68341 +config GRKERNSEC_SYMLINKOWN_GID
68342 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68343 + depends on GRKERNSEC_SYMLINKOWN
68344 + default 1006
68345 + help
68346 + Setting this GID determines what group kernel-enforced
68347 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68348 + is enabled, a sysctl option with name "symlinkown_gid" is created.
68349 +
68350 +config GRKERNSEC_FIFO
68351 + bool "FIFO restrictions"
68352 + default y if GRKERNSEC_CONFIG_AUTO
68353 + help
68354 + If you say Y here, users will not be able to write to FIFOs they don't
68355 + own in world-writable +t directories (e.g. /tmp), unless the owner of
68356 + the FIFO is the same owner of the directory it's held in. If the sysctl
68357 + option is enabled, a sysctl option with name "fifo_restrictions" is
68358 + created.
68359 +
68360 +config GRKERNSEC_SYSFS_RESTRICT
68361 + bool "Sysfs/debugfs restriction"
68362 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68363 + depends on SYSFS
68364 + help
68365 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
68366 + any filesystem normally mounted under it (e.g. debugfs) will be
68367 + mostly accessible only by root. These filesystems generally provide access
68368 + to hardware and debug information that isn't appropriate for unprivileged
68369 + users of the system. Sysfs and debugfs have also become a large source
68370 + of new vulnerabilities, ranging from infoleaks to local compromise.
68371 + There has been very little oversight with an eye toward security involved
68372 + in adding new exporters of information to these filesystems, so their
68373 + use is discouraged.
68374 + For reasons of compatibility, a few directories have been whitelisted
68375 + for access by non-root users:
68376 + /sys/fs/selinux
68377 + /sys/fs/fuse
68378 + /sys/devices/system/cpu
68379 +
68380 +config GRKERNSEC_ROFS
68381 + bool "Runtime read-only mount protection"
68382 + depends on SYSCTL
68383 + help
68384 + If you say Y here, a sysctl option with name "romount_protect" will
68385 + be created. By setting this option to 1 at runtime, filesystems
68386 + will be protected in the following ways:
68387 + * No new writable mounts will be allowed
68388 + * Existing read-only mounts won't be able to be remounted read/write
68389 + * Write operations will be denied on all block devices
68390 + This option acts independently of grsec_lock: once it is set to 1,
68391 + it cannot be turned off. Therefore, please be mindful of the resulting
68392 + behavior if this option is enabled in an init script on a read-only
68393 + filesystem.
68394 + Also be aware that as with other root-focused features, GRKERNSEC_KMEM
68395 + and GRKERNSEC_IO should be enabled and module loading disabled via
68396 + config or at runtime.
68397 + This feature is mainly intended for secure embedded systems.
68398 +
68399 +
68400 +config GRKERNSEC_DEVICE_SIDECHANNEL
68401 + bool "Eliminate stat/notify-based device sidechannels"
68402 + default y if GRKERNSEC_CONFIG_AUTO
68403 + help
68404 + If you say Y here, timing analyses on block or character
68405 + devices like /dev/ptmx using stat or inotify/dnotify/fanotify
68406 + will be thwarted for unprivileged users. If a process without
68407 + CAP_MKNOD stats such a device, the last access and last modify times
68408 + will match the device's create time. No access or modify events
68409 + will be triggered through inotify/dnotify/fanotify for such devices.
68410 + This feature will prevent attacks that may at a minimum
68411 + allow an attacker to determine the administrator's password length.
68412 +
68413 +config GRKERNSEC_CHROOT
68414 + bool "Chroot jail restrictions"
68415 + default y if GRKERNSEC_CONFIG_AUTO
68416 + help
68417 + If you say Y here, you will be able to choose several options that will
68418 + make breaking out of a chrooted jail much more difficult. If you
68419 + encounter no software incompatibilities with the following options, it
68420 + is recommended that you enable each one.
68421 +
68422 + Note that the chroot restrictions are not intended to apply to "chroots"
68423 + to directories that are simple bind mounts of the global root filesystem.
68424 + For several other reasons, a user shouldn't expect any significant
68425 + security by performing such a chroot.
68426 +
68427 +config GRKERNSEC_CHROOT_MOUNT
68428 + bool "Deny mounts"
68429 + default y if GRKERNSEC_CONFIG_AUTO
68430 + depends on GRKERNSEC_CHROOT
68431 + help
68432 + If you say Y here, processes inside a chroot will not be able to
68433 + mount or remount filesystems. If the sysctl option is enabled, a
68434 + sysctl option with name "chroot_deny_mount" is created.
68435 +
68436 +config GRKERNSEC_CHROOT_DOUBLE
68437 + bool "Deny double-chroots"
68438 + default y if GRKERNSEC_CONFIG_AUTO
68439 + depends on GRKERNSEC_CHROOT
68440 + help
68441 + If you say Y here, processes inside a chroot will not be able to chroot
68442 + again outside the chroot. This is a widely used method of breaking
68443 + out of a chroot jail and should not be allowed. If the sysctl
68444 + option is enabled, a sysctl option with name
68445 + "chroot_deny_chroot" is created.
68446 +
68447 +config GRKERNSEC_CHROOT_PIVOT
68448 + bool "Deny pivot_root in chroot"
68449 + default y if GRKERNSEC_CONFIG_AUTO
68450 + depends on GRKERNSEC_CHROOT
68451 + help
68452 + If you say Y here, processes inside a chroot will not be able to use
68453 + a function called pivot_root() that was introduced in Linux 2.3.41. It
68454 + works similar to chroot in that it changes the root filesystem. This
68455 + function could be misused in a chrooted process to attempt to break out
68456 + of the chroot, and therefore should not be allowed. If the sysctl
68457 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
68458 + created.
68459 +
68460 +config GRKERNSEC_CHROOT_CHDIR
68461 + bool "Enforce chdir(\"/\") on all chroots"
68462 + default y if GRKERNSEC_CONFIG_AUTO
68463 + depends on GRKERNSEC_CHROOT
68464 + help
68465 + If you say Y here, the current working directory of all newly-chrooted
68466 + applications will be set to the the root directory of the chroot.
68467 + The man page on chroot(2) states:
68468 + Note that this call does not change the current working
68469 + directory, so that `.' can be outside the tree rooted at
68470 + `/'. In particular, the super-user can escape from a
68471 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
68472 +
68473 + It is recommended that you say Y here, since it's not known to break
68474 + any software. If the sysctl option is enabled, a sysctl option with
68475 + name "chroot_enforce_chdir" is created.
68476 +
68477 +config GRKERNSEC_CHROOT_CHMOD
68478 + bool "Deny (f)chmod +s"
68479 + default y if GRKERNSEC_CONFIG_AUTO
68480 + depends on GRKERNSEC_CHROOT
68481 + help
68482 + If you say Y here, processes inside a chroot will not be able to chmod
68483 + or fchmod files to make them have suid or sgid bits. This protects
68484 + against another published method of breaking a chroot. If the sysctl
68485 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
68486 + created.
68487 +
68488 +config GRKERNSEC_CHROOT_FCHDIR
68489 + bool "Deny fchdir and fhandle out of chroot"
68490 + default y if GRKERNSEC_CONFIG_AUTO
68491 + depends on GRKERNSEC_CHROOT
68492 + help
68493 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
68494 + to a file descriptor of the chrooting process that points to a directory
68495 + outside the filesystem will be stopped. Additionally, this option prevents
68496 + use of the recently-created syscall for opening files by a guessable "file
68497 + handle" inside a chroot. If the sysctl option is enabled, a sysctl option
68498 + with name "chroot_deny_fchdir" is created.
68499 +
68500 +config GRKERNSEC_CHROOT_MKNOD
68501 + bool "Deny mknod"
68502 + default y if GRKERNSEC_CONFIG_AUTO
68503 + depends on GRKERNSEC_CHROOT
68504 + help
68505 + If you say Y here, processes inside a chroot will not be allowed to
68506 + mknod. The problem with using mknod inside a chroot is that it
68507 + would allow an attacker to create a device entry that is the same
68508 + as one on the physical root of your system, which could range from
68509 + anything from the console device to a device for your harddrive (which
68510 + they could then use to wipe the drive or steal data). It is recommended
68511 + that you say Y here, unless you run into software incompatibilities.
68512 + If the sysctl option is enabled, a sysctl option with name
68513 + "chroot_deny_mknod" is created.
68514 +
68515 +config GRKERNSEC_CHROOT_SHMAT
68516 + bool "Deny shmat() out of chroot"
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 attach
68521 + to shared memory segments that were created outside of the chroot jail.
68522 + It is recommended that you say Y here. If the sysctl option is enabled,
68523 + a sysctl option with name "chroot_deny_shmat" is created.
68524 +
68525 +config GRKERNSEC_CHROOT_UNIX
68526 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
68527 + default y if GRKERNSEC_CONFIG_AUTO
68528 + depends on GRKERNSEC_CHROOT
68529 + help
68530 + If you say Y here, processes inside a chroot will not be able to
68531 + connect to abstract (meaning not belonging to a filesystem) Unix
68532 + domain sockets that were bound outside of a chroot. It is recommended
68533 + that you say Y here. If the sysctl option is enabled, a sysctl option
68534 + with name "chroot_deny_unix" is created.
68535 +
68536 +config GRKERNSEC_CHROOT_FINDTASK
68537 + bool "Protect outside processes"
68538 + default y if GRKERNSEC_CONFIG_AUTO
68539 + depends on GRKERNSEC_CHROOT
68540 + help
68541 + If you say Y here, processes inside a chroot will not be able to
68542 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
68543 + getsid, or view any process outside of the chroot. If the sysctl
68544 + option is enabled, a sysctl option with name "chroot_findtask" is
68545 + created.
68546 +
68547 +config GRKERNSEC_CHROOT_NICE
68548 + bool "Restrict priority changes"
68549 + default y if GRKERNSEC_CONFIG_AUTO
68550 + depends on GRKERNSEC_CHROOT
68551 + help
68552 + If you say Y here, processes inside a chroot will not be able to raise
68553 + the priority of processes in the chroot, or alter the priority of
68554 + processes outside the chroot. This provides more security than simply
68555 + removing CAP_SYS_NICE from the process' capability set. If the
68556 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
68557 + is created.
68558 +
68559 +config GRKERNSEC_CHROOT_SYSCTL
68560 + bool "Deny sysctl writes"
68561 + default y if GRKERNSEC_CONFIG_AUTO
68562 + depends on GRKERNSEC_CHROOT
68563 + help
68564 + If you say Y here, an attacker in a chroot will not be able to
68565 + write to sysctl entries, either by sysctl(2) or through a /proc
68566 + interface. It is strongly recommended that you say Y here. If the
68567 + sysctl option is enabled, a sysctl option with name
68568 + "chroot_deny_sysctl" is created.
68569 +
68570 +config GRKERNSEC_CHROOT_CAPS
68571 + bool "Capability restrictions"
68572 + default y if GRKERNSEC_CONFIG_AUTO
68573 + depends on GRKERNSEC_CHROOT
68574 + help
68575 + If you say Y here, the capabilities on all processes within a
68576 + chroot jail will be lowered to stop module insertion, raw i/o,
68577 + system and net admin tasks, rebooting the system, modifying immutable
68578 + files, modifying IPC owned by another, and changing the system time.
68579 + This is left an option because it can break some apps. Disable this
68580 + if your chrooted apps are having problems performing those kinds of
68581 + tasks. If the sysctl option is enabled, a sysctl option with
68582 + name "chroot_caps" is created.
68583 +
68584 +config GRKERNSEC_CHROOT_INITRD
68585 + bool "Exempt initrd tasks from restrictions"
68586 + default y if GRKERNSEC_CONFIG_AUTO
68587 + depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
68588 + help
68589 + If you say Y here, tasks started prior to init will be exempted from
68590 + grsecurity's chroot restrictions. This option is mainly meant to
68591 + resolve Plymouth's performing privileged operations unnecessarily
68592 + in a chroot.
68593 +
68594 +endmenu
68595 +menu "Kernel Auditing"
68596 +depends on GRKERNSEC
68597 +
68598 +config GRKERNSEC_AUDIT_GROUP
68599 + bool "Single group for auditing"
68600 + help
68601 + If you say Y here, the exec and chdir logging features will only operate
68602 + on a group you specify. This option is recommended if you only want to
68603 + watch certain users instead of having a large amount of logs from the
68604 + entire system. If the sysctl option is enabled, a sysctl option with
68605 + name "audit_group" is created.
68606 +
68607 +config GRKERNSEC_AUDIT_GID
68608 + int "GID for auditing"
68609 + depends on GRKERNSEC_AUDIT_GROUP
68610 + default 1007
68611 +
68612 +config GRKERNSEC_EXECLOG
68613 + bool "Exec logging"
68614 + help
68615 + If you say Y here, all execve() calls will be logged (since the
68616 + other exec*() calls are frontends to execve(), all execution
68617 + will be logged). Useful for shell-servers that like to keep track
68618 + of their users. If the sysctl option is enabled, a sysctl option with
68619 + name "exec_logging" is created.
68620 + WARNING: This option when enabled will produce a LOT of logs, especially
68621 + on an active system.
68622 +
68623 +config GRKERNSEC_RESLOG
68624 + bool "Resource logging"
68625 + default y if GRKERNSEC_CONFIG_AUTO
68626 + help
68627 + If you say Y here, all attempts to overstep resource limits will
68628 + be logged with the resource name, the requested size, and the current
68629 + limit. It is highly recommended that you say Y here. If the sysctl
68630 + option is enabled, a sysctl option with name "resource_logging" is
68631 + created. If the RBAC system is enabled, the sysctl value is ignored.
68632 +
68633 +config GRKERNSEC_CHROOT_EXECLOG
68634 + bool "Log execs within chroot"
68635 + help
68636 + If you say Y here, all executions inside a chroot jail will be logged
68637 + to syslog. This can cause a large amount of logs if certain
68638 + applications (eg. djb's daemontools) are installed on the system, and
68639 + is therefore left as an option. If the sysctl option is enabled, a
68640 + sysctl option with name "chroot_execlog" is created.
68641 +
68642 +config GRKERNSEC_AUDIT_PTRACE
68643 + bool "Ptrace logging"
68644 + help
68645 + If you say Y here, all attempts to attach to a process via ptrace
68646 + will be logged. If the sysctl option is enabled, a sysctl option
68647 + with name "audit_ptrace" is created.
68648 +
68649 +config GRKERNSEC_AUDIT_CHDIR
68650 + bool "Chdir logging"
68651 + help
68652 + If you say Y here, all chdir() calls will be logged. If the sysctl
68653 + option is enabled, a sysctl option with name "audit_chdir" is created.
68654 +
68655 +config GRKERNSEC_AUDIT_MOUNT
68656 + bool "(Un)Mount logging"
68657 + help
68658 + If you say Y here, all mounts and unmounts will be logged. If the
68659 + sysctl option is enabled, a sysctl option with name "audit_mount" is
68660 + created.
68661 +
68662 +config GRKERNSEC_SIGNAL
68663 + bool "Signal logging"
68664 + default y if GRKERNSEC_CONFIG_AUTO
68665 + help
68666 + If you say Y here, certain important signals will be logged, such as
68667 + SIGSEGV, which will as a result inform you of when a error in a program
68668 + occurred, which in some cases could mean a possible exploit attempt.
68669 + If the sysctl option is enabled, a sysctl option with name
68670 + "signal_logging" is created.
68671 +
68672 +config GRKERNSEC_FORKFAIL
68673 + bool "Fork failure logging"
68674 + help
68675 + If you say Y here, all failed fork() attempts will be logged.
68676 + This could suggest a fork bomb, or someone attempting to overstep
68677 + their process limit. If the sysctl option is enabled, a sysctl option
68678 + with name "forkfail_logging" is created.
68679 +
68680 +config GRKERNSEC_TIME
68681 + bool "Time change logging"
68682 + default y if GRKERNSEC_CONFIG_AUTO
68683 + help
68684 + If you say Y here, any changes of the system clock will be logged.
68685 + If the sysctl option is enabled, a sysctl option with name
68686 + "timechange_logging" is created.
68687 +
68688 +config GRKERNSEC_PROC_IPADDR
68689 + bool "/proc/<pid>/ipaddr support"
68690 + default y if GRKERNSEC_CONFIG_AUTO
68691 + help
68692 + If you say Y here, a new entry will be added to each /proc/<pid>
68693 + directory that contains the IP address of the person using the task.
68694 + The IP is carried across local TCP and AF_UNIX stream sockets.
68695 + This information can be useful for IDS/IPSes to perform remote response
68696 + to a local attack. The entry is readable by only the owner of the
68697 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
68698 + the RBAC system), and thus does not create privacy concerns.
68699 +
68700 +config GRKERNSEC_RWXMAP_LOG
68701 + bool 'Denied RWX mmap/mprotect logging'
68702 + default y if GRKERNSEC_CONFIG_AUTO
68703 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
68704 + help
68705 + If you say Y here, calls to mmap() and mprotect() with explicit
68706 + usage of PROT_WRITE and PROT_EXEC together will be logged when
68707 + denied by the PAX_MPROTECT feature. This feature will also
68708 + log other problematic scenarios that can occur when PAX_MPROTECT
68709 + is enabled on a binary, like textrels and PT_GNU_STACK. If the
68710 + sysctl option is enabled, a sysctl option with name "rwxmap_logging"
68711 + is created.
68712 +
68713 +endmenu
68714 +
68715 +menu "Executable Protections"
68716 +depends on GRKERNSEC
68717 +
68718 +config GRKERNSEC_DMESG
68719 + bool "Dmesg(8) restriction"
68720 + default y if GRKERNSEC_CONFIG_AUTO
68721 + help
68722 + If you say Y here, non-root users will not be able to use dmesg(8)
68723 + to view the contents of the kernel's circular log buffer.
68724 + The kernel's log buffer often contains kernel addresses and other
68725 + identifying information useful to an attacker in fingerprinting a
68726 + system for a targeted exploit.
68727 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
68728 + created.
68729 +
68730 +config GRKERNSEC_HARDEN_PTRACE
68731 + bool "Deter ptrace-based process snooping"
68732 + default y if GRKERNSEC_CONFIG_AUTO
68733 + help
68734 + If you say Y here, TTY sniffers and other malicious monitoring
68735 + programs implemented through ptrace will be defeated. If you
68736 + have been using the RBAC system, this option has already been
68737 + enabled for several years for all users, with the ability to make
68738 + fine-grained exceptions.
68739 +
68740 + This option only affects the ability of non-root users to ptrace
68741 + processes that are not a descendent of the ptracing process.
68742 + This means that strace ./binary and gdb ./binary will still work,
68743 + but attaching to arbitrary processes will not. If the sysctl
68744 + option is enabled, a sysctl option with name "harden_ptrace" is
68745 + created.
68746 +
68747 +config GRKERNSEC_PTRACE_READEXEC
68748 + bool "Require read access to ptrace sensitive binaries"
68749 + default y if GRKERNSEC_CONFIG_AUTO
68750 + help
68751 + If you say Y here, unprivileged users will not be able to ptrace unreadable
68752 + binaries. This option is useful in environments that
68753 + remove the read bits (e.g. file mode 4711) from suid binaries to
68754 + prevent infoleaking of their contents. This option adds
68755 + consistency to the use of that file mode, as the binary could normally
68756 + be read out when run without privileges while ptracing.
68757 +
68758 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
68759 + is created.
68760 +
68761 +config GRKERNSEC_SETXID
68762 + bool "Enforce consistent multithreaded privileges"
68763 + default y if GRKERNSEC_CONFIG_AUTO
68764 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
68765 + help
68766 + If you say Y here, a change from a root uid to a non-root uid
68767 + in a multithreaded application will cause the resulting uids,
68768 + gids, supplementary groups, and capabilities in that thread
68769 + to be propagated to the other threads of the process. In most
68770 + cases this is unnecessary, as glibc will emulate this behavior
68771 + on behalf of the application. Other libcs do not act in the
68772 + same way, allowing the other threads of the process to continue
68773 + running with root privileges. If the sysctl option is enabled,
68774 + a sysctl option with name "consistent_setxid" is created.
68775 +
68776 +config GRKERNSEC_HARDEN_IPC
68777 + bool "Disallow access to overly-permissive IPC objects"
68778 + default y if GRKERNSEC_CONFIG_AUTO
68779 + depends on SYSVIPC
68780 + help
68781 + If you say Y here, access to overly-permissive IPC objects (shared
68782 + memory, message queues, and semaphores) will be denied for processes
68783 + given the following criteria beyond normal permission checks:
68784 + 1) If the IPC object is world-accessible and the euid doesn't match
68785 + that of the creator or current uid for the IPC object
68786 + 2) If the IPC object is group-accessible and the egid doesn't
68787 + match that of the creator or current gid for the IPC object
68788 + It's a common error to grant too much permission to these objects,
68789 + with impact ranging from denial of service and information leaking to
68790 + privilege escalation. This feature was developed in response to
68791 + research by Tim Brown:
68792 + http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
68793 + who found hundreds of such insecure usages. Processes with
68794 + CAP_IPC_OWNER are still permitted to access these IPC objects.
68795 + If the sysctl option is enabled, a sysctl option with name
68796 + "harden_ipc" is created.
68797 +
68798 +config GRKERNSEC_TPE
68799 + bool "Trusted Path Execution (TPE)"
68800 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68801 + help
68802 + If you say Y here, you will be able to choose a gid to add to the
68803 + supplementary groups of users you want to mark as "untrusted."
68804 + These users will not be able to execute any files that are not in
68805 + root-owned directories writable only by root. If the sysctl option
68806 + is enabled, a sysctl option with name "tpe" is created.
68807 +
68808 +config GRKERNSEC_TPE_ALL
68809 + bool "Partially restrict all non-root users"
68810 + depends on GRKERNSEC_TPE
68811 + help
68812 + If you say Y here, all non-root users will be covered under
68813 + a weaker TPE restriction. This is separate from, and in addition to,
68814 + the main TPE options that you have selected elsewhere. Thus, if a
68815 + "trusted" GID is chosen, this restriction applies to even that GID.
68816 + Under this restriction, all non-root users will only be allowed to
68817 + execute files in directories they own that are not group or
68818 + world-writable, or in directories owned by root and writable only by
68819 + root. If the sysctl option is enabled, a sysctl option with name
68820 + "tpe_restrict_all" is created.
68821 +
68822 +config GRKERNSEC_TPE_INVERT
68823 + bool "Invert GID option"
68824 + depends on GRKERNSEC_TPE
68825 + help
68826 + If you say Y here, the group you specify in the TPE configuration will
68827 + decide what group TPE restrictions will be *disabled* for. This
68828 + option is useful if you want TPE restrictions to be applied to most
68829 + users on the system. If the sysctl option is enabled, a sysctl option
68830 + with name "tpe_invert" is created. Unlike other sysctl options, this
68831 + entry will default to on for backward-compatibility.
68832 +
68833 +config GRKERNSEC_TPE_GID
68834 + int
68835 + default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
68836 + default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
68837 +
68838 +config GRKERNSEC_TPE_UNTRUSTED_GID
68839 + int "GID for TPE-untrusted users"
68840 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
68841 + default 1005
68842 + help
68843 + Setting this GID determines what group TPE restrictions will be
68844 + *enabled* for. If the sysctl option is enabled, a sysctl option
68845 + with name "tpe_gid" is created.
68846 +
68847 +config GRKERNSEC_TPE_TRUSTED_GID
68848 + int "GID for TPE-trusted users"
68849 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
68850 + default 1005
68851 + help
68852 + Setting this GID determines what group TPE restrictions will be
68853 + *disabled* for. If the sysctl option is enabled, a sysctl option
68854 + with name "tpe_gid" is created.
68855 +
68856 +endmenu
68857 +menu "Network Protections"
68858 +depends on GRKERNSEC
68859 +
68860 +config GRKERNSEC_BLACKHOLE
68861 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
68862 + default y if GRKERNSEC_CONFIG_AUTO
68863 + depends on NET
68864 + help
68865 + If you say Y here, neither TCP resets nor ICMP
68866 + destination-unreachable packets will be sent in response to packets
68867 + sent to ports for which no associated listening process exists.
68868 + It will also prevent the sending of ICMP protocol unreachable packets
68869 + in response to packets with unknown protocols.
68870 + This feature supports both IPV4 and IPV6 and exempts the
68871 + loopback interface from blackholing. Enabling this feature
68872 + makes a host more resilient to DoS attacks and reduces network
68873 + visibility against scanners.
68874 +
68875 + The blackhole feature as-implemented is equivalent to the FreeBSD
68876 + blackhole feature, as it prevents RST responses to all packets, not
68877 + just SYNs. Under most application behavior this causes no
68878 + problems, but applications (like haproxy) may not close certain
68879 + connections in a way that cleanly terminates them on the remote
68880 + end, leaving the remote host in LAST_ACK state. Because of this
68881 + side-effect and to prevent intentional LAST_ACK DoSes, this
68882 + feature also adds automatic mitigation against such attacks.
68883 + The mitigation drastically reduces the amount of time a socket
68884 + can spend in LAST_ACK state. If you're using haproxy and not
68885 + all servers it connects to have this option enabled, consider
68886 + disabling this feature on the haproxy host.
68887 +
68888 + If the sysctl option is enabled, two sysctl options with names
68889 + "ip_blackhole" and "lastack_retries" will be created.
68890 + While "ip_blackhole" takes the standard zero/non-zero on/off
68891 + toggle, "lastack_retries" uses the same kinds of values as
68892 + "tcp_retries1" and "tcp_retries2". The default value of 4
68893 + prevents a socket from lasting more than 45 seconds in LAST_ACK
68894 + state.
68895 +
68896 +config GRKERNSEC_NO_SIMULT_CONNECT
68897 + bool "Disable TCP Simultaneous Connect"
68898 + default y if GRKERNSEC_CONFIG_AUTO
68899 + depends on NET
68900 + help
68901 + If you say Y here, a feature by Willy Tarreau will be enabled that
68902 + removes a weakness in Linux's strict implementation of TCP that
68903 + allows two clients to connect to each other without either entering
68904 + a listening state. The weakness allows an attacker to easily prevent
68905 + a client from connecting to a known server provided the source port
68906 + for the connection is guessed correctly.
68907 +
68908 + As the weakness could be used to prevent an antivirus or IPS from
68909 + fetching updates, or prevent an SSL gateway from fetching a CRL,
68910 + it should be eliminated by enabling this option. Though Linux is
68911 + one of few operating systems supporting simultaneous connect, it
68912 + has no legitimate use in practice and is rarely supported by firewalls.
68913 +
68914 +config GRKERNSEC_SOCKET
68915 + bool "Socket restrictions"
68916 + depends on NET
68917 + help
68918 + If you say Y here, you will be able to choose from several options.
68919 + If you assign a GID on your system and add it to the supplementary
68920 + groups of users you want to restrict socket access to, this patch
68921 + will perform up to three things, based on the option(s) you choose.
68922 +
68923 +config GRKERNSEC_SOCKET_ALL
68924 + bool "Deny any sockets to group"
68925 + depends on GRKERNSEC_SOCKET
68926 + help
68927 + If you say Y here, you will be able to choose a GID of whose users will
68928 + be unable to connect to other hosts from your machine or run server
68929 + applications from your machine. If the sysctl option is enabled, a
68930 + sysctl option with name "socket_all" is created.
68931 +
68932 +config GRKERNSEC_SOCKET_ALL_GID
68933 + int "GID to deny all sockets for"
68934 + depends on GRKERNSEC_SOCKET_ALL
68935 + default 1004
68936 + help
68937 + Here you can choose the GID to disable socket access for. Remember to
68938 + add the users you want socket access disabled for to the GID
68939 + specified here. If the sysctl option is enabled, a sysctl option
68940 + with name "socket_all_gid" is created.
68941 +
68942 +config GRKERNSEC_SOCKET_CLIENT
68943 + bool "Deny client sockets to group"
68944 + depends on GRKERNSEC_SOCKET
68945 + help
68946 + If you say Y here, you will be able to choose a GID of whose users will
68947 + be unable to connect to other hosts from your machine, but will be
68948 + able to run servers. If this option is enabled, all users in the group
68949 + you specify will have to use passive mode when initiating ftp transfers
68950 + from the shell on your machine. If the sysctl option is enabled, a
68951 + sysctl option with name "socket_client" is created.
68952 +
68953 +config GRKERNSEC_SOCKET_CLIENT_GID
68954 + int "GID to deny client sockets for"
68955 + depends on GRKERNSEC_SOCKET_CLIENT
68956 + default 1003
68957 + help
68958 + Here you can choose the GID to disable client socket access for.
68959 + Remember to add the users you want client socket access disabled for to
68960 + the GID specified here. If the sysctl option is enabled, a sysctl
68961 + option with name "socket_client_gid" is created.
68962 +
68963 +config GRKERNSEC_SOCKET_SERVER
68964 + bool "Deny server sockets to group"
68965 + depends on GRKERNSEC_SOCKET
68966 + help
68967 + If you say Y here, you will be able to choose a GID of whose users will
68968 + be unable to run server applications from your machine. If the sysctl
68969 + option is enabled, a sysctl option with name "socket_server" is created.
68970 +
68971 +config GRKERNSEC_SOCKET_SERVER_GID
68972 + int "GID to deny server sockets for"
68973 + depends on GRKERNSEC_SOCKET_SERVER
68974 + default 1002
68975 + help
68976 + Here you can choose the GID to disable server socket access for.
68977 + Remember to add the users you want server socket access disabled for to
68978 + the GID specified here. If the sysctl option is enabled, a sysctl
68979 + option with name "socket_server_gid" is created.
68980 +
68981 +endmenu
68982 +
68983 +menu "Physical Protections"
68984 +depends on GRKERNSEC
68985 +
68986 +config GRKERNSEC_DENYUSB
68987 + bool "Deny new USB connections after toggle"
68988 + default y if GRKERNSEC_CONFIG_AUTO
68989 + depends on SYSCTL && USB_SUPPORT
68990 + help
68991 + If you say Y here, a new sysctl option with name "deny_new_usb"
68992 + will be created. Setting its value to 1 will prevent any new
68993 + USB devices from being recognized by the OS. Any attempted USB
68994 + device insertion will be logged. This option is intended to be
68995 + used against custom USB devices designed to exploit vulnerabilities
68996 + in various USB device drivers.
68997 +
68998 + For greatest effectiveness, this sysctl should be set after any
68999 + relevant init scripts. This option is safe to enable in distros
69000 + as each user can choose whether or not to toggle the sysctl.
69001 +
69002 +config GRKERNSEC_DENYUSB_FORCE
69003 + bool "Reject all USB devices not connected at boot"
69004 + select USB
69005 + depends on GRKERNSEC_DENYUSB
69006 + help
69007 + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
69008 + that doesn't involve a sysctl entry. This option should only be
69009 + enabled if you're sure you want to deny all new USB connections
69010 + at runtime and don't want to modify init scripts. This should not
69011 + be enabled by distros. It forces the core USB code to be built
69012 + into the kernel image so that all devices connected at boot time
69013 + can be recognized and new USB device connections can be prevented
69014 + prior to init running.
69015 +
69016 +endmenu
69017 +
69018 +menu "Sysctl Support"
69019 +depends on GRKERNSEC && SYSCTL
69020 +
69021 +config GRKERNSEC_SYSCTL
69022 + bool "Sysctl support"
69023 + default y if GRKERNSEC_CONFIG_AUTO
69024 + help
69025 + If you say Y here, you will be able to change the options that
69026 + grsecurity runs with at bootup, without having to recompile your
69027 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
69028 + to enable (1) or disable (0) various features. All the sysctl entries
69029 + are mutable until the "grsec_lock" entry is set to a non-zero value.
69030 + All features enabled in the kernel configuration are disabled at boot
69031 + if you do not say Y to the "Turn on features by default" option.
69032 + All options should be set at startup, and the grsec_lock entry should
69033 + be set to a non-zero value after all the options are set.
69034 + *THIS IS EXTREMELY IMPORTANT*
69035 +
69036 +config GRKERNSEC_SYSCTL_DISTRO
69037 + bool "Extra sysctl support for distro makers (READ HELP)"
69038 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
69039 + help
69040 + If you say Y here, additional sysctl options will be created
69041 + for features that affect processes running as root. Therefore,
69042 + it is critical when using this option that the grsec_lock entry be
69043 + enabled after boot. Only distros with prebuilt kernel packages
69044 + with this option enabled that can ensure grsec_lock is enabled
69045 + after boot should use this option.
69046 + *Failure to set grsec_lock after boot makes all grsec features
69047 + this option covers useless*
69048 +
69049 + Currently this option creates the following sysctl entries:
69050 + "Disable Privileged I/O": "disable_priv_io"
69051 +
69052 +config GRKERNSEC_SYSCTL_ON
69053 + bool "Turn on features by default"
69054 + default y if GRKERNSEC_CONFIG_AUTO
69055 + depends on GRKERNSEC_SYSCTL
69056 + help
69057 + If you say Y here, instead of having all features enabled in the
69058 + kernel configuration disabled at boot time, the features will be
69059 + enabled at boot time. It is recommended you say Y here unless
69060 + there is some reason you would want all sysctl-tunable features to
69061 + be disabled by default. As mentioned elsewhere, it is important
69062 + to enable the grsec_lock entry once you have finished modifying
69063 + the sysctl entries.
69064 +
69065 +endmenu
69066 +menu "Logging Options"
69067 +depends on GRKERNSEC
69068 +
69069 +config GRKERNSEC_FLOODTIME
69070 + int "Seconds in between log messages (minimum)"
69071 + default 10
69072 + help
69073 + This option allows you to enforce the number of seconds between
69074 + grsecurity log messages. The default should be suitable for most
69075 + people, however, if you choose to change it, choose a value small enough
69076 + to allow informative logs to be produced, but large enough to
69077 + prevent flooding.
69078 +
69079 + Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
69080 + any rate limiting on grsecurity log messages.
69081 +
69082 +config GRKERNSEC_FLOODBURST
69083 + int "Number of messages in a burst (maximum)"
69084 + default 6
69085 + help
69086 + This option allows you to choose the maximum number of messages allowed
69087 + within the flood time interval you chose in a separate option. The
69088 + default should be suitable for most people, however if you find that
69089 + many of your logs are being interpreted as flooding, you may want to
69090 + raise this value.
69091 +
69092 + Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
69093 + any rate limiting on grsecurity log messages.
69094 +
69095 +endmenu
69096 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
69097 new file mode 100644
69098 index 0000000..30ababb
69099 --- /dev/null
69100 +++ b/grsecurity/Makefile
69101 @@ -0,0 +1,54 @@
69102 +# grsecurity – access control and security hardening for Linux
69103 +# All code in this directory and various hooks located throughout the Linux kernel are
69104 +# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
69105 +# http://www.grsecurity.net spender@grsecurity.net
69106 +#
69107 +# This program is free software; you can redistribute it and/or
69108 +# modify it under the terms of the GNU General Public License version 2
69109 +# as published by the Free Software Foundation.
69110 +#
69111 +# This program is distributed in the hope that it will be useful,
69112 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
69113 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69114 +# GNU General Public License for more details.
69115 +#
69116 +# You should have received a copy of the GNU General Public License
69117 +# along with this program; if not, write to the Free Software
69118 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69119 +
69120 +KBUILD_CFLAGS += -Werror
69121 +
69122 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69123 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
69124 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69125 + grsec_usb.o grsec_ipc.o grsec_proc.o
69126 +
69127 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69128 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69129 + gracl_learn.o grsec_log.o gracl_policy.o
69130 +ifdef CONFIG_COMPAT
69131 +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69132 +endif
69133 +
69134 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69135 +
69136 +ifdef CONFIG_NET
69137 +obj-y += grsec_sock.o
69138 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69139 +endif
69140 +
69141 +ifndef CONFIG_GRKERNSEC
69142 +obj-y += grsec_disabled.o
69143 +endif
69144 +
69145 +ifdef CONFIG_GRKERNSEC_HIDESYM
69146 +extra-y := grsec_hidesym.o
69147 +$(obj)/grsec_hidesym.o:
69148 + @-chmod -f 500 /boot
69149 + @-chmod -f 500 /lib/modules
69150 + @-chmod -f 500 /lib64/modules
69151 + @-chmod -f 500 /lib32/modules
69152 + @-chmod -f 700 .
69153 + @-chmod -f 700 $(objtree)
69154 + @echo ' grsec: protected kernel image paths'
69155 +endif
69156 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69157 new file mode 100644
69158 index 0000000..6ae3aa0
69159 --- /dev/null
69160 +++ b/grsecurity/gracl.c
69161 @@ -0,0 +1,2703 @@
69162 +#include <linux/kernel.h>
69163 +#include <linux/module.h>
69164 +#include <linux/sched.h>
69165 +#include <linux/mm.h>
69166 +#include <linux/file.h>
69167 +#include <linux/fs.h>
69168 +#include <linux/namei.h>
69169 +#include <linux/mount.h>
69170 +#include <linux/tty.h>
69171 +#include <linux/proc_fs.h>
69172 +#include <linux/lglock.h>
69173 +#include <linux/slab.h>
69174 +#include <linux/vmalloc.h>
69175 +#include <linux/types.h>
69176 +#include <linux/sysctl.h>
69177 +#include <linux/netdevice.h>
69178 +#include <linux/ptrace.h>
69179 +#include <linux/gracl.h>
69180 +#include <linux/gralloc.h>
69181 +#include <linux/security.h>
69182 +#include <linux/grinternal.h>
69183 +#include <linux/pid_namespace.h>
69184 +#include <linux/stop_machine.h>
69185 +#include <linux/fdtable.h>
69186 +#include <linux/percpu.h>
69187 +#include <linux/lglock.h>
69188 +#include <linux/hugetlb.h>
69189 +#include <linux/posix-timers.h>
69190 +#include <linux/prefetch.h>
69191 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69192 +#include <linux/magic.h>
69193 +#include <linux/pagemap.h>
69194 +#include "../fs/btrfs/async-thread.h"
69195 +#include "../fs/btrfs/ctree.h"
69196 +#include "../fs/btrfs/btrfs_inode.h"
69197 +#endif
69198 +#include "../fs/mount.h"
69199 +
69200 +#include <asm/uaccess.h>
69201 +#include <asm/errno.h>
69202 +#include <asm/mman.h>
69203 +
69204 +#define FOR_EACH_ROLE_START(role) \
69205 + role = running_polstate.role_list; \
69206 + while (role) {
69207 +
69208 +#define FOR_EACH_ROLE_END(role) \
69209 + role = role->prev; \
69210 + }
69211 +
69212 +extern struct path gr_real_root;
69213 +
69214 +static struct gr_policy_state running_polstate;
69215 +struct gr_policy_state *polstate = &running_polstate;
69216 +extern struct gr_alloc_state *current_alloc_state;
69217 +
69218 +extern char *gr_shared_page[4];
69219 +DEFINE_RWLOCK(gr_inode_lock);
69220 +
69221 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
69222 +
69223 +#ifdef CONFIG_NET
69224 +extern struct vfsmount *sock_mnt;
69225 +#endif
69226 +
69227 +extern struct vfsmount *pipe_mnt;
69228 +extern struct vfsmount *shm_mnt;
69229 +
69230 +#ifdef CONFIG_HUGETLBFS
69231 +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69232 +#endif
69233 +
69234 +extern u16 acl_sp_role_value;
69235 +extern struct acl_object_label *fakefs_obj_rw;
69236 +extern struct acl_object_label *fakefs_obj_rwx;
69237 +
69238 +int gr_acl_is_enabled(void)
69239 +{
69240 + return (gr_status & GR_READY);
69241 +}
69242 +
69243 +void gr_enable_rbac_system(void)
69244 +{
69245 + pax_open_kernel();
69246 + gr_status |= GR_READY;
69247 + pax_close_kernel();
69248 +}
69249 +
69250 +int gr_rbac_disable(void *unused)
69251 +{
69252 + pax_open_kernel();
69253 + gr_status &= ~GR_READY;
69254 + pax_close_kernel();
69255 +
69256 + return 0;
69257 +}
69258 +
69259 +static inline dev_t __get_dev(const struct dentry *dentry)
69260 +{
69261 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69262 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69263 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
69264 + else
69265 +#endif
69266 + return dentry->d_sb->s_dev;
69267 +}
69268 +
69269 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69270 +{
69271 + return __get_dev(dentry);
69272 +}
69273 +
69274 +static char gr_task_roletype_to_char(struct task_struct *task)
69275 +{
69276 + switch (task->role->roletype &
69277 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69278 + GR_ROLE_SPECIAL)) {
69279 + case GR_ROLE_DEFAULT:
69280 + return 'D';
69281 + case GR_ROLE_USER:
69282 + return 'U';
69283 + case GR_ROLE_GROUP:
69284 + return 'G';
69285 + case GR_ROLE_SPECIAL:
69286 + return 'S';
69287 + }
69288 +
69289 + return 'X';
69290 +}
69291 +
69292 +char gr_roletype_to_char(void)
69293 +{
69294 + return gr_task_roletype_to_char(current);
69295 +}
69296 +
69297 +__inline__ int
69298 +gr_acl_tpe_check(void)
69299 +{
69300 + if (unlikely(!(gr_status & GR_READY)))
69301 + return 0;
69302 + if (current->role->roletype & GR_ROLE_TPE)
69303 + return 1;
69304 + else
69305 + return 0;
69306 +}
69307 +
69308 +int
69309 +gr_handle_rawio(const struct inode *inode)
69310 +{
69311 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69312 + if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69313 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69314 + !capable(CAP_SYS_RAWIO))
69315 + return 1;
69316 +#endif
69317 + return 0;
69318 +}
69319 +
69320 +int
69321 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
69322 +{
69323 + if (likely(lena != lenb))
69324 + return 0;
69325 +
69326 + return !memcmp(a, b, lena);
69327 +}
69328 +
69329 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
69330 +{
69331 + *buflen -= namelen;
69332 + if (*buflen < 0)
69333 + return -ENAMETOOLONG;
69334 + *buffer -= namelen;
69335 + memcpy(*buffer, str, namelen);
69336 + return 0;
69337 +}
69338 +
69339 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
69340 +{
69341 + return prepend(buffer, buflen, name->name, name->len);
69342 +}
69343 +
69344 +static int prepend_path(const struct path *path, struct path *root,
69345 + char **buffer, int *buflen)
69346 +{
69347 + struct dentry *dentry = path->dentry;
69348 + struct vfsmount *vfsmnt = path->mnt;
69349 + struct mount *mnt = real_mount(vfsmnt);
69350 + bool slash = false;
69351 + int error = 0;
69352 +
69353 + while (dentry != root->dentry || vfsmnt != root->mnt) {
69354 + struct dentry * parent;
69355 +
69356 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
69357 + /* Global root? */
69358 + if (!mnt_has_parent(mnt)) {
69359 + goto out;
69360 + }
69361 + dentry = mnt->mnt_mountpoint;
69362 + mnt = mnt->mnt_parent;
69363 + vfsmnt = &mnt->mnt;
69364 + continue;
69365 + }
69366 + parent = dentry->d_parent;
69367 + prefetch(parent);
69368 + spin_lock(&dentry->d_lock);
69369 + error = prepend_name(buffer, buflen, &dentry->d_name);
69370 + spin_unlock(&dentry->d_lock);
69371 + if (!error)
69372 + error = prepend(buffer, buflen, "/", 1);
69373 + if (error)
69374 + break;
69375 +
69376 + slash = true;
69377 + dentry = parent;
69378 + }
69379 +
69380 +out:
69381 + if (!error && !slash)
69382 + error = prepend(buffer, buflen, "/", 1);
69383 +
69384 + return error;
69385 +}
69386 +
69387 +/* this must be called with mount_lock and rename_lock held */
69388 +
69389 +static char *__our_d_path(const struct path *path, struct path *root,
69390 + char *buf, int buflen)
69391 +{
69392 + char *res = buf + buflen;
69393 + int error;
69394 +
69395 + prepend(&res, &buflen, "\0", 1);
69396 + error = prepend_path(path, root, &res, &buflen);
69397 + if (error)
69398 + return ERR_PTR(error);
69399 +
69400 + return res;
69401 +}
69402 +
69403 +static char *
69404 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
69405 +{
69406 + char *retval;
69407 +
69408 + retval = __our_d_path(path, root, buf, buflen);
69409 + if (unlikely(IS_ERR(retval)))
69410 + retval = strcpy(buf, "<path too long>");
69411 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
69412 + retval[1] = '\0';
69413 +
69414 + return retval;
69415 +}
69416 +
69417 +static char *
69418 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69419 + char *buf, int buflen)
69420 +{
69421 + struct path path;
69422 + char *res;
69423 +
69424 + path.dentry = (struct dentry *)dentry;
69425 + path.mnt = (struct vfsmount *)vfsmnt;
69426 +
69427 + /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
69428 + by the RBAC system */
69429 + res = gen_full_path(&path, &gr_real_root, buf, buflen);
69430 +
69431 + return res;
69432 +}
69433 +
69434 +static char *
69435 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69436 + char *buf, int buflen)
69437 +{
69438 + char *res;
69439 + struct path path;
69440 + struct path root;
69441 + struct task_struct *reaper = init_pid_ns.child_reaper;
69442 +
69443 + path.dentry = (struct dentry *)dentry;
69444 + path.mnt = (struct vfsmount *)vfsmnt;
69445 +
69446 + /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
69447 + get_fs_root(reaper->fs, &root);
69448 +
69449 + read_seqlock_excl(&mount_lock);
69450 + write_seqlock(&rename_lock);
69451 + res = gen_full_path(&path, &root, buf, buflen);
69452 + write_sequnlock(&rename_lock);
69453 + read_sequnlock_excl(&mount_lock);
69454 +
69455 + path_put(&root);
69456 + return res;
69457 +}
69458 +
69459 +char *
69460 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69461 +{
69462 + char *ret;
69463 + read_seqlock_excl(&mount_lock);
69464 + write_seqlock(&rename_lock);
69465 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69466 + PAGE_SIZE);
69467 + write_sequnlock(&rename_lock);
69468 + read_sequnlock_excl(&mount_lock);
69469 + return ret;
69470 +}
69471 +
69472 +static char *
69473 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69474 +{
69475 + char *ret;
69476 + char *buf;
69477 + int buflen;
69478 +
69479 + read_seqlock_excl(&mount_lock);
69480 + write_seqlock(&rename_lock);
69481 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
69482 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
69483 + buflen = (int)(ret - buf);
69484 + if (buflen >= 5)
69485 + prepend(&ret, &buflen, "/proc", 5);
69486 + else
69487 + ret = strcpy(buf, "<path too long>");
69488 + write_sequnlock(&rename_lock);
69489 + read_sequnlock_excl(&mount_lock);
69490 + return ret;
69491 +}
69492 +
69493 +char *
69494 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
69495 +{
69496 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69497 + PAGE_SIZE);
69498 +}
69499 +
69500 +char *
69501 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
69502 +{
69503 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69504 + PAGE_SIZE);
69505 +}
69506 +
69507 +char *
69508 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
69509 +{
69510 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
69511 + PAGE_SIZE);
69512 +}
69513 +
69514 +char *
69515 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
69516 +{
69517 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
69518 + PAGE_SIZE);
69519 +}
69520 +
69521 +char *
69522 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
69523 +{
69524 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
69525 + PAGE_SIZE);
69526 +}
69527 +
69528 +__inline__ __u32
69529 +to_gr_audit(const __u32 reqmode)
69530 +{
69531 + /* masks off auditable permission flags, then shifts them to create
69532 + auditing flags, and adds the special case of append auditing if
69533 + we're requesting write */
69534 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
69535 +}
69536 +
69537 +struct acl_role_label *
69538 +__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
69539 + const gid_t gid)
69540 +{
69541 + unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
69542 + struct acl_role_label *match;
69543 + struct role_allowed_ip *ipp;
69544 + unsigned int x;
69545 + u32 curr_ip = task->signal->saved_ip;
69546 +
69547 + match = state->acl_role_set.r_hash[index];
69548 +
69549 + while (match) {
69550 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
69551 + for (x = 0; x < match->domain_child_num; x++) {
69552 + if (match->domain_children[x] == uid)
69553 + goto found;
69554 + }
69555 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
69556 + break;
69557 + match = match->next;
69558 + }
69559 +found:
69560 + if (match == NULL) {
69561 + try_group:
69562 + index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
69563 + match = state->acl_role_set.r_hash[index];
69564 +
69565 + while (match) {
69566 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
69567 + for (x = 0; x < match->domain_child_num; x++) {
69568 + if (match->domain_children[x] == gid)
69569 + goto found2;
69570 + }
69571 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
69572 + break;
69573 + match = match->next;
69574 + }
69575 +found2:
69576 + if (match == NULL)
69577 + match = state->default_role;
69578 + if (match->allowed_ips == NULL)
69579 + return match;
69580 + else {
69581 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69582 + if (likely
69583 + ((ntohl(curr_ip) & ipp->netmask) ==
69584 + (ntohl(ipp->addr) & ipp->netmask)))
69585 + return match;
69586 + }
69587 + match = state->default_role;
69588 + }
69589 + } else if (match->allowed_ips == NULL) {
69590 + return match;
69591 + } else {
69592 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69593 + if (likely
69594 + ((ntohl(curr_ip) & ipp->netmask) ==
69595 + (ntohl(ipp->addr) & ipp->netmask)))
69596 + return match;
69597 + }
69598 + goto try_group;
69599 + }
69600 +
69601 + return match;
69602 +}
69603 +
69604 +static struct acl_role_label *
69605 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
69606 + const gid_t gid)
69607 +{
69608 + return __lookup_acl_role_label(&running_polstate, task, uid, gid);
69609 +}
69610 +
69611 +struct acl_subject_label *
69612 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
69613 + const struct acl_role_label *role)
69614 +{
69615 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69616 + struct acl_subject_label *match;
69617 +
69618 + match = role->subj_hash[index];
69619 +
69620 + while (match && (match->inode != ino || match->device != dev ||
69621 + (match->mode & GR_DELETED))) {
69622 + match = match->next;
69623 + }
69624 +
69625 + if (match && !(match->mode & GR_DELETED))
69626 + return match;
69627 + else
69628 + return NULL;
69629 +}
69630 +
69631 +struct acl_subject_label *
69632 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
69633 + const struct acl_role_label *role)
69634 +{
69635 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69636 + struct acl_subject_label *match;
69637 +
69638 + match = role->subj_hash[index];
69639 +
69640 + while (match && (match->inode != ino || match->device != dev ||
69641 + !(match->mode & GR_DELETED))) {
69642 + match = match->next;
69643 + }
69644 +
69645 + if (match && (match->mode & GR_DELETED))
69646 + return match;
69647 + else
69648 + return NULL;
69649 +}
69650 +
69651 +static struct acl_object_label *
69652 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
69653 + const struct acl_subject_label *subj)
69654 +{
69655 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69656 + struct acl_object_label *match;
69657 +
69658 + match = subj->obj_hash[index];
69659 +
69660 + while (match && (match->inode != ino || match->device != dev ||
69661 + (match->mode & GR_DELETED))) {
69662 + match = match->next;
69663 + }
69664 +
69665 + if (match && !(match->mode & GR_DELETED))
69666 + return match;
69667 + else
69668 + return NULL;
69669 +}
69670 +
69671 +static struct acl_object_label *
69672 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
69673 + const struct acl_subject_label *subj)
69674 +{
69675 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69676 + struct acl_object_label *match;
69677 +
69678 + match = subj->obj_hash[index];
69679 +
69680 + while (match && (match->inode != ino || match->device != dev ||
69681 + !(match->mode & GR_DELETED))) {
69682 + match = match->next;
69683 + }
69684 +
69685 + if (match && (match->mode & GR_DELETED))
69686 + return match;
69687 +
69688 + match = subj->obj_hash[index];
69689 +
69690 + while (match && (match->inode != ino || match->device != dev ||
69691 + (match->mode & GR_DELETED))) {
69692 + match = match->next;
69693 + }
69694 +
69695 + if (match && !(match->mode & GR_DELETED))
69696 + return match;
69697 + else
69698 + return NULL;
69699 +}
69700 +
69701 +struct name_entry *
69702 +__lookup_name_entry(const struct gr_policy_state *state, const char *name)
69703 +{
69704 + unsigned int len = strlen(name);
69705 + unsigned int key = full_name_hash(name, len);
69706 + unsigned int index = key % state->name_set.n_size;
69707 + struct name_entry *match;
69708 +
69709 + match = state->name_set.n_hash[index];
69710 +
69711 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
69712 + match = match->next;
69713 +
69714 + return match;
69715 +}
69716 +
69717 +static struct name_entry *
69718 +lookup_name_entry(const char *name)
69719 +{
69720 + return __lookup_name_entry(&running_polstate, name);
69721 +}
69722 +
69723 +static struct name_entry *
69724 +lookup_name_entry_create(const char *name)
69725 +{
69726 + unsigned int len = strlen(name);
69727 + unsigned int key = full_name_hash(name, len);
69728 + unsigned int index = key % running_polstate.name_set.n_size;
69729 + struct name_entry *match;
69730 +
69731 + match = running_polstate.name_set.n_hash[index];
69732 +
69733 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69734 + !match->deleted))
69735 + match = match->next;
69736 +
69737 + if (match && match->deleted)
69738 + return match;
69739 +
69740 + match = running_polstate.name_set.n_hash[index];
69741 +
69742 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69743 + match->deleted))
69744 + match = match->next;
69745 +
69746 + if (match && !match->deleted)
69747 + return match;
69748 + else
69749 + return NULL;
69750 +}
69751 +
69752 +static struct inodev_entry *
69753 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
69754 +{
69755 + unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
69756 + struct inodev_entry *match;
69757 +
69758 + match = running_polstate.inodev_set.i_hash[index];
69759 +
69760 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
69761 + match = match->next;
69762 +
69763 + return match;
69764 +}
69765 +
69766 +void
69767 +__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
69768 +{
69769 + unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
69770 + state->inodev_set.i_size);
69771 + struct inodev_entry **curr;
69772 +
69773 + entry->prev = NULL;
69774 +
69775 + curr = &state->inodev_set.i_hash[index];
69776 + if (*curr != NULL)
69777 + (*curr)->prev = entry;
69778 +
69779 + entry->next = *curr;
69780 + *curr = entry;
69781 +
69782 + return;
69783 +}
69784 +
69785 +static void
69786 +insert_inodev_entry(struct inodev_entry *entry)
69787 +{
69788 + __insert_inodev_entry(&running_polstate, entry);
69789 +}
69790 +
69791 +void
69792 +insert_acl_obj_label(struct acl_object_label *obj,
69793 + struct acl_subject_label *subj)
69794 +{
69795 + unsigned int index =
69796 + gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
69797 + struct acl_object_label **curr;
69798 +
69799 + obj->prev = NULL;
69800 +
69801 + curr = &subj->obj_hash[index];
69802 + if (*curr != NULL)
69803 + (*curr)->prev = obj;
69804 +
69805 + obj->next = *curr;
69806 + *curr = obj;
69807 +
69808 + return;
69809 +}
69810 +
69811 +void
69812 +insert_acl_subj_label(struct acl_subject_label *obj,
69813 + struct acl_role_label *role)
69814 +{
69815 + unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
69816 + struct acl_subject_label **curr;
69817 +
69818 + obj->prev = NULL;
69819 +
69820 + curr = &role->subj_hash[index];
69821 + if (*curr != NULL)
69822 + (*curr)->prev = obj;
69823 +
69824 + obj->next = *curr;
69825 + *curr = obj;
69826 +
69827 + return;
69828 +}
69829 +
69830 +/* derived from glibc fnmatch() 0: match, 1: no match*/
69831 +
69832 +static int
69833 +glob_match(const char *p, const char *n)
69834 +{
69835 + char c;
69836 +
69837 + while ((c = *p++) != '\0') {
69838 + switch (c) {
69839 + case '?':
69840 + if (*n == '\0')
69841 + return 1;
69842 + else if (*n == '/')
69843 + return 1;
69844 + break;
69845 + case '\\':
69846 + if (*n != c)
69847 + return 1;
69848 + break;
69849 + case '*':
69850 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
69851 + if (*n == '/')
69852 + return 1;
69853 + else if (c == '?') {
69854 + if (*n == '\0')
69855 + return 1;
69856 + else
69857 + ++n;
69858 + }
69859 + }
69860 + if (c == '\0') {
69861 + return 0;
69862 + } else {
69863 + const char *endp;
69864 +
69865 + if ((endp = strchr(n, '/')) == NULL)
69866 + endp = n + strlen(n);
69867 +
69868 + if (c == '[') {
69869 + for (--p; n < endp; ++n)
69870 + if (!glob_match(p, n))
69871 + return 0;
69872 + } else if (c == '/') {
69873 + while (*n != '\0' && *n != '/')
69874 + ++n;
69875 + if (*n == '/' && !glob_match(p, n + 1))
69876 + return 0;
69877 + } else {
69878 + for (--p; n < endp; ++n)
69879 + if (*n == c && !glob_match(p, n))
69880 + return 0;
69881 + }
69882 +
69883 + return 1;
69884 + }
69885 + case '[':
69886 + {
69887 + int not;
69888 + char cold;
69889 +
69890 + if (*n == '\0' || *n == '/')
69891 + return 1;
69892 +
69893 + not = (*p == '!' || *p == '^');
69894 + if (not)
69895 + ++p;
69896 +
69897 + c = *p++;
69898 + for (;;) {
69899 + unsigned char fn = (unsigned char)*n;
69900 +
69901 + if (c == '\0')
69902 + return 1;
69903 + else {
69904 + if (c == fn)
69905 + goto matched;
69906 + cold = c;
69907 + c = *p++;
69908 +
69909 + if (c == '-' && *p != ']') {
69910 + unsigned char cend = *p++;
69911 +
69912 + if (cend == '\0')
69913 + return 1;
69914 +
69915 + if (cold <= fn && fn <= cend)
69916 + goto matched;
69917 +
69918 + c = *p++;
69919 + }
69920 + }
69921 +
69922 + if (c == ']')
69923 + break;
69924 + }
69925 + if (!not)
69926 + return 1;
69927 + break;
69928 + matched:
69929 + while (c != ']') {
69930 + if (c == '\0')
69931 + return 1;
69932 +
69933 + c = *p++;
69934 + }
69935 + if (not)
69936 + return 1;
69937 + }
69938 + break;
69939 + default:
69940 + if (c != *n)
69941 + return 1;
69942 + }
69943 +
69944 + ++n;
69945 + }
69946 +
69947 + if (*n == '\0')
69948 + return 0;
69949 +
69950 + if (*n == '/')
69951 + return 0;
69952 +
69953 + return 1;
69954 +}
69955 +
69956 +static struct acl_object_label *
69957 +chk_glob_label(struct acl_object_label *globbed,
69958 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
69959 +{
69960 + struct acl_object_label *tmp;
69961 +
69962 + if (*path == NULL)
69963 + *path = gr_to_filename_nolock(dentry, mnt);
69964 +
69965 + tmp = globbed;
69966 +
69967 + while (tmp) {
69968 + if (!glob_match(tmp->filename, *path))
69969 + return tmp;
69970 + tmp = tmp->next;
69971 + }
69972 +
69973 + return NULL;
69974 +}
69975 +
69976 +static struct acl_object_label *
69977 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
69978 + const ino_t curr_ino, const dev_t curr_dev,
69979 + const struct acl_subject_label *subj, char **path, const int checkglob)
69980 +{
69981 + struct acl_subject_label *tmpsubj;
69982 + struct acl_object_label *retval;
69983 + struct acl_object_label *retval2;
69984 +
69985 + tmpsubj = (struct acl_subject_label *) subj;
69986 + read_lock(&gr_inode_lock);
69987 + do {
69988 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
69989 + if (retval) {
69990 + if (checkglob && retval->globbed) {
69991 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
69992 + if (retval2)
69993 + retval = retval2;
69994 + }
69995 + break;
69996 + }
69997 + } while ((tmpsubj = tmpsubj->parent_subject));
69998 + read_unlock(&gr_inode_lock);
69999 +
70000 + return retval;
70001 +}
70002 +
70003 +static __inline__ struct acl_object_label *
70004 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70005 + struct dentry *curr_dentry,
70006 + const struct acl_subject_label *subj, char **path, const int checkglob)
70007 +{
70008 + int newglob = checkglob;
70009 + ino_t inode;
70010 + dev_t device;
70011 +
70012 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
70013 + as we don't want a / * rule to match instead of the / object
70014 + don't do this for create lookups that call this function though, since they're looking up
70015 + on the parent and thus need globbing checks on all paths
70016 + */
70017 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
70018 + newglob = GR_NO_GLOB;
70019 +
70020 + spin_lock(&curr_dentry->d_lock);
70021 + inode = curr_dentry->d_inode->i_ino;
70022 + device = __get_dev(curr_dentry);
70023 + spin_unlock(&curr_dentry->d_lock);
70024 +
70025 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
70026 +}
70027 +
70028 +#ifdef CONFIG_HUGETLBFS
70029 +static inline bool
70030 +is_hugetlbfs_mnt(const struct vfsmount *mnt)
70031 +{
70032 + int i;
70033 + for (i = 0; i < HUGE_MAX_HSTATE; i++) {
70034 + if (unlikely(hugetlbfs_vfsmount[i] == mnt))
70035 + return true;
70036 + }
70037 +
70038 + return false;
70039 +}
70040 +#endif
70041 +
70042 +static struct acl_object_label *
70043 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70044 + const struct acl_subject_label *subj, char *path, const int checkglob)
70045 +{
70046 + struct dentry *dentry = (struct dentry *) l_dentry;
70047 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70048 + struct mount *real_mnt = real_mount(mnt);
70049 + struct acl_object_label *retval;
70050 + struct dentry *parent;
70051 +
70052 + read_seqlock_excl(&mount_lock);
70053 + write_seqlock(&rename_lock);
70054 +
70055 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
70056 +#ifdef CONFIG_NET
70057 + mnt == sock_mnt ||
70058 +#endif
70059 +#ifdef CONFIG_HUGETLBFS
70060 + (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
70061 +#endif
70062 + /* ignore Eric Biederman */
70063 + IS_PRIVATE(l_dentry->d_inode))) {
70064 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
70065 + goto out;
70066 + }
70067 +
70068 + for (;;) {
70069 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70070 + break;
70071 +
70072 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70073 + if (!mnt_has_parent(real_mnt))
70074 + break;
70075 +
70076 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70077 + if (retval != NULL)
70078 + goto out;
70079 +
70080 + dentry = real_mnt->mnt_mountpoint;
70081 + real_mnt = real_mnt->mnt_parent;
70082 + mnt = &real_mnt->mnt;
70083 + continue;
70084 + }
70085 +
70086 + parent = dentry->d_parent;
70087 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70088 + if (retval != NULL)
70089 + goto out;
70090 +
70091 + dentry = parent;
70092 + }
70093 +
70094 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70095 +
70096 + /* gr_real_root is pinned so we don't have to hold a reference */
70097 + if (retval == NULL)
70098 + retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
70099 +out:
70100 + write_sequnlock(&rename_lock);
70101 + read_sequnlock_excl(&mount_lock);
70102 +
70103 + BUG_ON(retval == NULL);
70104 +
70105 + return retval;
70106 +}
70107 +
70108 +static __inline__ struct acl_object_label *
70109 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70110 + const struct acl_subject_label *subj)
70111 +{
70112 + char *path = NULL;
70113 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70114 +}
70115 +
70116 +static __inline__ struct acl_object_label *
70117 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70118 + const struct acl_subject_label *subj)
70119 +{
70120 + char *path = NULL;
70121 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70122 +}
70123 +
70124 +static __inline__ struct acl_object_label *
70125 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70126 + const struct acl_subject_label *subj, char *path)
70127 +{
70128 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70129 +}
70130 +
70131 +struct acl_subject_label *
70132 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70133 + const struct acl_role_label *role)
70134 +{
70135 + struct dentry *dentry = (struct dentry *) l_dentry;
70136 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70137 + struct mount *real_mnt = real_mount(mnt);
70138 + struct acl_subject_label *retval;
70139 + struct dentry *parent;
70140 +
70141 + read_seqlock_excl(&mount_lock);
70142 + write_seqlock(&rename_lock);
70143 +
70144 + for (;;) {
70145 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70146 + break;
70147 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70148 + if (!mnt_has_parent(real_mnt))
70149 + break;
70150 +
70151 + spin_lock(&dentry->d_lock);
70152 + read_lock(&gr_inode_lock);
70153 + retval =
70154 + lookup_acl_subj_label(dentry->d_inode->i_ino,
70155 + __get_dev(dentry), role);
70156 + read_unlock(&gr_inode_lock);
70157 + spin_unlock(&dentry->d_lock);
70158 + if (retval != NULL)
70159 + goto out;
70160 +
70161 + dentry = real_mnt->mnt_mountpoint;
70162 + real_mnt = real_mnt->mnt_parent;
70163 + mnt = &real_mnt->mnt;
70164 + continue;
70165 + }
70166 +
70167 + spin_lock(&dentry->d_lock);
70168 + read_lock(&gr_inode_lock);
70169 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70170 + __get_dev(dentry), role);
70171 + read_unlock(&gr_inode_lock);
70172 + parent = dentry->d_parent;
70173 + spin_unlock(&dentry->d_lock);
70174 +
70175 + if (retval != NULL)
70176 + goto out;
70177 +
70178 + dentry = parent;
70179 + }
70180 +
70181 + spin_lock(&dentry->d_lock);
70182 + read_lock(&gr_inode_lock);
70183 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70184 + __get_dev(dentry), role);
70185 + read_unlock(&gr_inode_lock);
70186 + spin_unlock(&dentry->d_lock);
70187 +
70188 + if (unlikely(retval == NULL)) {
70189 + /* gr_real_root is pinned, we don't need to hold a reference */
70190 + read_lock(&gr_inode_lock);
70191 + retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
70192 + __get_dev(gr_real_root.dentry), role);
70193 + read_unlock(&gr_inode_lock);
70194 + }
70195 +out:
70196 + write_sequnlock(&rename_lock);
70197 + read_sequnlock_excl(&mount_lock);
70198 +
70199 + BUG_ON(retval == NULL);
70200 +
70201 + return retval;
70202 +}
70203 +
70204 +void
70205 +assign_special_role(const char *rolename)
70206 +{
70207 + struct acl_object_label *obj;
70208 + struct acl_role_label *r;
70209 + struct acl_role_label *assigned = NULL;
70210 + struct task_struct *tsk;
70211 + struct file *filp;
70212 +
70213 + FOR_EACH_ROLE_START(r)
70214 + if (!strcmp(rolename, r->rolename) &&
70215 + (r->roletype & GR_ROLE_SPECIAL)) {
70216 + assigned = r;
70217 + break;
70218 + }
70219 + FOR_EACH_ROLE_END(r)
70220 +
70221 + if (!assigned)
70222 + return;
70223 +
70224 + read_lock(&tasklist_lock);
70225 + read_lock(&grsec_exec_file_lock);
70226 +
70227 + tsk = current->real_parent;
70228 + if (tsk == NULL)
70229 + goto out_unlock;
70230 +
70231 + filp = tsk->exec_file;
70232 + if (filp == NULL)
70233 + goto out_unlock;
70234 +
70235 + tsk->is_writable = 0;
70236 + tsk->inherited = 0;
70237 +
70238 + tsk->acl_sp_role = 1;
70239 + tsk->acl_role_id = ++acl_sp_role_value;
70240 + tsk->role = assigned;
70241 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70242 +
70243 + /* ignore additional mmap checks for processes that are writable
70244 + by the default ACL */
70245 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70246 + if (unlikely(obj->mode & GR_WRITE))
70247 + tsk->is_writable = 1;
70248 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70249 + if (unlikely(obj->mode & GR_WRITE))
70250 + tsk->is_writable = 1;
70251 +
70252 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70253 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70254 + tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70255 +#endif
70256 +
70257 +out_unlock:
70258 + read_unlock(&grsec_exec_file_lock);
70259 + read_unlock(&tasklist_lock);
70260 + return;
70261 +}
70262 +
70263 +
70264 +static void
70265 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70266 +{
70267 + struct task_struct *task = current;
70268 + const struct cred *cred = current_cred();
70269 +
70270 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70271 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70272 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70273 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70274 +
70275 + return;
70276 +}
70277 +
70278 +static void
70279 +gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70280 +{
70281 + struct task_struct *task = current;
70282 + const struct cred *cred = current_cred();
70283 +
70284 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70285 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70286 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70287 + 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70288 +
70289 + return;
70290 +}
70291 +
70292 +static void
70293 +gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70294 +{
70295 + struct task_struct *task = current;
70296 + const struct cred *cred = current_cred();
70297 +
70298 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70299 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70300 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70301 + 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70302 +
70303 + return;
70304 +}
70305 +
70306 +static void
70307 +gr_set_proc_res(struct task_struct *task)
70308 +{
70309 + struct acl_subject_label *proc;
70310 + unsigned short i;
70311 +
70312 + proc = task->acl;
70313 +
70314 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70315 + return;
70316 +
70317 + for (i = 0; i < RLIM_NLIMITS; i++) {
70318 + if (!(proc->resmask & (1U << i)))
70319 + continue;
70320 +
70321 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
70322 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
70323 +
70324 + if (i == RLIMIT_CPU)
70325 + update_rlimit_cpu(task, proc->res[i].rlim_cur);
70326 + }
70327 +
70328 + return;
70329 +}
70330 +
70331 +/* both of the below must be called with
70332 + rcu_read_lock();
70333 + read_lock(&tasklist_lock);
70334 + read_lock(&grsec_exec_file_lock);
70335 +*/
70336 +
70337 +struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
70338 +{
70339 + char *tmpname;
70340 + struct acl_subject_label *tmpsubj;
70341 + struct file *filp;
70342 + struct name_entry *nmatch;
70343 +
70344 + filp = task->exec_file;
70345 + if (filp == NULL)
70346 + return NULL;
70347 +
70348 + /* the following is to apply the correct subject
70349 + on binaries running when the RBAC system
70350 + is enabled, when the binaries have been
70351 + replaced or deleted since their execution
70352 + -----
70353 + when the RBAC system starts, the inode/dev
70354 + from exec_file will be one the RBAC system
70355 + is unaware of. It only knows the inode/dev
70356 + of the present file on disk, or the absence
70357 + of it.
70358 + */
70359 +
70360 + if (filename)
70361 + nmatch = __lookup_name_entry(state, filename);
70362 + else {
70363 + preempt_disable();
70364 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
70365 +
70366 + nmatch = __lookup_name_entry(state, tmpname);
70367 + preempt_enable();
70368 + }
70369 + tmpsubj = NULL;
70370 + if (nmatch) {
70371 + if (nmatch->deleted)
70372 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
70373 + else
70374 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
70375 + }
70376 + /* this also works for the reload case -- if we don't match a potentially inherited subject
70377 + then we fall back to a normal lookup based on the binary's ino/dev
70378 + */
70379 + if (tmpsubj == NULL)
70380 + tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
70381 +
70382 + return tmpsubj;
70383 +}
70384 +
70385 +static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
70386 +{
70387 + return __gr_get_subject_for_task(&running_polstate, task, filename);
70388 +}
70389 +
70390 +void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
70391 +{
70392 + struct acl_object_label *obj;
70393 + struct file *filp;
70394 +
70395 + filp = task->exec_file;
70396 +
70397 + task->acl = subj;
70398 + task->is_writable = 0;
70399 + /* ignore additional mmap checks for processes that are writable
70400 + by the default ACL */
70401 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
70402 + if (unlikely(obj->mode & GR_WRITE))
70403 + task->is_writable = 1;
70404 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70405 + if (unlikely(obj->mode & GR_WRITE))
70406 + task->is_writable = 1;
70407 +
70408 + gr_set_proc_res(task);
70409 +
70410 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70411 + 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);
70412 +#endif
70413 +}
70414 +
70415 +static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
70416 +{
70417 + __gr_apply_subject_to_task(&running_polstate, task, subj);
70418 +}
70419 +
70420 +__u32
70421 +gr_search_file(const struct dentry * dentry, const __u32 mode,
70422 + const struct vfsmount * mnt)
70423 +{
70424 + __u32 retval = mode;
70425 + struct acl_subject_label *curracl;
70426 + struct acl_object_label *currobj;
70427 +
70428 + if (unlikely(!(gr_status & GR_READY)))
70429 + return (mode & ~GR_AUDITS);
70430 +
70431 + curracl = current->acl;
70432 +
70433 + currobj = chk_obj_label(dentry, mnt, curracl);
70434 + retval = currobj->mode & mode;
70435 +
70436 + /* if we're opening a specified transfer file for writing
70437 + (e.g. /dev/initctl), then transfer our role to init
70438 + */
70439 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
70440 + current->role->roletype & GR_ROLE_PERSIST)) {
70441 + struct task_struct *task = init_pid_ns.child_reaper;
70442 +
70443 + if (task->role != current->role) {
70444 + struct acl_subject_label *subj;
70445 +
70446 + task->acl_sp_role = 0;
70447 + task->acl_role_id = current->acl_role_id;
70448 + task->role = current->role;
70449 + rcu_read_lock();
70450 + read_lock(&grsec_exec_file_lock);
70451 + subj = gr_get_subject_for_task(task, NULL);
70452 + gr_apply_subject_to_task(task, subj);
70453 + read_unlock(&grsec_exec_file_lock);
70454 + rcu_read_unlock();
70455 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
70456 + }
70457 + }
70458 +
70459 + if (unlikely
70460 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
70461 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
70462 + __u32 new_mode = mode;
70463 +
70464 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70465 +
70466 + retval = new_mode;
70467 +
70468 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
70469 + new_mode |= GR_INHERIT;
70470 +
70471 + if (!(mode & GR_NOLEARN))
70472 + gr_log_learn(dentry, mnt, new_mode);
70473 + }
70474 +
70475 + return retval;
70476 +}
70477 +
70478 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
70479 + const struct dentry *parent,
70480 + const struct vfsmount *mnt)
70481 +{
70482 + struct name_entry *match;
70483 + struct acl_object_label *matchpo;
70484 + struct acl_subject_label *curracl;
70485 + char *path;
70486 +
70487 + if (unlikely(!(gr_status & GR_READY)))
70488 + return NULL;
70489 +
70490 + preempt_disable();
70491 + path = gr_to_filename_rbac(new_dentry, mnt);
70492 + match = lookup_name_entry_create(path);
70493 +
70494 + curracl = current->acl;
70495 +
70496 + if (match) {
70497 + read_lock(&gr_inode_lock);
70498 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
70499 + read_unlock(&gr_inode_lock);
70500 +
70501 + if (matchpo) {
70502 + preempt_enable();
70503 + return matchpo;
70504 + }
70505 + }
70506 +
70507 + // lookup parent
70508 +
70509 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
70510 +
70511 + preempt_enable();
70512 + return matchpo;
70513 +}
70514 +
70515 +__u32
70516 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
70517 + const struct vfsmount * mnt, const __u32 mode)
70518 +{
70519 + struct acl_object_label *matchpo;
70520 + __u32 retval;
70521 +
70522 + if (unlikely(!(gr_status & GR_READY)))
70523 + return (mode & ~GR_AUDITS);
70524 +
70525 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
70526 +
70527 + retval = matchpo->mode & mode;
70528 +
70529 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
70530 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70531 + __u32 new_mode = mode;
70532 +
70533 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70534 +
70535 + gr_log_learn(new_dentry, mnt, new_mode);
70536 + return new_mode;
70537 + }
70538 +
70539 + return retval;
70540 +}
70541 +
70542 +__u32
70543 +gr_check_link(const struct dentry * new_dentry,
70544 + const struct dentry * parent_dentry,
70545 + const struct vfsmount * parent_mnt,
70546 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
70547 +{
70548 + struct acl_object_label *obj;
70549 + __u32 oldmode, newmode;
70550 + __u32 needmode;
70551 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
70552 + GR_DELETE | GR_INHERIT;
70553 +
70554 + if (unlikely(!(gr_status & GR_READY)))
70555 + return (GR_CREATE | GR_LINK);
70556 +
70557 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
70558 + oldmode = obj->mode;
70559 +
70560 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
70561 + newmode = obj->mode;
70562 +
70563 + needmode = newmode & checkmodes;
70564 +
70565 + // old name for hardlink must have at least the permissions of the new name
70566 + if ((oldmode & needmode) != needmode)
70567 + goto bad;
70568 +
70569 + // if old name had restrictions/auditing, make sure the new name does as well
70570 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
70571 +
70572 + // don't allow hardlinking of suid/sgid/fcapped files without permission
70573 + if (is_privileged_binary(old_dentry))
70574 + needmode |= GR_SETID;
70575 +
70576 + if ((newmode & needmode) != needmode)
70577 + goto bad;
70578 +
70579 + // enforce minimum permissions
70580 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
70581 + return newmode;
70582 +bad:
70583 + needmode = oldmode;
70584 + if (is_privileged_binary(old_dentry))
70585 + needmode |= GR_SETID;
70586 +
70587 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
70588 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
70589 + return (GR_CREATE | GR_LINK);
70590 + } else if (newmode & GR_SUPPRESS)
70591 + return GR_SUPPRESS;
70592 + else
70593 + return 0;
70594 +}
70595 +
70596 +int
70597 +gr_check_hidden_task(const struct task_struct *task)
70598 +{
70599 + if (unlikely(!(gr_status & GR_READY)))
70600 + return 0;
70601 +
70602 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
70603 + return 1;
70604 +
70605 + return 0;
70606 +}
70607 +
70608 +int
70609 +gr_check_protected_task(const struct task_struct *task)
70610 +{
70611 + if (unlikely(!(gr_status & GR_READY) || !task))
70612 + return 0;
70613 +
70614 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70615 + task->acl != current->acl)
70616 + return 1;
70617 +
70618 + return 0;
70619 +}
70620 +
70621 +int
70622 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70623 +{
70624 + struct task_struct *p;
70625 + int ret = 0;
70626 +
70627 + if (unlikely(!(gr_status & GR_READY) || !pid))
70628 + return ret;
70629 +
70630 + read_lock(&tasklist_lock);
70631 + do_each_pid_task(pid, type, p) {
70632 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70633 + p->acl != current->acl) {
70634 + ret = 1;
70635 + goto out;
70636 + }
70637 + } while_each_pid_task(pid, type, p);
70638 +out:
70639 + read_unlock(&tasklist_lock);
70640 +
70641 + return ret;
70642 +}
70643 +
70644 +void
70645 +gr_copy_label(struct task_struct *tsk)
70646 +{
70647 + struct task_struct *p = current;
70648 +
70649 + tsk->inherited = p->inherited;
70650 + tsk->acl_sp_role = 0;
70651 + tsk->acl_role_id = p->acl_role_id;
70652 + tsk->acl = p->acl;
70653 + tsk->role = p->role;
70654 + tsk->signal->used_accept = 0;
70655 + tsk->signal->curr_ip = p->signal->curr_ip;
70656 + tsk->signal->saved_ip = p->signal->saved_ip;
70657 + if (p->exec_file)
70658 + get_file(p->exec_file);
70659 + tsk->exec_file = p->exec_file;
70660 + tsk->is_writable = p->is_writable;
70661 + if (unlikely(p->signal->used_accept)) {
70662 + p->signal->curr_ip = 0;
70663 + p->signal->saved_ip = 0;
70664 + }
70665 +
70666 + return;
70667 +}
70668 +
70669 +extern int gr_process_kernel_setuid_ban(struct user_struct *user);
70670 +
70671 +int
70672 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70673 +{
70674 + unsigned int i;
70675 + __u16 num;
70676 + uid_t *uidlist;
70677 + uid_t curuid;
70678 + int realok = 0;
70679 + int effectiveok = 0;
70680 + int fsok = 0;
70681 + uid_t globalreal, globaleffective, globalfs;
70682 +
70683 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
70684 + struct user_struct *user;
70685 +
70686 + if (!uid_valid(real))
70687 + goto skipit;
70688 +
70689 + /* find user based on global namespace */
70690 +
70691 + globalreal = GR_GLOBAL_UID(real);
70692 +
70693 + user = find_user(make_kuid(&init_user_ns, globalreal));
70694 + if (user == NULL)
70695 + goto skipit;
70696 +
70697 + if (gr_process_kernel_setuid_ban(user)) {
70698 + /* for find_user */
70699 + free_uid(user);
70700 + return 1;
70701 + }
70702 +
70703 + /* for find_user */
70704 + free_uid(user);
70705 +
70706 +skipit:
70707 +#endif
70708 +
70709 + if (unlikely(!(gr_status & GR_READY)))
70710 + return 0;
70711 +
70712 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70713 + gr_log_learn_uid_change(real, effective, fs);
70714 +
70715 + num = current->acl->user_trans_num;
70716 + uidlist = current->acl->user_transitions;
70717 +
70718 + if (uidlist == NULL)
70719 + return 0;
70720 +
70721 + if (!uid_valid(real)) {
70722 + realok = 1;
70723 + globalreal = (uid_t)-1;
70724 + } else {
70725 + globalreal = GR_GLOBAL_UID(real);
70726 + }
70727 + if (!uid_valid(effective)) {
70728 + effectiveok = 1;
70729 + globaleffective = (uid_t)-1;
70730 + } else {
70731 + globaleffective = GR_GLOBAL_UID(effective);
70732 + }
70733 + if (!uid_valid(fs)) {
70734 + fsok = 1;
70735 + globalfs = (uid_t)-1;
70736 + } else {
70737 + globalfs = GR_GLOBAL_UID(fs);
70738 + }
70739 +
70740 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
70741 + for (i = 0; i < num; i++) {
70742 + curuid = uidlist[i];
70743 + if (globalreal == curuid)
70744 + realok = 1;
70745 + if (globaleffective == curuid)
70746 + effectiveok = 1;
70747 + if (globalfs == curuid)
70748 + fsok = 1;
70749 + }
70750 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
70751 + for (i = 0; i < num; i++) {
70752 + curuid = uidlist[i];
70753 + if (globalreal == curuid)
70754 + break;
70755 + if (globaleffective == curuid)
70756 + break;
70757 + if (globalfs == curuid)
70758 + break;
70759 + }
70760 + /* not in deny list */
70761 + if (i == num) {
70762 + realok = 1;
70763 + effectiveok = 1;
70764 + fsok = 1;
70765 + }
70766 + }
70767 +
70768 + if (realok && effectiveok && fsok)
70769 + return 0;
70770 + else {
70771 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70772 + return 1;
70773 + }
70774 +}
70775 +
70776 +int
70777 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70778 +{
70779 + unsigned int i;
70780 + __u16 num;
70781 + gid_t *gidlist;
70782 + gid_t curgid;
70783 + int realok = 0;
70784 + int effectiveok = 0;
70785 + int fsok = 0;
70786 + gid_t globalreal, globaleffective, globalfs;
70787 +
70788 + if (unlikely(!(gr_status & GR_READY)))
70789 + return 0;
70790 +
70791 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70792 + gr_log_learn_gid_change(real, effective, fs);
70793 +
70794 + num = current->acl->group_trans_num;
70795 + gidlist = current->acl->group_transitions;
70796 +
70797 + if (gidlist == NULL)
70798 + return 0;
70799 +
70800 + if (!gid_valid(real)) {
70801 + realok = 1;
70802 + globalreal = (gid_t)-1;
70803 + } else {
70804 + globalreal = GR_GLOBAL_GID(real);
70805 + }
70806 + if (!gid_valid(effective)) {
70807 + effectiveok = 1;
70808 + globaleffective = (gid_t)-1;
70809 + } else {
70810 + globaleffective = GR_GLOBAL_GID(effective);
70811 + }
70812 + if (!gid_valid(fs)) {
70813 + fsok = 1;
70814 + globalfs = (gid_t)-1;
70815 + } else {
70816 + globalfs = GR_GLOBAL_GID(fs);
70817 + }
70818 +
70819 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
70820 + for (i = 0; i < num; i++) {
70821 + curgid = gidlist[i];
70822 + if (globalreal == curgid)
70823 + realok = 1;
70824 + if (globaleffective == curgid)
70825 + effectiveok = 1;
70826 + if (globalfs == curgid)
70827 + fsok = 1;
70828 + }
70829 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
70830 + for (i = 0; i < num; i++) {
70831 + curgid = gidlist[i];
70832 + if (globalreal == curgid)
70833 + break;
70834 + if (globaleffective == curgid)
70835 + break;
70836 + if (globalfs == curgid)
70837 + break;
70838 + }
70839 + /* not in deny list */
70840 + if (i == num) {
70841 + realok = 1;
70842 + effectiveok = 1;
70843 + fsok = 1;
70844 + }
70845 + }
70846 +
70847 + if (realok && effectiveok && fsok)
70848 + return 0;
70849 + else {
70850 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70851 + return 1;
70852 + }
70853 +}
70854 +
70855 +extern int gr_acl_is_capable(const int cap);
70856 +
70857 +void
70858 +gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
70859 +{
70860 + struct acl_role_label *role = task->role;
70861 + struct acl_subject_label *subj = NULL;
70862 + struct acl_object_label *obj;
70863 + struct file *filp;
70864 + uid_t uid;
70865 + gid_t gid;
70866 +
70867 + if (unlikely(!(gr_status & GR_READY)))
70868 + return;
70869 +
70870 + uid = GR_GLOBAL_UID(kuid);
70871 + gid = GR_GLOBAL_GID(kgid);
70872 +
70873 + filp = task->exec_file;
70874 +
70875 + /* kernel process, we'll give them the kernel role */
70876 + if (unlikely(!filp)) {
70877 + task->role = running_polstate.kernel_role;
70878 + task->acl = running_polstate.kernel_role->root_label;
70879 + return;
70880 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
70881 + /* save the current ip at time of role lookup so that the proper
70882 + IP will be learned for role_allowed_ip */
70883 + task->signal->saved_ip = task->signal->curr_ip;
70884 + role = lookup_acl_role_label(task, uid, gid);
70885 + }
70886 +
70887 + /* don't change the role if we're not a privileged process */
70888 + if (role && task->role != role &&
70889 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
70890 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
70891 + return;
70892 +
70893 + /* perform subject lookup in possibly new role
70894 + we can use this result below in the case where role == task->role
70895 + */
70896 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
70897 +
70898 + /* if we changed uid/gid, but result in the same role
70899 + and are using inheritance, don't lose the inherited subject
70900 + if current subject is other than what normal lookup
70901 + would result in, we arrived via inheritance, don't
70902 + lose subject
70903 + */
70904 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
70905 + (subj == task->acl)))
70906 + task->acl = subj;
70907 +
70908 + /* leave task->inherited unaffected */
70909 +
70910 + task->role = role;
70911 +
70912 + task->is_writable = 0;
70913 +
70914 + /* ignore additional mmap checks for processes that are writable
70915 + by the default ACL */
70916 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70917 + if (unlikely(obj->mode & GR_WRITE))
70918 + task->is_writable = 1;
70919 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70920 + if (unlikely(obj->mode & GR_WRITE))
70921 + task->is_writable = 1;
70922 +
70923 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70924 + 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);
70925 +#endif
70926 +
70927 + gr_set_proc_res(task);
70928 +
70929 + return;
70930 +}
70931 +
70932 +int
70933 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
70934 + const int unsafe_flags)
70935 +{
70936 + struct task_struct *task = current;
70937 + struct acl_subject_label *newacl;
70938 + struct acl_object_label *obj;
70939 + __u32 retmode;
70940 +
70941 + if (unlikely(!(gr_status & GR_READY)))
70942 + return 0;
70943 +
70944 + newacl = chk_subj_label(dentry, mnt, task->role);
70945 +
70946 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
70947 + did an exec
70948 + */
70949 + rcu_read_lock();
70950 + read_lock(&tasklist_lock);
70951 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
70952 + (task->parent->acl->mode & GR_POVERRIDE))) {
70953 + read_unlock(&tasklist_lock);
70954 + rcu_read_unlock();
70955 + goto skip_check;
70956 + }
70957 + read_unlock(&tasklist_lock);
70958 + rcu_read_unlock();
70959 +
70960 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
70961 + !(task->role->roletype & GR_ROLE_GOD) &&
70962 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
70963 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70964 + if (unsafe_flags & LSM_UNSAFE_SHARE)
70965 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
70966 + else
70967 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
70968 + return -EACCES;
70969 + }
70970 +
70971 +skip_check:
70972 +
70973 + obj = chk_obj_label(dentry, mnt, task->acl);
70974 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
70975 +
70976 + if (!(task->acl->mode & GR_INHERITLEARN) &&
70977 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
70978 + if (obj->nested)
70979 + task->acl = obj->nested;
70980 + else
70981 + task->acl = newacl;
70982 + task->inherited = 0;
70983 + } else {
70984 + task->inherited = 1;
70985 + if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
70986 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
70987 + }
70988 +
70989 + task->is_writable = 0;
70990 +
70991 + /* ignore additional mmap checks for processes that are writable
70992 + by the default ACL */
70993 + obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
70994 + if (unlikely(obj->mode & GR_WRITE))
70995 + task->is_writable = 1;
70996 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
70997 + if (unlikely(obj->mode & GR_WRITE))
70998 + task->is_writable = 1;
70999 +
71000 + gr_set_proc_res(task);
71001 +
71002 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71003 + 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);
71004 +#endif
71005 + return 0;
71006 +}
71007 +
71008 +/* always called with valid inodev ptr */
71009 +static void
71010 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
71011 +{
71012 + struct acl_object_label *matchpo;
71013 + struct acl_subject_label *matchps;
71014 + struct acl_subject_label *subj;
71015 + struct acl_role_label *role;
71016 + unsigned int x;
71017 +
71018 + FOR_EACH_ROLE_START(role)
71019 + FOR_EACH_SUBJECT_START(role, subj, x)
71020 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71021 + matchpo->mode |= GR_DELETED;
71022 + FOR_EACH_SUBJECT_END(subj,x)
71023 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
71024 + /* nested subjects aren't in the role's subj_hash table */
71025 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71026 + matchpo->mode |= GR_DELETED;
71027 + FOR_EACH_NESTED_SUBJECT_END(subj)
71028 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
71029 + matchps->mode |= GR_DELETED;
71030 + FOR_EACH_ROLE_END(role)
71031 +
71032 + inodev->nentry->deleted = 1;
71033 +
71034 + return;
71035 +}
71036 +
71037 +void
71038 +gr_handle_delete(const ino_t ino, const dev_t dev)
71039 +{
71040 + struct inodev_entry *inodev;
71041 +
71042 + if (unlikely(!(gr_status & GR_READY)))
71043 + return;
71044 +
71045 + write_lock(&gr_inode_lock);
71046 + inodev = lookup_inodev_entry(ino, dev);
71047 + if (inodev != NULL)
71048 + do_handle_delete(inodev, ino, dev);
71049 + write_unlock(&gr_inode_lock);
71050 +
71051 + return;
71052 +}
71053 +
71054 +static void
71055 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
71056 + const ino_t newinode, const dev_t newdevice,
71057 + struct acl_subject_label *subj)
71058 +{
71059 + unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
71060 + struct acl_object_label *match;
71061 +
71062 + match = subj->obj_hash[index];
71063 +
71064 + while (match && (match->inode != oldinode ||
71065 + match->device != olddevice ||
71066 + !(match->mode & GR_DELETED)))
71067 + match = match->next;
71068 +
71069 + if (match && (match->inode == oldinode)
71070 + && (match->device == olddevice)
71071 + && (match->mode & GR_DELETED)) {
71072 + if (match->prev == NULL) {
71073 + subj->obj_hash[index] = match->next;
71074 + if (match->next != NULL)
71075 + match->next->prev = NULL;
71076 + } else {
71077 + match->prev->next = match->next;
71078 + if (match->next != NULL)
71079 + match->next->prev = match->prev;
71080 + }
71081 + match->prev = NULL;
71082 + match->next = NULL;
71083 + match->inode = newinode;
71084 + match->device = newdevice;
71085 + match->mode &= ~GR_DELETED;
71086 +
71087 + insert_acl_obj_label(match, subj);
71088 + }
71089 +
71090 + return;
71091 +}
71092 +
71093 +static void
71094 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
71095 + const ino_t newinode, const dev_t newdevice,
71096 + struct acl_role_label *role)
71097 +{
71098 + unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
71099 + struct acl_subject_label *match;
71100 +
71101 + match = role->subj_hash[index];
71102 +
71103 + while (match && (match->inode != oldinode ||
71104 + match->device != olddevice ||
71105 + !(match->mode & GR_DELETED)))
71106 + match = match->next;
71107 +
71108 + if (match && (match->inode == oldinode)
71109 + && (match->device == olddevice)
71110 + && (match->mode & GR_DELETED)) {
71111 + if (match->prev == NULL) {
71112 + role->subj_hash[index] = match->next;
71113 + if (match->next != NULL)
71114 + match->next->prev = NULL;
71115 + } else {
71116 + match->prev->next = match->next;
71117 + if (match->next != NULL)
71118 + match->next->prev = match->prev;
71119 + }
71120 + match->prev = NULL;
71121 + match->next = NULL;
71122 + match->inode = newinode;
71123 + match->device = newdevice;
71124 + match->mode &= ~GR_DELETED;
71125 +
71126 + insert_acl_subj_label(match, role);
71127 + }
71128 +
71129 + return;
71130 +}
71131 +
71132 +static void
71133 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
71134 + const ino_t newinode, const dev_t newdevice)
71135 +{
71136 + unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71137 + struct inodev_entry *match;
71138 +
71139 + match = running_polstate.inodev_set.i_hash[index];
71140 +
71141 + while (match && (match->nentry->inode != oldinode ||
71142 + match->nentry->device != olddevice || !match->nentry->deleted))
71143 + match = match->next;
71144 +
71145 + if (match && (match->nentry->inode == oldinode)
71146 + && (match->nentry->device == olddevice) &&
71147 + match->nentry->deleted) {
71148 + if (match->prev == NULL) {
71149 + running_polstate.inodev_set.i_hash[index] = match->next;
71150 + if (match->next != NULL)
71151 + match->next->prev = NULL;
71152 + } else {
71153 + match->prev->next = match->next;
71154 + if (match->next != NULL)
71155 + match->next->prev = match->prev;
71156 + }
71157 + match->prev = NULL;
71158 + match->next = NULL;
71159 + match->nentry->inode = newinode;
71160 + match->nentry->device = newdevice;
71161 + match->nentry->deleted = 0;
71162 +
71163 + insert_inodev_entry(match);
71164 + }
71165 +
71166 + return;
71167 +}
71168 +
71169 +static void
71170 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
71171 +{
71172 + struct acl_subject_label *subj;
71173 + struct acl_role_label *role;
71174 + unsigned int x;
71175 +
71176 + FOR_EACH_ROLE_START(role)
71177 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71178 +
71179 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
71180 + if ((subj->inode == ino) && (subj->device == dev)) {
71181 + subj->inode = ino;
71182 + subj->device = dev;
71183 + }
71184 + /* nested subjects aren't in the role's subj_hash table */
71185 + update_acl_obj_label(matchn->inode, matchn->device,
71186 + ino, dev, subj);
71187 + FOR_EACH_NESTED_SUBJECT_END(subj)
71188 + FOR_EACH_SUBJECT_START(role, subj, x)
71189 + update_acl_obj_label(matchn->inode, matchn->device,
71190 + ino, dev, subj);
71191 + FOR_EACH_SUBJECT_END(subj,x)
71192 + FOR_EACH_ROLE_END(role)
71193 +
71194 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71195 +
71196 + return;
71197 +}
71198 +
71199 +static void
71200 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71201 + const struct vfsmount *mnt)
71202 +{
71203 + ino_t ino = dentry->d_inode->i_ino;
71204 + dev_t dev = __get_dev(dentry);
71205 +
71206 + __do_handle_create(matchn, ino, dev);
71207 +
71208 + return;
71209 +}
71210 +
71211 +void
71212 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71213 +{
71214 + struct name_entry *matchn;
71215 +
71216 + if (unlikely(!(gr_status & GR_READY)))
71217 + return;
71218 +
71219 + preempt_disable();
71220 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71221 +
71222 + if (unlikely((unsigned long)matchn)) {
71223 + write_lock(&gr_inode_lock);
71224 + do_handle_create(matchn, dentry, mnt);
71225 + write_unlock(&gr_inode_lock);
71226 + }
71227 + preempt_enable();
71228 +
71229 + return;
71230 +}
71231 +
71232 +void
71233 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71234 +{
71235 + struct name_entry *matchn;
71236 +
71237 + if (unlikely(!(gr_status & GR_READY)))
71238 + return;
71239 +
71240 + preempt_disable();
71241 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71242 +
71243 + if (unlikely((unsigned long)matchn)) {
71244 + write_lock(&gr_inode_lock);
71245 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71246 + write_unlock(&gr_inode_lock);
71247 + }
71248 + preempt_enable();
71249 +
71250 + return;
71251 +}
71252 +
71253 +void
71254 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71255 + struct dentry *old_dentry,
71256 + struct dentry *new_dentry,
71257 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71258 +{
71259 + struct name_entry *matchn;
71260 + struct name_entry *matchn2 = NULL;
71261 + struct inodev_entry *inodev;
71262 + struct inode *inode = new_dentry->d_inode;
71263 + ino_t old_ino = old_dentry->d_inode->i_ino;
71264 + dev_t old_dev = __get_dev(old_dentry);
71265 + unsigned int exchange = flags & RENAME_EXCHANGE;
71266 +
71267 + /* vfs_rename swaps the name and parent link for old_dentry and
71268 + new_dentry
71269 + at this point, old_dentry has the new name, parent link, and inode
71270 + for the renamed file
71271 + if a file is being replaced by a rename, new_dentry has the inode
71272 + and name for the replaced file
71273 + */
71274 +
71275 + if (unlikely(!(gr_status & GR_READY)))
71276 + return;
71277 +
71278 + preempt_disable();
71279 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71280 +
71281 + /* exchange cases:
71282 + a filename exists for the source, but not dest
71283 + do a recreate on source
71284 + a filename exists for the dest, but not source
71285 + do a recreate on dest
71286 + a filename exists for both source and dest
71287 + delete source and dest, then create source and dest
71288 + a filename exists for neither source nor dest
71289 + no updates needed
71290 +
71291 + the name entry lookups get us the old inode/dev associated with
71292 + each name, so do the deletes first (if possible) so that when
71293 + we do the create, we pick up on the right entries
71294 + */
71295 +
71296 + if (exchange)
71297 + matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
71298 +
71299 + /* we wouldn't have to check d_inode if it weren't for
71300 + NFS silly-renaming
71301 + */
71302 +
71303 + write_lock(&gr_inode_lock);
71304 + if (unlikely((replace || exchange) && inode)) {
71305 + ino_t new_ino = inode->i_ino;
71306 + dev_t new_dev = __get_dev(new_dentry);
71307 +
71308 + inodev = lookup_inodev_entry(new_ino, new_dev);
71309 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
71310 + do_handle_delete(inodev, new_ino, new_dev);
71311 + }
71312 +
71313 + inodev = lookup_inodev_entry(old_ino, old_dev);
71314 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
71315 + do_handle_delete(inodev, old_ino, old_dev);
71316 +
71317 + if (unlikely(matchn != NULL))
71318 + do_handle_create(matchn, old_dentry, mnt);
71319 +
71320 + if (unlikely(matchn2 != NULL))
71321 + do_handle_create(matchn2, new_dentry, mnt);
71322 +
71323 + write_unlock(&gr_inode_lock);
71324 + preempt_enable();
71325 +
71326 + return;
71327 +}
71328 +
71329 +#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
71330 +static const unsigned long res_learn_bumps[GR_NLIMITS] = {
71331 + [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
71332 + [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
71333 + [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
71334 + [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
71335 + [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
71336 + [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
71337 + [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
71338 + [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
71339 + [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
71340 + [RLIMIT_AS] = GR_RLIM_AS_BUMP,
71341 + [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
71342 + [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
71343 + [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
71344 + [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
71345 + [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
71346 + [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
71347 +};
71348 +
71349 +void
71350 +gr_learn_resource(const struct task_struct *task,
71351 + const int res, const unsigned long wanted, const int gt)
71352 +{
71353 + struct acl_subject_label *acl;
71354 + const struct cred *cred;
71355 +
71356 + if (unlikely((gr_status & GR_READY) &&
71357 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
71358 + goto skip_reslog;
71359 +
71360 + gr_log_resource(task, res, wanted, gt);
71361 +skip_reslog:
71362 +
71363 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
71364 + return;
71365 +
71366 + acl = task->acl;
71367 +
71368 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
71369 + !(acl->resmask & (1U << (unsigned short) res))))
71370 + return;
71371 +
71372 + if (wanted >= acl->res[res].rlim_cur) {
71373 + unsigned long res_add;
71374 +
71375 + res_add = wanted + res_learn_bumps[res];
71376 +
71377 + acl->res[res].rlim_cur = res_add;
71378 +
71379 + if (wanted > acl->res[res].rlim_max)
71380 + acl->res[res].rlim_max = res_add;
71381 +
71382 + /* only log the subject filename, since resource logging is supported for
71383 + single-subject learning only */
71384 + rcu_read_lock();
71385 + cred = __task_cred(task);
71386 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71387 + task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
71388 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
71389 + "", (unsigned long) res, &task->signal->saved_ip);
71390 + rcu_read_unlock();
71391 + }
71392 +
71393 + return;
71394 +}
71395 +EXPORT_SYMBOL_GPL(gr_learn_resource);
71396 +#endif
71397 +
71398 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
71399 +void
71400 +pax_set_initial_flags(struct linux_binprm *bprm)
71401 +{
71402 + struct task_struct *task = current;
71403 + struct acl_subject_label *proc;
71404 + unsigned long flags;
71405 +
71406 + if (unlikely(!(gr_status & GR_READY)))
71407 + return;
71408 +
71409 + flags = pax_get_flags(task);
71410 +
71411 + proc = task->acl;
71412 +
71413 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
71414 + flags &= ~MF_PAX_PAGEEXEC;
71415 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
71416 + flags &= ~MF_PAX_SEGMEXEC;
71417 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
71418 + flags &= ~MF_PAX_RANDMMAP;
71419 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
71420 + flags &= ~MF_PAX_EMUTRAMP;
71421 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
71422 + flags &= ~MF_PAX_MPROTECT;
71423 +
71424 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
71425 + flags |= MF_PAX_PAGEEXEC;
71426 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
71427 + flags |= MF_PAX_SEGMEXEC;
71428 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
71429 + flags |= MF_PAX_RANDMMAP;
71430 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
71431 + flags |= MF_PAX_EMUTRAMP;
71432 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
71433 + flags |= MF_PAX_MPROTECT;
71434 +
71435 + pax_set_flags(task, flags);
71436 +
71437 + return;
71438 +}
71439 +#endif
71440 +
71441 +int
71442 +gr_handle_proc_ptrace(struct task_struct *task)
71443 +{
71444 + struct file *filp;
71445 + struct task_struct *tmp = task;
71446 + struct task_struct *curtemp = current;
71447 + __u32 retmode;
71448 +
71449 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71450 + if (unlikely(!(gr_status & GR_READY)))
71451 + return 0;
71452 +#endif
71453 +
71454 + read_lock(&tasklist_lock);
71455 + read_lock(&grsec_exec_file_lock);
71456 + filp = task->exec_file;
71457 +
71458 + while (task_pid_nr(tmp) > 0) {
71459 + if (tmp == curtemp)
71460 + break;
71461 + tmp = tmp->real_parent;
71462 + }
71463 +
71464 + if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71465 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
71466 + read_unlock(&grsec_exec_file_lock);
71467 + read_unlock(&tasklist_lock);
71468 + return 1;
71469 + }
71470 +
71471 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71472 + if (!(gr_status & GR_READY)) {
71473 + read_unlock(&grsec_exec_file_lock);
71474 + read_unlock(&tasklist_lock);
71475 + return 0;
71476 + }
71477 +#endif
71478 +
71479 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
71480 + read_unlock(&grsec_exec_file_lock);
71481 + read_unlock(&tasklist_lock);
71482 +
71483 + if (retmode & GR_NOPTRACE)
71484 + return 1;
71485 +
71486 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
71487 + && (current->acl != task->acl || (current->acl != current->role->root_label
71488 + && task_pid_nr(current) != task_pid_nr(task))))
71489 + return 1;
71490 +
71491 + return 0;
71492 +}
71493 +
71494 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
71495 +{
71496 + if (unlikely(!(gr_status & GR_READY)))
71497 + return;
71498 +
71499 + if (!(current->role->roletype & GR_ROLE_GOD))
71500 + return;
71501 +
71502 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
71503 + p->role->rolename, gr_task_roletype_to_char(p),
71504 + p->acl->filename);
71505 +}
71506 +
71507 +int
71508 +gr_handle_ptrace(struct task_struct *task, const long request)
71509 +{
71510 + struct task_struct *tmp = task;
71511 + struct task_struct *curtemp = current;
71512 + __u32 retmode;
71513 +
71514 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71515 + if (unlikely(!(gr_status & GR_READY)))
71516 + return 0;
71517 +#endif
71518 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
71519 + read_lock(&tasklist_lock);
71520 + while (task_pid_nr(tmp) > 0) {
71521 + if (tmp == curtemp)
71522 + break;
71523 + tmp = tmp->real_parent;
71524 + }
71525 +
71526 + if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71527 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
71528 + read_unlock(&tasklist_lock);
71529 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71530 + return 1;
71531 + }
71532 + read_unlock(&tasklist_lock);
71533 + }
71534 +
71535 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71536 + if (!(gr_status & GR_READY))
71537 + return 0;
71538 +#endif
71539 +
71540 + read_lock(&grsec_exec_file_lock);
71541 + if (unlikely(!task->exec_file)) {
71542 + read_unlock(&grsec_exec_file_lock);
71543 + return 0;
71544 + }
71545 +
71546 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
71547 + read_unlock(&grsec_exec_file_lock);
71548 +
71549 + if (retmode & GR_NOPTRACE) {
71550 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71551 + return 1;
71552 + }
71553 +
71554 + if (retmode & GR_PTRACERD) {
71555 + switch (request) {
71556 + case PTRACE_SEIZE:
71557 + case PTRACE_POKETEXT:
71558 + case PTRACE_POKEDATA:
71559 + case PTRACE_POKEUSR:
71560 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
71561 + case PTRACE_SETREGS:
71562 + case PTRACE_SETFPREGS:
71563 +#endif
71564 +#ifdef CONFIG_X86
71565 + case PTRACE_SETFPXREGS:
71566 +#endif
71567 +#ifdef CONFIG_ALTIVEC
71568 + case PTRACE_SETVRREGS:
71569 +#endif
71570 + return 1;
71571 + default:
71572 + return 0;
71573 + }
71574 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
71575 + !(current->role->roletype & GR_ROLE_GOD) &&
71576 + (current->acl != task->acl)) {
71577 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71578 + return 1;
71579 + }
71580 +
71581 + return 0;
71582 +}
71583 +
71584 +static int is_writable_mmap(const struct file *filp)
71585 +{
71586 + struct task_struct *task = current;
71587 + struct acl_object_label *obj, *obj2;
71588 +
71589 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
71590 + !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))) {
71591 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71592 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
71593 + task->role->root_label);
71594 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
71595 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
71596 + return 1;
71597 + }
71598 + }
71599 + return 0;
71600 +}
71601 +
71602 +int
71603 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
71604 +{
71605 + __u32 mode;
71606 +
71607 + if (unlikely(!file || !(prot & PROT_EXEC)))
71608 + return 1;
71609 +
71610 + if (is_writable_mmap(file))
71611 + return 0;
71612 +
71613 + mode =
71614 + gr_search_file(file->f_path.dentry,
71615 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71616 + file->f_path.mnt);
71617 +
71618 + if (!gr_tpe_allow(file))
71619 + return 0;
71620 +
71621 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71622 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71623 + return 0;
71624 + } else if (unlikely(!(mode & GR_EXEC))) {
71625 + return 0;
71626 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71627 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71628 + return 1;
71629 + }
71630 +
71631 + return 1;
71632 +}
71633 +
71634 +int
71635 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
71636 +{
71637 + __u32 mode;
71638 +
71639 + if (unlikely(!file || !(prot & PROT_EXEC)))
71640 + return 1;
71641 +
71642 + if (is_writable_mmap(file))
71643 + return 0;
71644 +
71645 + mode =
71646 + gr_search_file(file->f_path.dentry,
71647 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71648 + file->f_path.mnt);
71649 +
71650 + if (!gr_tpe_allow(file))
71651 + return 0;
71652 +
71653 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71654 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71655 + return 0;
71656 + } else if (unlikely(!(mode & GR_EXEC))) {
71657 + return 0;
71658 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71659 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71660 + return 1;
71661 + }
71662 +
71663 + return 1;
71664 +}
71665 +
71666 +void
71667 +gr_acl_handle_psacct(struct task_struct *task, const long code)
71668 +{
71669 + unsigned long runtime, cputime;
71670 + cputime_t utime, stime;
71671 + unsigned int wday, cday;
71672 + __u8 whr, chr;
71673 + __u8 wmin, cmin;
71674 + __u8 wsec, csec;
71675 + struct timespec curtime, starttime;
71676 +
71677 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
71678 + !(task->acl->mode & GR_PROCACCT)))
71679 + return;
71680 +
71681 + curtime = ns_to_timespec(ktime_get_ns());
71682 + starttime = ns_to_timespec(task->start_time);
71683 + runtime = curtime.tv_sec - starttime.tv_sec;
71684 + wday = runtime / (60 * 60 * 24);
71685 + runtime -= wday * (60 * 60 * 24);
71686 + whr = runtime / (60 * 60);
71687 + runtime -= whr * (60 * 60);
71688 + wmin = runtime / 60;
71689 + runtime -= wmin * 60;
71690 + wsec = runtime;
71691 +
71692 + task_cputime(task, &utime, &stime);
71693 + cputime = cputime_to_secs(utime + stime);
71694 + cday = cputime / (60 * 60 * 24);
71695 + cputime -= cday * (60 * 60 * 24);
71696 + chr = cputime / (60 * 60);
71697 + cputime -= chr * (60 * 60);
71698 + cmin = cputime / 60;
71699 + cputime -= cmin * 60;
71700 + csec = cputime;
71701 +
71702 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
71703 +
71704 + return;
71705 +}
71706 +
71707 +#ifdef CONFIG_TASKSTATS
71708 +int gr_is_taskstats_denied(int pid)
71709 +{
71710 + struct task_struct *task;
71711 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71712 + const struct cred *cred;
71713 +#endif
71714 + int ret = 0;
71715 +
71716 + /* restrict taskstats viewing to un-chrooted root users
71717 + who have the 'view' subject flag if the RBAC system is enabled
71718 + */
71719 +
71720 + rcu_read_lock();
71721 + read_lock(&tasklist_lock);
71722 + task = find_task_by_vpid(pid);
71723 + if (task) {
71724 +#ifdef CONFIG_GRKERNSEC_CHROOT
71725 + if (proc_is_chrooted(task))
71726 + ret = -EACCES;
71727 +#endif
71728 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71729 + cred = __task_cred(task);
71730 +#ifdef CONFIG_GRKERNSEC_PROC_USER
71731 + if (gr_is_global_nonroot(cred->uid))
71732 + ret = -EACCES;
71733 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71734 + if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
71735 + ret = -EACCES;
71736 +#endif
71737 +#endif
71738 + if (gr_status & GR_READY) {
71739 + if (!(task->acl->mode & GR_VIEW))
71740 + ret = -EACCES;
71741 + }
71742 + } else
71743 + ret = -ENOENT;
71744 +
71745 + read_unlock(&tasklist_lock);
71746 + rcu_read_unlock();
71747 +
71748 + return ret;
71749 +}
71750 +#endif
71751 +
71752 +/* AUXV entries are filled via a descendant of search_binary_handler
71753 + after we've already applied the subject for the target
71754 +*/
71755 +int gr_acl_enable_at_secure(void)
71756 +{
71757 + if (unlikely(!(gr_status & GR_READY)))
71758 + return 0;
71759 +
71760 + if (current->acl->mode & GR_ATSECURE)
71761 + return 1;
71762 +
71763 + return 0;
71764 +}
71765 +
71766 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
71767 +{
71768 + struct task_struct *task = current;
71769 + struct dentry *dentry = file->f_path.dentry;
71770 + struct vfsmount *mnt = file->f_path.mnt;
71771 + struct acl_object_label *obj, *tmp;
71772 + struct acl_subject_label *subj;
71773 + unsigned int bufsize;
71774 + int is_not_root;
71775 + char *path;
71776 + dev_t dev = __get_dev(dentry);
71777 +
71778 + if (unlikely(!(gr_status & GR_READY)))
71779 + return 1;
71780 +
71781 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71782 + return 1;
71783 +
71784 + /* ignore Eric Biederman */
71785 + if (IS_PRIVATE(dentry->d_inode))
71786 + return 1;
71787 +
71788 + subj = task->acl;
71789 + read_lock(&gr_inode_lock);
71790 + do {
71791 + obj = lookup_acl_obj_label(ino, dev, subj);
71792 + if (obj != NULL) {
71793 + read_unlock(&gr_inode_lock);
71794 + return (obj->mode & GR_FIND) ? 1 : 0;
71795 + }
71796 + } while ((subj = subj->parent_subject));
71797 + read_unlock(&gr_inode_lock);
71798 +
71799 + /* this is purely an optimization since we're looking for an object
71800 + for the directory we're doing a readdir on
71801 + if it's possible for any globbed object to match the entry we're
71802 + filling into the directory, then the object we find here will be
71803 + an anchor point with attached globbed objects
71804 + */
71805 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
71806 + if (obj->globbed == NULL)
71807 + return (obj->mode & GR_FIND) ? 1 : 0;
71808 +
71809 + is_not_root = ((obj->filename[0] == '/') &&
71810 + (obj->filename[1] == '\0')) ? 0 : 1;
71811 + bufsize = PAGE_SIZE - namelen - is_not_root;
71812 +
71813 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
71814 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
71815 + return 1;
71816 +
71817 + preempt_disable();
71818 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
71819 + bufsize);
71820 +
71821 + bufsize = strlen(path);
71822 +
71823 + /* if base is "/", don't append an additional slash */
71824 + if (is_not_root)
71825 + *(path + bufsize) = '/';
71826 + memcpy(path + bufsize + is_not_root, name, namelen);
71827 + *(path + bufsize + namelen + is_not_root) = '\0';
71828 +
71829 + tmp = obj->globbed;
71830 + while (tmp) {
71831 + if (!glob_match(tmp->filename, path)) {
71832 + preempt_enable();
71833 + return (tmp->mode & GR_FIND) ? 1 : 0;
71834 + }
71835 + tmp = tmp->next;
71836 + }
71837 + preempt_enable();
71838 + return (obj->mode & GR_FIND) ? 1 : 0;
71839 +}
71840 +
71841 +void gr_put_exec_file(struct task_struct *task)
71842 +{
71843 + struct file *filp;
71844 +
71845 + write_lock(&grsec_exec_file_lock);
71846 + filp = task->exec_file;
71847 + task->exec_file = NULL;
71848 + write_unlock(&grsec_exec_file_lock);
71849 +
71850 + if (filp)
71851 + fput(filp);
71852 +
71853 + return;
71854 +}
71855 +
71856 +
71857 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
71858 +EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
71859 +#endif
71860 +#ifdef CONFIG_SECURITY
71861 +EXPORT_SYMBOL_GPL(gr_check_user_change);
71862 +EXPORT_SYMBOL_GPL(gr_check_group_change);
71863 +#endif
71864 +
71865 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
71866 new file mode 100644
71867 index 0000000..18ffbbd
71868 --- /dev/null
71869 +++ b/grsecurity/gracl_alloc.c
71870 @@ -0,0 +1,105 @@
71871 +#include <linux/kernel.h>
71872 +#include <linux/mm.h>
71873 +#include <linux/slab.h>
71874 +#include <linux/vmalloc.h>
71875 +#include <linux/gracl.h>
71876 +#include <linux/grsecurity.h>
71877 +
71878 +static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
71879 +struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
71880 +
71881 +static __inline__ int
71882 +alloc_pop(void)
71883 +{
71884 + if (current_alloc_state->alloc_stack_next == 1)
71885 + return 0;
71886 +
71887 + kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
71888 +
71889 + current_alloc_state->alloc_stack_next--;
71890 +
71891 + return 1;
71892 +}
71893 +
71894 +static __inline__ int
71895 +alloc_push(void *buf)
71896 +{
71897 + if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
71898 + return 1;
71899 +
71900 + current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
71901 +
71902 + current_alloc_state->alloc_stack_next++;
71903 +
71904 + return 0;
71905 +}
71906 +
71907 +void *
71908 +acl_alloc(unsigned long len)
71909 +{
71910 + void *ret = NULL;
71911 +
71912 + if (!len || len > PAGE_SIZE)
71913 + goto out;
71914 +
71915 + ret = kmalloc(len, GFP_KERNEL);
71916 +
71917 + if (ret) {
71918 + if (alloc_push(ret)) {
71919 + kfree(ret);
71920 + ret = NULL;
71921 + }
71922 + }
71923 +
71924 +out:
71925 + return ret;
71926 +}
71927 +
71928 +void *
71929 +acl_alloc_num(unsigned long num, unsigned long len)
71930 +{
71931 + if (!len || (num > (PAGE_SIZE / len)))
71932 + return NULL;
71933 +
71934 + return acl_alloc(num * len);
71935 +}
71936 +
71937 +void
71938 +acl_free_all(void)
71939 +{
71940 + if (!current_alloc_state->alloc_stack)
71941 + return;
71942 +
71943 + while (alloc_pop()) ;
71944 +
71945 + if (current_alloc_state->alloc_stack) {
71946 + if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
71947 + kfree(current_alloc_state->alloc_stack);
71948 + else
71949 + vfree(current_alloc_state->alloc_stack);
71950 + }
71951 +
71952 + current_alloc_state->alloc_stack = NULL;
71953 + current_alloc_state->alloc_stack_size = 1;
71954 + current_alloc_state->alloc_stack_next = 1;
71955 +
71956 + return;
71957 +}
71958 +
71959 +int
71960 +acl_alloc_stack_init(unsigned long size)
71961 +{
71962 + if ((size * sizeof (void *)) <= PAGE_SIZE)
71963 + current_alloc_state->alloc_stack =
71964 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
71965 + else
71966 + current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
71967 +
71968 + current_alloc_state->alloc_stack_size = size;
71969 + current_alloc_state->alloc_stack_next = 1;
71970 +
71971 + if (!current_alloc_state->alloc_stack)
71972 + return 0;
71973 + else
71974 + return 1;
71975 +}
71976 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
71977 new file mode 100644
71978 index 0000000..1a94c11
71979 --- /dev/null
71980 +++ b/grsecurity/gracl_cap.c
71981 @@ -0,0 +1,127 @@
71982 +#include <linux/kernel.h>
71983 +#include <linux/module.h>
71984 +#include <linux/sched.h>
71985 +#include <linux/gracl.h>
71986 +#include <linux/grsecurity.h>
71987 +#include <linux/grinternal.h>
71988 +
71989 +extern const char *captab_log[];
71990 +extern int captab_log_entries;
71991 +
71992 +int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
71993 +{
71994 + struct acl_subject_label *curracl;
71995 +
71996 + if (!gr_acl_is_enabled())
71997 + return 1;
71998 +
71999 + curracl = task->acl;
72000 +
72001 + if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
72002 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72003 + task->role->roletype, GR_GLOBAL_UID(cred->uid),
72004 + GR_GLOBAL_GID(cred->gid), task->exec_file ?
72005 + gr_to_filename(task->exec_file->f_path.dentry,
72006 + task->exec_file->f_path.mnt) : curracl->filename,
72007 + curracl->filename, 0UL,
72008 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
72009 + return 1;
72010 + }
72011 +
72012 + return 0;
72013 +}
72014 +
72015 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
72016 +{
72017 + struct acl_subject_label *curracl;
72018 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72019 + kernel_cap_t cap_audit = __cap_empty_set;
72020 +
72021 + if (!gr_acl_is_enabled())
72022 + return 1;
72023 +
72024 + curracl = task->acl;
72025 +
72026 + cap_drop = curracl->cap_lower;
72027 + cap_mask = curracl->cap_mask;
72028 + cap_audit = curracl->cap_invert_audit;
72029 +
72030 + while ((curracl = curracl->parent_subject)) {
72031 + /* if the cap isn't specified in the current computed mask but is specified in the
72032 + current level subject, and is lowered in the current level subject, then add
72033 + it to the set of dropped capabilities
72034 + otherwise, add the current level subject's mask to the current computed mask
72035 + */
72036 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72037 + cap_raise(cap_mask, cap);
72038 + if (cap_raised(curracl->cap_lower, cap))
72039 + cap_raise(cap_drop, cap);
72040 + if (cap_raised(curracl->cap_invert_audit, cap))
72041 + cap_raise(cap_audit, cap);
72042 + }
72043 + }
72044 +
72045 + if (!cap_raised(cap_drop, cap)) {
72046 + if (cap_raised(cap_audit, cap))
72047 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
72048 + return 1;
72049 + }
72050 +
72051 + /* only learn the capability use if the process has the capability in the
72052 + general case, the two uses in sys.c of gr_learn_cap are an exception
72053 + to this rule to ensure any role transition involves what the full-learned
72054 + policy believes in a privileged process
72055 + */
72056 + if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
72057 + return 1;
72058 +
72059 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
72060 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
72061 +
72062 + return 0;
72063 +}
72064 +
72065 +int
72066 +gr_acl_is_capable(const int cap)
72067 +{
72068 + return gr_task_acl_is_capable(current, current_cred(), cap);
72069 +}
72070 +
72071 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
72072 +{
72073 + struct acl_subject_label *curracl;
72074 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72075 +
72076 + if (!gr_acl_is_enabled())
72077 + return 1;
72078 +
72079 + curracl = task->acl;
72080 +
72081 + cap_drop = curracl->cap_lower;
72082 + cap_mask = curracl->cap_mask;
72083 +
72084 + while ((curracl = curracl->parent_subject)) {
72085 + /* if the cap isn't specified in the current computed mask but is specified in the
72086 + current level subject, and is lowered in the current level subject, then add
72087 + it to the set of dropped capabilities
72088 + otherwise, add the current level subject's mask to the current computed mask
72089 + */
72090 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72091 + cap_raise(cap_mask, cap);
72092 + if (cap_raised(curracl->cap_lower, cap))
72093 + cap_raise(cap_drop, cap);
72094 + }
72095 + }
72096 +
72097 + if (!cap_raised(cap_drop, cap))
72098 + return 1;
72099 +
72100 + return 0;
72101 +}
72102 +
72103 +int
72104 +gr_acl_is_capable_nolog(const int cap)
72105 +{
72106 + return gr_task_acl_is_capable_nolog(current, cap);
72107 +}
72108 +
72109 diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72110 new file mode 100644
72111 index 0000000..ca25605
72112 --- /dev/null
72113 +++ b/grsecurity/gracl_compat.c
72114 @@ -0,0 +1,270 @@
72115 +#include <linux/kernel.h>
72116 +#include <linux/gracl.h>
72117 +#include <linux/compat.h>
72118 +#include <linux/gracl_compat.h>
72119 +
72120 +#include <asm/uaccess.h>
72121 +
72122 +int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72123 +{
72124 + struct gr_arg_wrapper_compat uwrapcompat;
72125 +
72126 + if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72127 + return -EFAULT;
72128 +
72129 + if (((uwrapcompat.version != GRSECURITY_VERSION) &&
72130 + (uwrapcompat.version != 0x2901)) ||
72131 + (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72132 + return -EINVAL;
72133 +
72134 + uwrap->arg = compat_ptr(uwrapcompat.arg);
72135 + uwrap->version = uwrapcompat.version;
72136 + uwrap->size = sizeof(struct gr_arg);
72137 +
72138 + return 0;
72139 +}
72140 +
72141 +int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72142 +{
72143 + struct gr_arg_compat argcompat;
72144 +
72145 + if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72146 + return -EFAULT;
72147 +
72148 + arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72149 + arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72150 + arg->role_db.num_roles = argcompat.role_db.num_roles;
72151 + arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72152 + arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72153 + arg->role_db.num_objects = argcompat.role_db.num_objects;
72154 +
72155 + memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72156 + memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72157 + memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72158 + memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72159 + arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72160 + arg->segv_device = argcompat.segv_device;
72161 + arg->segv_inode = argcompat.segv_inode;
72162 + arg->segv_uid = argcompat.segv_uid;
72163 + arg->num_sprole_pws = argcompat.num_sprole_pws;
72164 + arg->mode = argcompat.mode;
72165 +
72166 + return 0;
72167 +}
72168 +
72169 +int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72170 +{
72171 + struct acl_object_label_compat objcompat;
72172 +
72173 + if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72174 + return -EFAULT;
72175 +
72176 + obj->filename = compat_ptr(objcompat.filename);
72177 + obj->inode = objcompat.inode;
72178 + obj->device = objcompat.device;
72179 + obj->mode = objcompat.mode;
72180 +
72181 + obj->nested = compat_ptr(objcompat.nested);
72182 + obj->globbed = compat_ptr(objcompat.globbed);
72183 +
72184 + obj->prev = compat_ptr(objcompat.prev);
72185 + obj->next = compat_ptr(objcompat.next);
72186 +
72187 + return 0;
72188 +}
72189 +
72190 +int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72191 +{
72192 + unsigned int i;
72193 + struct acl_subject_label_compat subjcompat;
72194 +
72195 + if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72196 + return -EFAULT;
72197 +
72198 + subj->filename = compat_ptr(subjcompat.filename);
72199 + subj->inode = subjcompat.inode;
72200 + subj->device = subjcompat.device;
72201 + subj->mode = subjcompat.mode;
72202 + subj->cap_mask = subjcompat.cap_mask;
72203 + subj->cap_lower = subjcompat.cap_lower;
72204 + subj->cap_invert_audit = subjcompat.cap_invert_audit;
72205 +
72206 + for (i = 0; i < GR_NLIMITS; i++) {
72207 + if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72208 + subj->res[i].rlim_cur = RLIM_INFINITY;
72209 + else
72210 + subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72211 + if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72212 + subj->res[i].rlim_max = RLIM_INFINITY;
72213 + else
72214 + subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72215 + }
72216 + subj->resmask = subjcompat.resmask;
72217 +
72218 + subj->user_trans_type = subjcompat.user_trans_type;
72219 + subj->group_trans_type = subjcompat.group_trans_type;
72220 + subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72221 + subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72222 + subj->user_trans_num = subjcompat.user_trans_num;
72223 + subj->group_trans_num = subjcompat.group_trans_num;
72224 +
72225 + memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72226 + memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72227 + subj->ip_type = subjcompat.ip_type;
72228 + subj->ips = compat_ptr(subjcompat.ips);
72229 + subj->ip_num = subjcompat.ip_num;
72230 + subj->inaddr_any_override = subjcompat.inaddr_any_override;
72231 +
72232 + subj->crashes = subjcompat.crashes;
72233 + subj->expires = subjcompat.expires;
72234 +
72235 + subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72236 + subj->hash = compat_ptr(subjcompat.hash);
72237 + subj->prev = compat_ptr(subjcompat.prev);
72238 + subj->next = compat_ptr(subjcompat.next);
72239 +
72240 + subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72241 + subj->obj_hash_size = subjcompat.obj_hash_size;
72242 + subj->pax_flags = subjcompat.pax_flags;
72243 +
72244 + return 0;
72245 +}
72246 +
72247 +int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72248 +{
72249 + struct acl_role_label_compat rolecompat;
72250 +
72251 + if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72252 + return -EFAULT;
72253 +
72254 + role->rolename = compat_ptr(rolecompat.rolename);
72255 + role->uidgid = rolecompat.uidgid;
72256 + role->roletype = rolecompat.roletype;
72257 +
72258 + role->auth_attempts = rolecompat.auth_attempts;
72259 + role->expires = rolecompat.expires;
72260 +
72261 + role->root_label = compat_ptr(rolecompat.root_label);
72262 + role->hash = compat_ptr(rolecompat.hash);
72263 +
72264 + role->prev = compat_ptr(rolecompat.prev);
72265 + role->next = compat_ptr(rolecompat.next);
72266 +
72267 + role->transitions = compat_ptr(rolecompat.transitions);
72268 + role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72269 + role->domain_children = compat_ptr(rolecompat.domain_children);
72270 + role->domain_child_num = rolecompat.domain_child_num;
72271 +
72272 + role->umask = rolecompat.umask;
72273 +
72274 + role->subj_hash = compat_ptr(rolecompat.subj_hash);
72275 + role->subj_hash_size = rolecompat.subj_hash_size;
72276 +
72277 + return 0;
72278 +}
72279 +
72280 +int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72281 +{
72282 + struct role_allowed_ip_compat roleip_compat;
72283 +
72284 + if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72285 + return -EFAULT;
72286 +
72287 + roleip->addr = roleip_compat.addr;
72288 + roleip->netmask = roleip_compat.netmask;
72289 +
72290 + roleip->prev = compat_ptr(roleip_compat.prev);
72291 + roleip->next = compat_ptr(roleip_compat.next);
72292 +
72293 + return 0;
72294 +}
72295 +
72296 +int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
72297 +{
72298 + struct role_transition_compat trans_compat;
72299 +
72300 + if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
72301 + return -EFAULT;
72302 +
72303 + trans->rolename = compat_ptr(trans_compat.rolename);
72304 +
72305 + trans->prev = compat_ptr(trans_compat.prev);
72306 + trans->next = compat_ptr(trans_compat.next);
72307 +
72308 + return 0;
72309 +
72310 +}
72311 +
72312 +int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
72313 +{
72314 + struct gr_hash_struct_compat hash_compat;
72315 +
72316 + if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
72317 + return -EFAULT;
72318 +
72319 + hash->table = compat_ptr(hash_compat.table);
72320 + hash->nametable = compat_ptr(hash_compat.nametable);
72321 + hash->first = compat_ptr(hash_compat.first);
72322 +
72323 + hash->table_size = hash_compat.table_size;
72324 + hash->used_size = hash_compat.used_size;
72325 +
72326 + hash->type = hash_compat.type;
72327 +
72328 + return 0;
72329 +}
72330 +
72331 +int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
72332 +{
72333 + compat_uptr_t ptrcompat;
72334 +
72335 + if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
72336 + return -EFAULT;
72337 +
72338 + *(void **)ptr = compat_ptr(ptrcompat);
72339 +
72340 + return 0;
72341 +}
72342 +
72343 +int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
72344 +{
72345 + struct acl_ip_label_compat ip_compat;
72346 +
72347 + if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
72348 + return -EFAULT;
72349 +
72350 + ip->iface = compat_ptr(ip_compat.iface);
72351 + ip->addr = ip_compat.addr;
72352 + ip->netmask = ip_compat.netmask;
72353 + ip->low = ip_compat.low;
72354 + ip->high = ip_compat.high;
72355 + ip->mode = ip_compat.mode;
72356 + ip->type = ip_compat.type;
72357 +
72358 + memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
72359 +
72360 + ip->prev = compat_ptr(ip_compat.prev);
72361 + ip->next = compat_ptr(ip_compat.next);
72362 +
72363 + return 0;
72364 +}
72365 +
72366 +int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
72367 +{
72368 + struct sprole_pw_compat pw_compat;
72369 +
72370 + if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
72371 + return -EFAULT;
72372 +
72373 + pw->rolename = compat_ptr(pw_compat.rolename);
72374 + memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
72375 + memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
72376 +
72377 + return 0;
72378 +}
72379 +
72380 +size_t get_gr_arg_wrapper_size_compat(void)
72381 +{
72382 + return sizeof(struct gr_arg_wrapper_compat);
72383 +}
72384 +
72385 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
72386 new file mode 100644
72387 index 0000000..4008fdc
72388 --- /dev/null
72389 +++ b/grsecurity/gracl_fs.c
72390 @@ -0,0 +1,445 @@
72391 +#include <linux/kernel.h>
72392 +#include <linux/sched.h>
72393 +#include <linux/types.h>
72394 +#include <linux/fs.h>
72395 +#include <linux/file.h>
72396 +#include <linux/stat.h>
72397 +#include <linux/grsecurity.h>
72398 +#include <linux/grinternal.h>
72399 +#include <linux/gracl.h>
72400 +
72401 +umode_t
72402 +gr_acl_umask(void)
72403 +{
72404 + if (unlikely(!gr_acl_is_enabled()))
72405 + return 0;
72406 +
72407 + return current->role->umask;
72408 +}
72409 +
72410 +__u32
72411 +gr_acl_handle_hidden_file(const struct dentry * dentry,
72412 + const struct vfsmount * mnt)
72413 +{
72414 + __u32 mode;
72415 +
72416 + if (unlikely(d_is_negative(dentry)))
72417 + return GR_FIND;
72418 +
72419 + mode =
72420 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
72421 +
72422 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
72423 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72424 + return mode;
72425 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
72426 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72427 + return 0;
72428 + } else if (unlikely(!(mode & GR_FIND)))
72429 + return 0;
72430 +
72431 + return GR_FIND;
72432 +}
72433 +
72434 +__u32
72435 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
72436 + int acc_mode)
72437 +{
72438 + __u32 reqmode = GR_FIND;
72439 + __u32 mode;
72440 +
72441 + if (unlikely(d_is_negative(dentry)))
72442 + return reqmode;
72443 +
72444 + if (acc_mode & MAY_APPEND)
72445 + reqmode |= GR_APPEND;
72446 + else if (acc_mode & MAY_WRITE)
72447 + reqmode |= GR_WRITE;
72448 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
72449 + reqmode |= GR_READ;
72450 +
72451 + mode =
72452 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72453 + mnt);
72454 +
72455 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72456 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72457 + reqmode & GR_READ ? " reading" : "",
72458 + reqmode & GR_WRITE ? " writing" : reqmode &
72459 + GR_APPEND ? " appending" : "");
72460 + return reqmode;
72461 + } else
72462 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72463 + {
72464 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72465 + reqmode & GR_READ ? " reading" : "",
72466 + reqmode & GR_WRITE ? " writing" : reqmode &
72467 + GR_APPEND ? " appending" : "");
72468 + return 0;
72469 + } else if (unlikely((mode & reqmode) != reqmode))
72470 + return 0;
72471 +
72472 + return reqmode;
72473 +}
72474 +
72475 +__u32
72476 +gr_acl_handle_creat(const struct dentry * dentry,
72477 + const struct dentry * p_dentry,
72478 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
72479 + const int imode)
72480 +{
72481 + __u32 reqmode = GR_WRITE | GR_CREATE;
72482 + __u32 mode;
72483 +
72484 + if (acc_mode & MAY_APPEND)
72485 + reqmode |= GR_APPEND;
72486 + // if a directory was required or the directory already exists, then
72487 + // don't count this open as a read
72488 + if ((acc_mode & MAY_READ) &&
72489 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
72490 + reqmode |= GR_READ;
72491 + if ((open_flags & O_CREAT) &&
72492 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72493 + reqmode |= GR_SETID;
72494 +
72495 + mode =
72496 + gr_check_create(dentry, p_dentry, p_mnt,
72497 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72498 +
72499 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72500 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72501 + reqmode & GR_READ ? " reading" : "",
72502 + reqmode & GR_WRITE ? " writing" : reqmode &
72503 + GR_APPEND ? " appending" : "");
72504 + return reqmode;
72505 + } else
72506 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72507 + {
72508 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72509 + reqmode & GR_READ ? " reading" : "",
72510 + reqmode & GR_WRITE ? " writing" : reqmode &
72511 + GR_APPEND ? " appending" : "");
72512 + return 0;
72513 + } else if (unlikely((mode & reqmode) != reqmode))
72514 + return 0;
72515 +
72516 + return reqmode;
72517 +}
72518 +
72519 +__u32
72520 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
72521 + const int fmode)
72522 +{
72523 + __u32 mode, reqmode = GR_FIND;
72524 +
72525 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
72526 + reqmode |= GR_EXEC;
72527 + if (fmode & S_IWOTH)
72528 + reqmode |= GR_WRITE;
72529 + if (fmode & S_IROTH)
72530 + reqmode |= GR_READ;
72531 +
72532 + mode =
72533 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72534 + mnt);
72535 +
72536 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72537 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72538 + reqmode & GR_READ ? " reading" : "",
72539 + reqmode & GR_WRITE ? " writing" : "",
72540 + reqmode & GR_EXEC ? " executing" : "");
72541 + return reqmode;
72542 + } else
72543 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72544 + {
72545 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72546 + reqmode & GR_READ ? " reading" : "",
72547 + reqmode & GR_WRITE ? " writing" : "",
72548 + reqmode & GR_EXEC ? " executing" : "");
72549 + return 0;
72550 + } else if (unlikely((mode & reqmode) != reqmode))
72551 + return 0;
72552 +
72553 + return reqmode;
72554 +}
72555 +
72556 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
72557 +{
72558 + __u32 mode;
72559 +
72560 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
72561 +
72562 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72563 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
72564 + return mode;
72565 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72566 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
72567 + return 0;
72568 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
72569 + return 0;
72570 +
72571 + return (reqmode);
72572 +}
72573 +
72574 +__u32
72575 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
72576 +{
72577 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
72578 +}
72579 +
72580 +__u32
72581 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
72582 +{
72583 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
72584 +}
72585 +
72586 +__u32
72587 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
72588 +{
72589 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
72590 +}
72591 +
72592 +__u32
72593 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
72594 +{
72595 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
72596 +}
72597 +
72598 +__u32
72599 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
72600 + umode_t *modeptr)
72601 +{
72602 + umode_t mode;
72603 +
72604 + *modeptr &= ~gr_acl_umask();
72605 + mode = *modeptr;
72606 +
72607 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
72608 + return 1;
72609 +
72610 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
72611 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
72612 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
72613 + GR_CHMOD_ACL_MSG);
72614 + } else {
72615 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
72616 + }
72617 +}
72618 +
72619 +__u32
72620 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
72621 +{
72622 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
72623 +}
72624 +
72625 +__u32
72626 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
72627 +{
72628 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
72629 +}
72630 +
72631 +__u32
72632 +gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
72633 +{
72634 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
72635 +}
72636 +
72637 +__u32
72638 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
72639 +{
72640 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
72641 +}
72642 +
72643 +__u32
72644 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
72645 +{
72646 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
72647 + GR_UNIXCONNECT_ACL_MSG);
72648 +}
72649 +
72650 +/* hardlinks require at minimum create and link permission,
72651 + any additional privilege required is based on the
72652 + privilege of the file being linked to
72653 +*/
72654 +__u32
72655 +gr_acl_handle_link(const struct dentry * new_dentry,
72656 + const struct dentry * parent_dentry,
72657 + const struct vfsmount * parent_mnt,
72658 + const struct dentry * old_dentry,
72659 + const struct vfsmount * old_mnt, const struct filename *to)
72660 +{
72661 + __u32 mode;
72662 + __u32 needmode = GR_CREATE | GR_LINK;
72663 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
72664 +
72665 + mode =
72666 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
72667 + old_mnt);
72668 +
72669 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
72670 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72671 + return mode;
72672 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72673 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72674 + return 0;
72675 + } else if (unlikely((mode & needmode) != needmode))
72676 + return 0;
72677 +
72678 + return 1;
72679 +}
72680 +
72681 +__u32
72682 +gr_acl_handle_symlink(const struct dentry * new_dentry,
72683 + const struct dentry * parent_dentry,
72684 + const struct vfsmount * parent_mnt, const struct filename *from)
72685 +{
72686 + __u32 needmode = GR_WRITE | GR_CREATE;
72687 + __u32 mode;
72688 +
72689 + mode =
72690 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
72691 + GR_CREATE | GR_AUDIT_CREATE |
72692 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
72693 +
72694 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
72695 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72696 + return mode;
72697 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72698 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72699 + return 0;
72700 + } else if (unlikely((mode & needmode) != needmode))
72701 + return 0;
72702 +
72703 + return (GR_WRITE | GR_CREATE);
72704 +}
72705 +
72706 +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)
72707 +{
72708 + __u32 mode;
72709 +
72710 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72711 +
72712 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72713 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
72714 + return mode;
72715 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72716 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
72717 + return 0;
72718 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
72719 + return 0;
72720 +
72721 + return (reqmode);
72722 +}
72723 +
72724 +__u32
72725 +gr_acl_handle_mknod(const struct dentry * new_dentry,
72726 + const struct dentry * parent_dentry,
72727 + const struct vfsmount * parent_mnt,
72728 + const int mode)
72729 +{
72730 + __u32 reqmode = GR_WRITE | GR_CREATE;
72731 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72732 + reqmode |= GR_SETID;
72733 +
72734 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72735 + reqmode, GR_MKNOD_ACL_MSG);
72736 +}
72737 +
72738 +__u32
72739 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
72740 + const struct dentry *parent_dentry,
72741 + const struct vfsmount *parent_mnt)
72742 +{
72743 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72744 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
72745 +}
72746 +
72747 +#define RENAME_CHECK_SUCCESS(old, new) \
72748 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
72749 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
72750 +
72751 +int
72752 +gr_acl_handle_rename(struct dentry *new_dentry,
72753 + struct dentry *parent_dentry,
72754 + const struct vfsmount *parent_mnt,
72755 + struct dentry *old_dentry,
72756 + struct inode *old_parent_inode,
72757 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
72758 +{
72759 + __u32 comp1, comp2;
72760 + int error = 0;
72761 +
72762 + if (unlikely(!gr_acl_is_enabled()))
72763 + return 0;
72764 +
72765 + if (flags & RENAME_EXCHANGE) {
72766 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72767 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72768 + GR_SUPPRESS, parent_mnt);
72769 + comp2 =
72770 + gr_search_file(old_dentry,
72771 + GR_READ | GR_WRITE | GR_AUDIT_READ |
72772 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72773 + } else if (d_is_negative(new_dentry)) {
72774 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
72775 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
72776 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
72777 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
72778 + GR_DELETE | GR_AUDIT_DELETE |
72779 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72780 + GR_SUPPRESS, old_mnt);
72781 + } else {
72782 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72783 + GR_CREATE | GR_DELETE |
72784 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
72785 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72786 + GR_SUPPRESS, parent_mnt);
72787 + comp2 =
72788 + gr_search_file(old_dentry,
72789 + GR_READ | GR_WRITE | GR_AUDIT_READ |
72790 + GR_DELETE | GR_AUDIT_DELETE |
72791 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72792 + }
72793 +
72794 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
72795 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
72796 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72797 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
72798 + && !(comp2 & GR_SUPPRESS)) {
72799 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72800 + error = -EACCES;
72801 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
72802 + error = -EACCES;
72803 +
72804 + return error;
72805 +}
72806 +
72807 +void
72808 +gr_acl_handle_exit(void)
72809 +{
72810 + u16 id;
72811 + char *rolename;
72812 +
72813 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
72814 + !(current->role->roletype & GR_ROLE_PERSIST))) {
72815 + id = current->acl_role_id;
72816 + rolename = current->role->rolename;
72817 + gr_set_acls(1);
72818 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
72819 + }
72820 +
72821 + gr_put_exec_file(current);
72822 + return;
72823 +}
72824 +
72825 +int
72826 +gr_acl_handle_procpidmem(const struct task_struct *task)
72827 +{
72828 + if (unlikely(!gr_acl_is_enabled()))
72829 + return 0;
72830 +
72831 + if (task != current && task->acl->mode & GR_PROTPROCFD)
72832 + return -EACCES;
72833 +
72834 + return 0;
72835 +}
72836 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
72837 new file mode 100644
72838 index 0000000..f056b81
72839 --- /dev/null
72840 +++ b/grsecurity/gracl_ip.c
72841 @@ -0,0 +1,386 @@
72842 +#include <linux/kernel.h>
72843 +#include <asm/uaccess.h>
72844 +#include <asm/errno.h>
72845 +#include <net/sock.h>
72846 +#include <linux/file.h>
72847 +#include <linux/fs.h>
72848 +#include <linux/net.h>
72849 +#include <linux/in.h>
72850 +#include <linux/skbuff.h>
72851 +#include <linux/ip.h>
72852 +#include <linux/udp.h>
72853 +#include <linux/types.h>
72854 +#include <linux/sched.h>
72855 +#include <linux/netdevice.h>
72856 +#include <linux/inetdevice.h>
72857 +#include <linux/gracl.h>
72858 +#include <linux/grsecurity.h>
72859 +#include <linux/grinternal.h>
72860 +
72861 +#define GR_BIND 0x01
72862 +#define GR_CONNECT 0x02
72863 +#define GR_INVERT 0x04
72864 +#define GR_BINDOVERRIDE 0x08
72865 +#define GR_CONNECTOVERRIDE 0x10
72866 +#define GR_SOCK_FAMILY 0x20
72867 +
72868 +static const char * gr_protocols[IPPROTO_MAX] = {
72869 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
72870 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
72871 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
72872 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
72873 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
72874 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
72875 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
72876 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
72877 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
72878 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
72879 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
72880 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
72881 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
72882 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
72883 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
72884 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
72885 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
72886 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
72887 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
72888 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
72889 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
72890 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
72891 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
72892 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
72893 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
72894 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
72895 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
72896 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
72897 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
72898 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
72899 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
72900 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
72901 + };
72902 +
72903 +static const char * gr_socktypes[SOCK_MAX] = {
72904 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
72905 + "unknown:7", "unknown:8", "unknown:9", "packet"
72906 + };
72907 +
72908 +static const char * gr_sockfamilies[AF_MAX+1] = {
72909 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
72910 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
72911 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
72912 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
72913 + };
72914 +
72915 +const char *
72916 +gr_proto_to_name(unsigned char proto)
72917 +{
72918 + return gr_protocols[proto];
72919 +}
72920 +
72921 +const char *
72922 +gr_socktype_to_name(unsigned char type)
72923 +{
72924 + return gr_socktypes[type];
72925 +}
72926 +
72927 +const char *
72928 +gr_sockfamily_to_name(unsigned char family)
72929 +{
72930 + return gr_sockfamilies[family];
72931 +}
72932 +
72933 +extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
72934 +
72935 +int
72936 +gr_search_socket(const int domain, const int type, const int protocol)
72937 +{
72938 + struct acl_subject_label *curr;
72939 + const struct cred *cred = current_cred();
72940 +
72941 + if (unlikely(!gr_acl_is_enabled()))
72942 + goto exit;
72943 +
72944 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
72945 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
72946 + goto exit; // let the kernel handle it
72947 +
72948 + curr = current->acl;
72949 +
72950 + if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
72951 + /* the family is allowed, if this is PF_INET allow it only if
72952 + the extra sock type/protocol checks pass */
72953 + if (domain == PF_INET)
72954 + goto inet_check;
72955 + goto exit;
72956 + } else {
72957 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72958 + __u32 fakeip = 0;
72959 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72960 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
72961 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
72962 + gr_to_filename(current->exec_file->f_path.dentry,
72963 + current->exec_file->f_path.mnt) :
72964 + curr->filename, curr->filename,
72965 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
72966 + &current->signal->saved_ip);
72967 + goto exit;
72968 + }
72969 + goto exit_fail;
72970 + }
72971 +
72972 +inet_check:
72973 + /* the rest of this checking is for IPv4 only */
72974 + if (!curr->ips)
72975 + goto exit;
72976 +
72977 + if ((curr->ip_type & (1U << type)) &&
72978 + (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
72979 + goto exit;
72980 +
72981 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72982 + /* we don't place acls on raw sockets , and sometimes
72983 + dgram/ip sockets are opened for ioctl and not
72984 + bind/connect, so we'll fake a bind learn log */
72985 + if (type == SOCK_RAW || type == SOCK_PACKET) {
72986 + __u32 fakeip = 0;
72987 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72988 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
72989 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
72990 + gr_to_filename(current->exec_file->f_path.dentry,
72991 + current->exec_file->f_path.mnt) :
72992 + curr->filename, curr->filename,
72993 + &fakeip, 0, type,
72994 + protocol, GR_CONNECT, &current->signal->saved_ip);
72995 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
72996 + __u32 fakeip = 0;
72997 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72998 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
72999 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
73000 + gr_to_filename(current->exec_file->f_path.dentry,
73001 + current->exec_file->f_path.mnt) :
73002 + curr->filename, curr->filename,
73003 + &fakeip, 0, type,
73004 + protocol, GR_BIND, &current->signal->saved_ip);
73005 + }
73006 + /* we'll log when they use connect or bind */
73007 + goto exit;
73008 + }
73009 +
73010 +exit_fail:
73011 + if (domain == PF_INET)
73012 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
73013 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
73014 + else if (rcu_access_pointer(net_families[domain]) != NULL)
73015 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
73016 + gr_socktype_to_name(type), protocol);
73017 +
73018 + return 0;
73019 +exit:
73020 + return 1;
73021 +}
73022 +
73023 +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)
73024 +{
73025 + if ((ip->mode & mode) &&
73026 + (ip_port >= ip->low) &&
73027 + (ip_port <= ip->high) &&
73028 + ((ntohl(ip_addr) & our_netmask) ==
73029 + (ntohl(our_addr) & our_netmask))
73030 + && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
73031 + && (ip->type & (1U << type))) {
73032 + if (ip->mode & GR_INVERT)
73033 + return 2; // specifically denied
73034 + else
73035 + return 1; // allowed
73036 + }
73037 +
73038 + return 0; // not specifically allowed, may continue parsing
73039 +}
73040 +
73041 +static int
73042 +gr_search_connectbind(const int full_mode, struct sock *sk,
73043 + struct sockaddr_in *addr, const int type)
73044 +{
73045 + char iface[IFNAMSIZ] = {0};
73046 + struct acl_subject_label *curr;
73047 + struct acl_ip_label *ip;
73048 + struct inet_sock *isk;
73049 + struct net_device *dev;
73050 + struct in_device *idev;
73051 + unsigned long i;
73052 + int ret;
73053 + int mode = full_mode & (GR_BIND | GR_CONNECT);
73054 + __u32 ip_addr = 0;
73055 + __u32 our_addr;
73056 + __u32 our_netmask;
73057 + char *p;
73058 + __u16 ip_port = 0;
73059 + const struct cred *cred = current_cred();
73060 +
73061 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
73062 + return 0;
73063 +
73064 + curr = current->acl;
73065 + isk = inet_sk(sk);
73066 +
73067 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
73068 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
73069 + addr->sin_addr.s_addr = curr->inaddr_any_override;
73070 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
73071 + struct sockaddr_in saddr;
73072 + int err;
73073 +
73074 + saddr.sin_family = AF_INET;
73075 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
73076 + saddr.sin_port = isk->inet_sport;
73077 +
73078 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73079 + if (err)
73080 + return err;
73081 +
73082 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73083 + if (err)
73084 + return err;
73085 + }
73086 +
73087 + if (!curr->ips)
73088 + return 0;
73089 +
73090 + ip_addr = addr->sin_addr.s_addr;
73091 + ip_port = ntohs(addr->sin_port);
73092 +
73093 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73094 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73095 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
73096 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
73097 + gr_to_filename(current->exec_file->f_path.dentry,
73098 + current->exec_file->f_path.mnt) :
73099 + curr->filename, curr->filename,
73100 + &ip_addr, ip_port, type,
73101 + sk->sk_protocol, mode, &current->signal->saved_ip);
73102 + return 0;
73103 + }
73104 +
73105 + for (i = 0; i < curr->ip_num; i++) {
73106 + ip = *(curr->ips + i);
73107 + if (ip->iface != NULL) {
73108 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
73109 + p = strchr(iface, ':');
73110 + if (p != NULL)
73111 + *p = '\0';
73112 + dev = dev_get_by_name(sock_net(sk), iface);
73113 + if (dev == NULL)
73114 + continue;
73115 + idev = in_dev_get(dev);
73116 + if (idev == NULL) {
73117 + dev_put(dev);
73118 + continue;
73119 + }
73120 + rcu_read_lock();
73121 + for_ifa(idev) {
73122 + if (!strcmp(ip->iface, ifa->ifa_label)) {
73123 + our_addr = ifa->ifa_address;
73124 + our_netmask = 0xffffffff;
73125 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73126 + if (ret == 1) {
73127 + rcu_read_unlock();
73128 + in_dev_put(idev);
73129 + dev_put(dev);
73130 + return 0;
73131 + } else if (ret == 2) {
73132 + rcu_read_unlock();
73133 + in_dev_put(idev);
73134 + dev_put(dev);
73135 + goto denied;
73136 + }
73137 + }
73138 + } endfor_ifa(idev);
73139 + rcu_read_unlock();
73140 + in_dev_put(idev);
73141 + dev_put(dev);
73142 + } else {
73143 + our_addr = ip->addr;
73144 + our_netmask = ip->netmask;
73145 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73146 + if (ret == 1)
73147 + return 0;
73148 + else if (ret == 2)
73149 + goto denied;
73150 + }
73151 + }
73152 +
73153 +denied:
73154 + if (mode == GR_BIND)
73155 + 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));
73156 + else if (mode == GR_CONNECT)
73157 + 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));
73158 +
73159 + return -EACCES;
73160 +}
73161 +
73162 +int
73163 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73164 +{
73165 + /* always allow disconnection of dgram sockets with connect */
73166 + if (addr->sin_family == AF_UNSPEC)
73167 + return 0;
73168 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73169 +}
73170 +
73171 +int
73172 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73173 +{
73174 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73175 +}
73176 +
73177 +int gr_search_listen(struct socket *sock)
73178 +{
73179 + struct sock *sk = sock->sk;
73180 + struct sockaddr_in addr;
73181 +
73182 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73183 + addr.sin_port = inet_sk(sk)->inet_sport;
73184 +
73185 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73186 +}
73187 +
73188 +int gr_search_accept(struct socket *sock)
73189 +{
73190 + struct sock *sk = sock->sk;
73191 + struct sockaddr_in addr;
73192 +
73193 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73194 + addr.sin_port = inet_sk(sk)->inet_sport;
73195 +
73196 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73197 +}
73198 +
73199 +int
73200 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73201 +{
73202 + if (addr)
73203 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73204 + else {
73205 + struct sockaddr_in sin;
73206 + const struct inet_sock *inet = inet_sk(sk);
73207 +
73208 + sin.sin_addr.s_addr = inet->inet_daddr;
73209 + sin.sin_port = inet->inet_dport;
73210 +
73211 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73212 + }
73213 +}
73214 +
73215 +int
73216 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73217 +{
73218 + struct sockaddr_in sin;
73219 +
73220 + if (unlikely(skb->len < sizeof (struct udphdr)))
73221 + return 0; // skip this packet
73222 +
73223 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73224 + sin.sin_port = udp_hdr(skb)->source;
73225 +
73226 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73227 +}
73228 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73229 new file mode 100644
73230 index 0000000..25f54ef
73231 --- /dev/null
73232 +++ b/grsecurity/gracl_learn.c
73233 @@ -0,0 +1,207 @@
73234 +#include <linux/kernel.h>
73235 +#include <linux/mm.h>
73236 +#include <linux/sched.h>
73237 +#include <linux/poll.h>
73238 +#include <linux/string.h>
73239 +#include <linux/file.h>
73240 +#include <linux/types.h>
73241 +#include <linux/vmalloc.h>
73242 +#include <linux/grinternal.h>
73243 +
73244 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73245 + size_t count, loff_t *ppos);
73246 +extern int gr_acl_is_enabled(void);
73247 +
73248 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73249 +static int gr_learn_attached;
73250 +
73251 +/* use a 512k buffer */
73252 +#define LEARN_BUFFER_SIZE (512 * 1024)
73253 +
73254 +static DEFINE_SPINLOCK(gr_learn_lock);
73255 +static DEFINE_MUTEX(gr_learn_user_mutex);
73256 +
73257 +/* we need to maintain two buffers, so that the kernel context of grlearn
73258 + uses a semaphore around the userspace copying, and the other kernel contexts
73259 + use a spinlock when copying into the buffer, since they cannot sleep
73260 +*/
73261 +static char *learn_buffer;
73262 +static char *learn_buffer_user;
73263 +static int learn_buffer_len;
73264 +static int learn_buffer_user_len;
73265 +
73266 +static ssize_t
73267 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73268 +{
73269 + DECLARE_WAITQUEUE(wait, current);
73270 + ssize_t retval = 0;
73271 +
73272 + add_wait_queue(&learn_wait, &wait);
73273 + set_current_state(TASK_INTERRUPTIBLE);
73274 + do {
73275 + mutex_lock(&gr_learn_user_mutex);
73276 + spin_lock(&gr_learn_lock);
73277 + if (learn_buffer_len)
73278 + break;
73279 + spin_unlock(&gr_learn_lock);
73280 + mutex_unlock(&gr_learn_user_mutex);
73281 + if (file->f_flags & O_NONBLOCK) {
73282 + retval = -EAGAIN;
73283 + goto out;
73284 + }
73285 + if (signal_pending(current)) {
73286 + retval = -ERESTARTSYS;
73287 + goto out;
73288 + }
73289 +
73290 + schedule();
73291 + } while (1);
73292 +
73293 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
73294 + learn_buffer_user_len = learn_buffer_len;
73295 + retval = learn_buffer_len;
73296 + learn_buffer_len = 0;
73297 +
73298 + spin_unlock(&gr_learn_lock);
73299 +
73300 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
73301 + retval = -EFAULT;
73302 +
73303 + mutex_unlock(&gr_learn_user_mutex);
73304 +out:
73305 + set_current_state(TASK_RUNNING);
73306 + remove_wait_queue(&learn_wait, &wait);
73307 + return retval;
73308 +}
73309 +
73310 +static unsigned int
73311 +poll_learn(struct file * file, poll_table * wait)
73312 +{
73313 + poll_wait(file, &learn_wait, wait);
73314 +
73315 + if (learn_buffer_len)
73316 + return (POLLIN | POLLRDNORM);
73317 +
73318 + return 0;
73319 +}
73320 +
73321 +void
73322 +gr_clear_learn_entries(void)
73323 +{
73324 + char *tmp;
73325 +
73326 + mutex_lock(&gr_learn_user_mutex);
73327 + spin_lock(&gr_learn_lock);
73328 + tmp = learn_buffer;
73329 + learn_buffer = NULL;
73330 + spin_unlock(&gr_learn_lock);
73331 + if (tmp)
73332 + vfree(tmp);
73333 + if (learn_buffer_user != NULL) {
73334 + vfree(learn_buffer_user);
73335 + learn_buffer_user = NULL;
73336 + }
73337 + learn_buffer_len = 0;
73338 + mutex_unlock(&gr_learn_user_mutex);
73339 +
73340 + return;
73341 +}
73342 +
73343 +void
73344 +gr_add_learn_entry(const char *fmt, ...)
73345 +{
73346 + va_list args;
73347 + unsigned int len;
73348 +
73349 + if (!gr_learn_attached)
73350 + return;
73351 +
73352 + spin_lock(&gr_learn_lock);
73353 +
73354 + /* leave a gap at the end so we know when it's "full" but don't have to
73355 + compute the exact length of the string we're trying to append
73356 + */
73357 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
73358 + spin_unlock(&gr_learn_lock);
73359 + wake_up_interruptible(&learn_wait);
73360 + return;
73361 + }
73362 + if (learn_buffer == NULL) {
73363 + spin_unlock(&gr_learn_lock);
73364 + return;
73365 + }
73366 +
73367 + va_start(args, fmt);
73368 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
73369 + va_end(args);
73370 +
73371 + learn_buffer_len += len + 1;
73372 +
73373 + spin_unlock(&gr_learn_lock);
73374 + wake_up_interruptible(&learn_wait);
73375 +
73376 + return;
73377 +}
73378 +
73379 +static int
73380 +open_learn(struct inode *inode, struct file *file)
73381 +{
73382 + if (file->f_mode & FMODE_READ && gr_learn_attached)
73383 + return -EBUSY;
73384 + if (file->f_mode & FMODE_READ) {
73385 + int retval = 0;
73386 + mutex_lock(&gr_learn_user_mutex);
73387 + if (learn_buffer == NULL)
73388 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
73389 + if (learn_buffer_user == NULL)
73390 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
73391 + if (learn_buffer == NULL) {
73392 + retval = -ENOMEM;
73393 + goto out_error;
73394 + }
73395 + if (learn_buffer_user == NULL) {
73396 + retval = -ENOMEM;
73397 + goto out_error;
73398 + }
73399 + learn_buffer_len = 0;
73400 + learn_buffer_user_len = 0;
73401 + gr_learn_attached = 1;
73402 +out_error:
73403 + mutex_unlock(&gr_learn_user_mutex);
73404 + return retval;
73405 + }
73406 + return 0;
73407 +}
73408 +
73409 +static int
73410 +close_learn(struct inode *inode, struct file *file)
73411 +{
73412 + if (file->f_mode & FMODE_READ) {
73413 + char *tmp = NULL;
73414 + mutex_lock(&gr_learn_user_mutex);
73415 + spin_lock(&gr_learn_lock);
73416 + tmp = learn_buffer;
73417 + learn_buffer = NULL;
73418 + spin_unlock(&gr_learn_lock);
73419 + if (tmp)
73420 + vfree(tmp);
73421 + if (learn_buffer_user != NULL) {
73422 + vfree(learn_buffer_user);
73423 + learn_buffer_user = NULL;
73424 + }
73425 + learn_buffer_len = 0;
73426 + learn_buffer_user_len = 0;
73427 + gr_learn_attached = 0;
73428 + mutex_unlock(&gr_learn_user_mutex);
73429 + }
73430 +
73431 + return 0;
73432 +}
73433 +
73434 +const struct file_operations grsec_fops = {
73435 + .read = read_learn,
73436 + .write = write_grsec_handler,
73437 + .open = open_learn,
73438 + .release = close_learn,
73439 + .poll = poll_learn,
73440 +};
73441 diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
73442 new file mode 100644
73443 index 0000000..3f8ade0
73444 --- /dev/null
73445 +++ b/grsecurity/gracl_policy.c
73446 @@ -0,0 +1,1782 @@
73447 +#include <linux/kernel.h>
73448 +#include <linux/module.h>
73449 +#include <linux/sched.h>
73450 +#include <linux/mm.h>
73451 +#include <linux/file.h>
73452 +#include <linux/fs.h>
73453 +#include <linux/namei.h>
73454 +#include <linux/mount.h>
73455 +#include <linux/tty.h>
73456 +#include <linux/proc_fs.h>
73457 +#include <linux/lglock.h>
73458 +#include <linux/slab.h>
73459 +#include <linux/vmalloc.h>
73460 +#include <linux/types.h>
73461 +#include <linux/sysctl.h>
73462 +#include <linux/netdevice.h>
73463 +#include <linux/ptrace.h>
73464 +#include <linux/gracl.h>
73465 +#include <linux/gralloc.h>
73466 +#include <linux/security.h>
73467 +#include <linux/grinternal.h>
73468 +#include <linux/pid_namespace.h>
73469 +#include <linux/stop_machine.h>
73470 +#include <linux/fdtable.h>
73471 +#include <linux/percpu.h>
73472 +#include <linux/lglock.h>
73473 +#include <linux/hugetlb.h>
73474 +#include <linux/posix-timers.h>
73475 +#include "../fs/mount.h"
73476 +
73477 +#include <asm/uaccess.h>
73478 +#include <asm/errno.h>
73479 +#include <asm/mman.h>
73480 +
73481 +extern struct gr_policy_state *polstate;
73482 +
73483 +#define FOR_EACH_ROLE_START(role) \
73484 + role = polstate->role_list; \
73485 + while (role) {
73486 +
73487 +#define FOR_EACH_ROLE_END(role) \
73488 + role = role->prev; \
73489 + }
73490 +
73491 +struct path gr_real_root;
73492 +
73493 +extern struct gr_alloc_state *current_alloc_state;
73494 +
73495 +u16 acl_sp_role_value;
73496 +
73497 +static DEFINE_MUTEX(gr_dev_mutex);
73498 +
73499 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
73500 +extern void gr_clear_learn_entries(void);
73501 +
73502 +struct gr_arg *gr_usermode __read_only;
73503 +unsigned char *gr_system_salt __read_only;
73504 +unsigned char *gr_system_sum __read_only;
73505 +
73506 +static unsigned int gr_auth_attempts = 0;
73507 +static unsigned long gr_auth_expires = 0UL;
73508 +
73509 +struct acl_object_label *fakefs_obj_rw;
73510 +struct acl_object_label *fakefs_obj_rwx;
73511 +
73512 +extern int gr_init_uidset(void);
73513 +extern void gr_free_uidset(void);
73514 +extern void gr_remove_uid(uid_t uid);
73515 +extern int gr_find_uid(uid_t uid);
73516 +
73517 +extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
73518 +extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
73519 +extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
73520 +extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
73521 +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);
73522 +extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
73523 +extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
73524 +extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
73525 +extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
73526 +extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73527 +extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73528 +extern void assign_special_role(const char *rolename);
73529 +extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
73530 +extern int gr_rbac_disable(void *unused);
73531 +extern void gr_enable_rbac_system(void);
73532 +
73533 +static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
73534 +{
73535 + if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
73536 + return -EFAULT;
73537 +
73538 + return 0;
73539 +}
73540 +
73541 +static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73542 +{
73543 + if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
73544 + return -EFAULT;
73545 +
73546 + return 0;
73547 +}
73548 +
73549 +static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
73550 +{
73551 + if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
73552 + return -EFAULT;
73553 +
73554 + return 0;
73555 +}
73556 +
73557 +static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
73558 +{
73559 + if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
73560 + return -EFAULT;
73561 +
73562 + return 0;
73563 +}
73564 +
73565 +static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
73566 +{
73567 + if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
73568 + return -EFAULT;
73569 +
73570 + return 0;
73571 +}
73572 +
73573 +static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73574 +{
73575 + if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
73576 + return -EFAULT;
73577 +
73578 + return 0;
73579 +}
73580 +
73581 +static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73582 +{
73583 + if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
73584 + return -EFAULT;
73585 +
73586 + return 0;
73587 +}
73588 +
73589 +static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
73590 +{
73591 + if (copy_from_user(trans, userp, sizeof(struct role_transition)))
73592 + return -EFAULT;
73593 +
73594 + return 0;
73595 +}
73596 +
73597 +int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
73598 +{
73599 + if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
73600 + return -EFAULT;
73601 +
73602 + return 0;
73603 +}
73604 +
73605 +static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
73606 +{
73607 + if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
73608 + return -EFAULT;
73609 +
73610 + if (((uwrap->version != GRSECURITY_VERSION) &&
73611 + (uwrap->version != 0x2901)) ||
73612 + (uwrap->size != sizeof(struct gr_arg)))
73613 + return -EINVAL;
73614 +
73615 + return 0;
73616 +}
73617 +
73618 +static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
73619 +{
73620 + if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
73621 + return -EFAULT;
73622 +
73623 + return 0;
73624 +}
73625 +
73626 +static size_t get_gr_arg_wrapper_size_normal(void)
73627 +{
73628 + return sizeof(struct gr_arg_wrapper);
73629 +}
73630 +
73631 +#ifdef CONFIG_COMPAT
73632 +extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
73633 +extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
73634 +extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
73635 +extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
73636 +extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
73637 +extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
73638 +extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
73639 +extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
73640 +extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
73641 +extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
73642 +extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
73643 +extern size_t get_gr_arg_wrapper_size_compat(void);
73644 +
73645 +int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
73646 +int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
73647 +int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
73648 +int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
73649 +int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
73650 +int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
73651 +int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
73652 +int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
73653 +int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
73654 +int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
73655 +int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
73656 +size_t (* get_gr_arg_wrapper_size)(void) __read_only;
73657 +
73658 +#else
73659 +#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
73660 +#define copy_gr_arg copy_gr_arg_normal
73661 +#define copy_gr_hash_struct copy_gr_hash_struct_normal
73662 +#define copy_acl_object_label copy_acl_object_label_normal
73663 +#define copy_acl_subject_label copy_acl_subject_label_normal
73664 +#define copy_acl_role_label copy_acl_role_label_normal
73665 +#define copy_acl_ip_label copy_acl_ip_label_normal
73666 +#define copy_pointer_from_array copy_pointer_from_array_normal
73667 +#define copy_sprole_pw copy_sprole_pw_normal
73668 +#define copy_role_transition copy_role_transition_normal
73669 +#define copy_role_allowed_ip copy_role_allowed_ip_normal
73670 +#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
73671 +#endif
73672 +
73673 +static struct acl_subject_label *
73674 +lookup_subject_map(const struct acl_subject_label *userp)
73675 +{
73676 + unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
73677 + struct subject_map *match;
73678 +
73679 + match = polstate->subj_map_set.s_hash[index];
73680 +
73681 + while (match && match->user != userp)
73682 + match = match->next;
73683 +
73684 + if (match != NULL)
73685 + return match->kernel;
73686 + else
73687 + return NULL;
73688 +}
73689 +
73690 +static void
73691 +insert_subj_map_entry(struct subject_map *subjmap)
73692 +{
73693 + unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
73694 + struct subject_map **curr;
73695 +
73696 + subjmap->prev = NULL;
73697 +
73698 + curr = &polstate->subj_map_set.s_hash[index];
73699 + if (*curr != NULL)
73700 + (*curr)->prev = subjmap;
73701 +
73702 + subjmap->next = *curr;
73703 + *curr = subjmap;
73704 +
73705 + return;
73706 +}
73707 +
73708 +static void
73709 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
73710 +{
73711 + unsigned int index =
73712 + gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
73713 + struct acl_role_label **curr;
73714 + struct acl_role_label *tmp, *tmp2;
73715 +
73716 + curr = &polstate->acl_role_set.r_hash[index];
73717 +
73718 + /* simple case, slot is empty, just set it to our role */
73719 + if (*curr == NULL) {
73720 + *curr = role;
73721 + } else {
73722 + /* example:
73723 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
73724 + 2 -> 3
73725 + */
73726 + /* first check to see if we can already be reached via this slot */
73727 + tmp = *curr;
73728 + while (tmp && tmp != role)
73729 + tmp = tmp->next;
73730 + if (tmp == role) {
73731 + /* we don't need to add ourselves to this slot's chain */
73732 + return;
73733 + }
73734 + /* we need to add ourselves to this chain, two cases */
73735 + if (role->next == NULL) {
73736 + /* simple case, append the current chain to our role */
73737 + role->next = *curr;
73738 + *curr = role;
73739 + } else {
73740 + /* 1 -> 2 -> 3 -> 4
73741 + 2 -> 3 -> 4
73742 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
73743 + */
73744 + /* trickier case: walk our role's chain until we find
73745 + the role for the start of the current slot's chain */
73746 + tmp = role;
73747 + tmp2 = *curr;
73748 + while (tmp->next && tmp->next != tmp2)
73749 + tmp = tmp->next;
73750 + if (tmp->next == tmp2) {
73751 + /* from example above, we found 3, so just
73752 + replace this slot's chain with ours */
73753 + *curr = role;
73754 + } else {
73755 + /* we didn't find a subset of our role's chain
73756 + in the current slot's chain, so append their
73757 + chain to ours, and set us as the first role in
73758 + the slot's chain
73759 +
73760 + we could fold this case with the case above,
73761 + but making it explicit for clarity
73762 + */
73763 + tmp->next = tmp2;
73764 + *curr = role;
73765 + }
73766 + }
73767 + }
73768 +
73769 + return;
73770 +}
73771 +
73772 +static void
73773 +insert_acl_role_label(struct acl_role_label *role)
73774 +{
73775 + int i;
73776 +
73777 + if (polstate->role_list == NULL) {
73778 + polstate->role_list = role;
73779 + role->prev = NULL;
73780 + } else {
73781 + role->prev = polstate->role_list;
73782 + polstate->role_list = role;
73783 + }
73784 +
73785 + /* used for hash chains */
73786 + role->next = NULL;
73787 +
73788 + if (role->roletype & GR_ROLE_DOMAIN) {
73789 + for (i = 0; i < role->domain_child_num; i++)
73790 + __insert_acl_role_label(role, role->domain_children[i]);
73791 + } else
73792 + __insert_acl_role_label(role, role->uidgid);
73793 +}
73794 +
73795 +static int
73796 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
73797 +{
73798 + struct name_entry **curr, *nentry;
73799 + struct inodev_entry *ientry;
73800 + unsigned int len = strlen(name);
73801 + unsigned int key = full_name_hash(name, len);
73802 + unsigned int index = key % polstate->name_set.n_size;
73803 +
73804 + curr = &polstate->name_set.n_hash[index];
73805 +
73806 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
73807 + curr = &((*curr)->next);
73808 +
73809 + if (*curr != NULL)
73810 + return 1;
73811 +
73812 + nentry = acl_alloc(sizeof (struct name_entry));
73813 + if (nentry == NULL)
73814 + return 0;
73815 + ientry = acl_alloc(sizeof (struct inodev_entry));
73816 + if (ientry == NULL)
73817 + return 0;
73818 + ientry->nentry = nentry;
73819 +
73820 + nentry->key = key;
73821 + nentry->name = name;
73822 + nentry->inode = inode;
73823 + nentry->device = device;
73824 + nentry->len = len;
73825 + nentry->deleted = deleted;
73826 +
73827 + nentry->prev = NULL;
73828 + curr = &polstate->name_set.n_hash[index];
73829 + if (*curr != NULL)
73830 + (*curr)->prev = nentry;
73831 + nentry->next = *curr;
73832 + *curr = nentry;
73833 +
73834 + /* insert us into the table searchable by inode/dev */
73835 + __insert_inodev_entry(polstate, ientry);
73836 +
73837 + return 1;
73838 +}
73839 +
73840 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
73841 +
73842 +static void *
73843 +create_table(__u32 * len, int elementsize)
73844 +{
73845 + unsigned int table_sizes[] = {
73846 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
73847 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
73848 + 4194301, 8388593, 16777213, 33554393, 67108859
73849 + };
73850 + void *newtable = NULL;
73851 + unsigned int pwr = 0;
73852 +
73853 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
73854 + table_sizes[pwr] <= *len)
73855 + pwr++;
73856 +
73857 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
73858 + return newtable;
73859 +
73860 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
73861 + newtable =
73862 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
73863 + else
73864 + newtable = vmalloc(table_sizes[pwr] * elementsize);
73865 +
73866 + *len = table_sizes[pwr];
73867 +
73868 + return newtable;
73869 +}
73870 +
73871 +static int
73872 +init_variables(const struct gr_arg *arg, bool reload)
73873 +{
73874 + struct task_struct *reaper = init_pid_ns.child_reaper;
73875 + unsigned int stacksize;
73876 +
73877 + polstate->subj_map_set.s_size = arg->role_db.num_subjects;
73878 + polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
73879 + polstate->name_set.n_size = arg->role_db.num_objects;
73880 + polstate->inodev_set.i_size = arg->role_db.num_objects;
73881 +
73882 + if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
73883 + !polstate->name_set.n_size || !polstate->inodev_set.i_size)
73884 + return 1;
73885 +
73886 + if (!reload) {
73887 + if (!gr_init_uidset())
73888 + return 1;
73889 + }
73890 +
73891 + /* set up the stack that holds allocation info */
73892 +
73893 + stacksize = arg->role_db.num_pointers + 5;
73894 +
73895 + if (!acl_alloc_stack_init(stacksize))
73896 + return 1;
73897 +
73898 + if (!reload) {
73899 + /* grab reference for the real root dentry and vfsmount */
73900 + get_fs_root(reaper->fs, &gr_real_root);
73901 +
73902 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
73903 + 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);
73904 +#endif
73905 +
73906 + fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73907 + if (fakefs_obj_rw == NULL)
73908 + return 1;
73909 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
73910 +
73911 + fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73912 + if (fakefs_obj_rwx == NULL)
73913 + return 1;
73914 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
73915 + }
73916 +
73917 + polstate->subj_map_set.s_hash =
73918 + (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
73919 + polstate->acl_role_set.r_hash =
73920 + (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
73921 + polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
73922 + polstate->inodev_set.i_hash =
73923 + (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
73924 +
73925 + if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
73926 + !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
73927 + return 1;
73928 +
73929 + memset(polstate->subj_map_set.s_hash, 0,
73930 + sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
73931 + memset(polstate->acl_role_set.r_hash, 0,
73932 + sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
73933 + memset(polstate->name_set.n_hash, 0,
73934 + sizeof (struct name_entry *) * polstate->name_set.n_size);
73935 + memset(polstate->inodev_set.i_hash, 0,
73936 + sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
73937 +
73938 + return 0;
73939 +}
73940 +
73941 +/* free information not needed after startup
73942 + currently contains user->kernel pointer mappings for subjects
73943 +*/
73944 +
73945 +static void
73946 +free_init_variables(void)
73947 +{
73948 + __u32 i;
73949 +
73950 + if (polstate->subj_map_set.s_hash) {
73951 + for (i = 0; i < polstate->subj_map_set.s_size; i++) {
73952 + if (polstate->subj_map_set.s_hash[i]) {
73953 + kfree(polstate->subj_map_set.s_hash[i]);
73954 + polstate->subj_map_set.s_hash[i] = NULL;
73955 + }
73956 + }
73957 +
73958 + if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
73959 + PAGE_SIZE)
73960 + kfree(polstate->subj_map_set.s_hash);
73961 + else
73962 + vfree(polstate->subj_map_set.s_hash);
73963 + }
73964 +
73965 + return;
73966 +}
73967 +
73968 +static void
73969 +free_variables(bool reload)
73970 +{
73971 + struct acl_subject_label *s;
73972 + struct acl_role_label *r;
73973 + struct task_struct *task, *task2;
73974 + unsigned int x;
73975 +
73976 + if (!reload) {
73977 + gr_clear_learn_entries();
73978 +
73979 + read_lock(&tasklist_lock);
73980 + do_each_thread(task2, task) {
73981 + task->acl_sp_role = 0;
73982 + task->acl_role_id = 0;
73983 + task->inherited = 0;
73984 + task->acl = NULL;
73985 + task->role = NULL;
73986 + } while_each_thread(task2, task);
73987 + read_unlock(&tasklist_lock);
73988 +
73989 + kfree(fakefs_obj_rw);
73990 + fakefs_obj_rw = NULL;
73991 + kfree(fakefs_obj_rwx);
73992 + fakefs_obj_rwx = NULL;
73993 +
73994 + /* release the reference to the real root dentry and vfsmount */
73995 + path_put(&gr_real_root);
73996 + memset(&gr_real_root, 0, sizeof(gr_real_root));
73997 + }
73998 +
73999 + /* free all object hash tables */
74000 +
74001 + FOR_EACH_ROLE_START(r)
74002 + if (r->subj_hash == NULL)
74003 + goto next_role;
74004 + FOR_EACH_SUBJECT_START(r, s, x)
74005 + if (s->obj_hash == NULL)
74006 + break;
74007 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74008 + kfree(s->obj_hash);
74009 + else
74010 + vfree(s->obj_hash);
74011 + FOR_EACH_SUBJECT_END(s, x)
74012 + FOR_EACH_NESTED_SUBJECT_START(r, s)
74013 + if (s->obj_hash == NULL)
74014 + break;
74015 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74016 + kfree(s->obj_hash);
74017 + else
74018 + vfree(s->obj_hash);
74019 + FOR_EACH_NESTED_SUBJECT_END(s)
74020 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
74021 + kfree(r->subj_hash);
74022 + else
74023 + vfree(r->subj_hash);
74024 + r->subj_hash = NULL;
74025 +next_role:
74026 + FOR_EACH_ROLE_END(r)
74027 +
74028 + acl_free_all();
74029 +
74030 + if (polstate->acl_role_set.r_hash) {
74031 + if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
74032 + PAGE_SIZE)
74033 + kfree(polstate->acl_role_set.r_hash);
74034 + else
74035 + vfree(polstate->acl_role_set.r_hash);
74036 + }
74037 + if (polstate->name_set.n_hash) {
74038 + if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
74039 + PAGE_SIZE)
74040 + kfree(polstate->name_set.n_hash);
74041 + else
74042 + vfree(polstate->name_set.n_hash);
74043 + }
74044 +
74045 + if (polstate->inodev_set.i_hash) {
74046 + if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
74047 + PAGE_SIZE)
74048 + kfree(polstate->inodev_set.i_hash);
74049 + else
74050 + vfree(polstate->inodev_set.i_hash);
74051 + }
74052 +
74053 + if (!reload)
74054 + gr_free_uidset();
74055 +
74056 + memset(&polstate->name_set, 0, sizeof (struct name_db));
74057 + memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
74058 + memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
74059 + memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
74060 +
74061 + polstate->default_role = NULL;
74062 + polstate->kernel_role = NULL;
74063 + polstate->role_list = NULL;
74064 +
74065 + return;
74066 +}
74067 +
74068 +static struct acl_subject_label *
74069 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
74070 +
74071 +static int alloc_and_copy_string(char **name, unsigned int maxlen)
74072 +{
74073 + unsigned int len = strnlen_user(*name, maxlen);
74074 + char *tmp;
74075 +
74076 + if (!len || len >= maxlen)
74077 + return -EINVAL;
74078 +
74079 + if ((tmp = (char *) acl_alloc(len)) == NULL)
74080 + return -ENOMEM;
74081 +
74082 + if (copy_from_user(tmp, *name, len))
74083 + return -EFAULT;
74084 +
74085 + tmp[len-1] = '\0';
74086 + *name = tmp;
74087 +
74088 + return 0;
74089 +}
74090 +
74091 +static int
74092 +copy_user_glob(struct acl_object_label *obj)
74093 +{
74094 + struct acl_object_label *g_tmp, **guser;
74095 + int error;
74096 +
74097 + if (obj->globbed == NULL)
74098 + return 0;
74099 +
74100 + guser = &obj->globbed;
74101 + while (*guser) {
74102 + g_tmp = (struct acl_object_label *)
74103 + acl_alloc(sizeof (struct acl_object_label));
74104 + if (g_tmp == NULL)
74105 + return -ENOMEM;
74106 +
74107 + if (copy_acl_object_label(g_tmp, *guser))
74108 + return -EFAULT;
74109 +
74110 + error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74111 + if (error)
74112 + return error;
74113 +
74114 + *guser = g_tmp;
74115 + guser = &(g_tmp->next);
74116 + }
74117 +
74118 + return 0;
74119 +}
74120 +
74121 +static int
74122 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74123 + struct acl_role_label *role)
74124 +{
74125 + struct acl_object_label *o_tmp;
74126 + int ret;
74127 +
74128 + while (userp) {
74129 + if ((o_tmp = (struct acl_object_label *)
74130 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
74131 + return -ENOMEM;
74132 +
74133 + if (copy_acl_object_label(o_tmp, userp))
74134 + return -EFAULT;
74135 +
74136 + userp = o_tmp->prev;
74137 +
74138 + ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74139 + if (ret)
74140 + return ret;
74141 +
74142 + insert_acl_obj_label(o_tmp, subj);
74143 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74144 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74145 + return -ENOMEM;
74146 +
74147 + ret = copy_user_glob(o_tmp);
74148 + if (ret)
74149 + return ret;
74150 +
74151 + if (o_tmp->nested) {
74152 + int already_copied;
74153 +
74154 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74155 + if (IS_ERR(o_tmp->nested))
74156 + return PTR_ERR(o_tmp->nested);
74157 +
74158 + /* insert into nested subject list if we haven't copied this one yet
74159 + to prevent duplicate entries */
74160 + if (!already_copied) {
74161 + o_tmp->nested->next = role->hash->first;
74162 + role->hash->first = o_tmp->nested;
74163 + }
74164 + }
74165 + }
74166 +
74167 + return 0;
74168 +}
74169 +
74170 +static __u32
74171 +count_user_subjs(struct acl_subject_label *userp)
74172 +{
74173 + struct acl_subject_label s_tmp;
74174 + __u32 num = 0;
74175 +
74176 + while (userp) {
74177 + if (copy_acl_subject_label(&s_tmp, userp))
74178 + break;
74179 +
74180 + userp = s_tmp.prev;
74181 + }
74182 +
74183 + return num;
74184 +}
74185 +
74186 +static int
74187 +copy_user_allowedips(struct acl_role_label *rolep)
74188 +{
74189 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74190 +
74191 + ruserip = rolep->allowed_ips;
74192 +
74193 + while (ruserip) {
74194 + rlast = rtmp;
74195 +
74196 + if ((rtmp = (struct role_allowed_ip *)
74197 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74198 + return -ENOMEM;
74199 +
74200 + if (copy_role_allowed_ip(rtmp, ruserip))
74201 + return -EFAULT;
74202 +
74203 + ruserip = rtmp->prev;
74204 +
74205 + if (!rlast) {
74206 + rtmp->prev = NULL;
74207 + rolep->allowed_ips = rtmp;
74208 + } else {
74209 + rlast->next = rtmp;
74210 + rtmp->prev = rlast;
74211 + }
74212 +
74213 + if (!ruserip)
74214 + rtmp->next = NULL;
74215 + }
74216 +
74217 + return 0;
74218 +}
74219 +
74220 +static int
74221 +copy_user_transitions(struct acl_role_label *rolep)
74222 +{
74223 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
74224 + int error;
74225 +
74226 + rusertp = rolep->transitions;
74227 +
74228 + while (rusertp) {
74229 + rlast = rtmp;
74230 +
74231 + if ((rtmp = (struct role_transition *)
74232 + acl_alloc(sizeof (struct role_transition))) == NULL)
74233 + return -ENOMEM;
74234 +
74235 + if (copy_role_transition(rtmp, rusertp))
74236 + return -EFAULT;
74237 +
74238 + rusertp = rtmp->prev;
74239 +
74240 + error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74241 + if (error)
74242 + return error;
74243 +
74244 + if (!rlast) {
74245 + rtmp->prev = NULL;
74246 + rolep->transitions = rtmp;
74247 + } else {
74248 + rlast->next = rtmp;
74249 + rtmp->prev = rlast;
74250 + }
74251 +
74252 + if (!rusertp)
74253 + rtmp->next = NULL;
74254 + }
74255 +
74256 + return 0;
74257 +}
74258 +
74259 +static __u32 count_user_objs(const struct acl_object_label __user *userp)
74260 +{
74261 + struct acl_object_label o_tmp;
74262 + __u32 num = 0;
74263 +
74264 + while (userp) {
74265 + if (copy_acl_object_label(&o_tmp, userp))
74266 + break;
74267 +
74268 + userp = o_tmp.prev;
74269 + num++;
74270 + }
74271 +
74272 + return num;
74273 +}
74274 +
74275 +static struct acl_subject_label *
74276 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74277 +{
74278 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74279 + __u32 num_objs;
74280 + struct acl_ip_label **i_tmp, *i_utmp2;
74281 + struct gr_hash_struct ghash;
74282 + struct subject_map *subjmap;
74283 + unsigned int i_num;
74284 + int err;
74285 +
74286 + if (already_copied != NULL)
74287 + *already_copied = 0;
74288 +
74289 + s_tmp = lookup_subject_map(userp);
74290 +
74291 + /* we've already copied this subject into the kernel, just return
74292 + the reference to it, and don't copy it over again
74293 + */
74294 + if (s_tmp) {
74295 + if (already_copied != NULL)
74296 + *already_copied = 1;
74297 + return(s_tmp);
74298 + }
74299 +
74300 + if ((s_tmp = (struct acl_subject_label *)
74301 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
74302 + return ERR_PTR(-ENOMEM);
74303 +
74304 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
74305 + if (subjmap == NULL)
74306 + return ERR_PTR(-ENOMEM);
74307 +
74308 + subjmap->user = userp;
74309 + subjmap->kernel = s_tmp;
74310 + insert_subj_map_entry(subjmap);
74311 +
74312 + if (copy_acl_subject_label(s_tmp, userp))
74313 + return ERR_PTR(-EFAULT);
74314 +
74315 + err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
74316 + if (err)
74317 + return ERR_PTR(err);
74318 +
74319 + if (!strcmp(s_tmp->filename, "/"))
74320 + role->root_label = s_tmp;
74321 +
74322 + if (copy_gr_hash_struct(&ghash, s_tmp->hash))
74323 + return ERR_PTR(-EFAULT);
74324 +
74325 + /* copy user and group transition tables */
74326 +
74327 + if (s_tmp->user_trans_num) {
74328 + uid_t *uidlist;
74329 +
74330 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
74331 + if (uidlist == NULL)
74332 + return ERR_PTR(-ENOMEM);
74333 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
74334 + return ERR_PTR(-EFAULT);
74335 +
74336 + s_tmp->user_transitions = uidlist;
74337 + }
74338 +
74339 + if (s_tmp->group_trans_num) {
74340 + gid_t *gidlist;
74341 +
74342 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
74343 + if (gidlist == NULL)
74344 + return ERR_PTR(-ENOMEM);
74345 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
74346 + return ERR_PTR(-EFAULT);
74347 +
74348 + s_tmp->group_transitions = gidlist;
74349 + }
74350 +
74351 + /* set up object hash table */
74352 + num_objs = count_user_objs(ghash.first);
74353 +
74354 + s_tmp->obj_hash_size = num_objs;
74355 + s_tmp->obj_hash =
74356 + (struct acl_object_label **)
74357 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
74358 +
74359 + if (!s_tmp->obj_hash)
74360 + return ERR_PTR(-ENOMEM);
74361 +
74362 + memset(s_tmp->obj_hash, 0,
74363 + s_tmp->obj_hash_size *
74364 + sizeof (struct acl_object_label *));
74365 +
74366 + /* add in objects */
74367 + err = copy_user_objs(ghash.first, s_tmp, role);
74368 +
74369 + if (err)
74370 + return ERR_PTR(err);
74371 +
74372 + /* set pointer for parent subject */
74373 + if (s_tmp->parent_subject) {
74374 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
74375 +
74376 + if (IS_ERR(s_tmp2))
74377 + return s_tmp2;
74378 +
74379 + s_tmp->parent_subject = s_tmp2;
74380 + }
74381 +
74382 + /* add in ip acls */
74383 +
74384 + if (!s_tmp->ip_num) {
74385 + s_tmp->ips = NULL;
74386 + goto insert;
74387 + }
74388 +
74389 + i_tmp =
74390 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
74391 + sizeof (struct acl_ip_label *));
74392 +
74393 + if (!i_tmp)
74394 + return ERR_PTR(-ENOMEM);
74395 +
74396 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
74397 + *(i_tmp + i_num) =
74398 + (struct acl_ip_label *)
74399 + acl_alloc(sizeof (struct acl_ip_label));
74400 + if (!*(i_tmp + i_num))
74401 + return ERR_PTR(-ENOMEM);
74402 +
74403 + if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
74404 + return ERR_PTR(-EFAULT);
74405 +
74406 + if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
74407 + return ERR_PTR(-EFAULT);
74408 +
74409 + if ((*(i_tmp + i_num))->iface == NULL)
74410 + continue;
74411 +
74412 + err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
74413 + if (err)
74414 + return ERR_PTR(err);
74415 + }
74416 +
74417 + s_tmp->ips = i_tmp;
74418 +
74419 +insert:
74420 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
74421 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
74422 + return ERR_PTR(-ENOMEM);
74423 +
74424 + return s_tmp;
74425 +}
74426 +
74427 +static int
74428 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
74429 +{
74430 + struct acl_subject_label s_pre;
74431 + struct acl_subject_label * ret;
74432 + int err;
74433 +
74434 + while (userp) {
74435 + if (copy_acl_subject_label(&s_pre, userp))
74436 + return -EFAULT;
74437 +
74438 + ret = do_copy_user_subj(userp, role, NULL);
74439 +
74440 + err = PTR_ERR(ret);
74441 + if (IS_ERR(ret))
74442 + return err;
74443 +
74444 + insert_acl_subj_label(ret, role);
74445 +
74446 + userp = s_pre.prev;
74447 + }
74448 +
74449 + return 0;
74450 +}
74451 +
74452 +static int
74453 +copy_user_acl(struct gr_arg *arg)
74454 +{
74455 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
74456 + struct acl_subject_label *subj_list;
74457 + struct sprole_pw *sptmp;
74458 + struct gr_hash_struct *ghash;
74459 + uid_t *domainlist;
74460 + unsigned int r_num;
74461 + int err = 0;
74462 + __u16 i;
74463 + __u32 num_subjs;
74464 +
74465 + /* we need a default and kernel role */
74466 + if (arg->role_db.num_roles < 2)
74467 + return -EINVAL;
74468 +
74469 + /* copy special role authentication info from userspace */
74470 +
74471 + polstate->num_sprole_pws = arg->num_sprole_pws;
74472 + polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
74473 +
74474 + if (!polstate->acl_special_roles && polstate->num_sprole_pws)
74475 + return -ENOMEM;
74476 +
74477 + for (i = 0; i < polstate->num_sprole_pws; i++) {
74478 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
74479 + if (!sptmp)
74480 + return -ENOMEM;
74481 + if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
74482 + return -EFAULT;
74483 +
74484 + err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
74485 + if (err)
74486 + return err;
74487 +
74488 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74489 + printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
74490 +#endif
74491 +
74492 + polstate->acl_special_roles[i] = sptmp;
74493 + }
74494 +
74495 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
74496 +
74497 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
74498 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
74499 +
74500 + if (!r_tmp)
74501 + return -ENOMEM;
74502 +
74503 + if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
74504 + return -EFAULT;
74505 +
74506 + if (copy_acl_role_label(r_tmp, r_utmp2))
74507 + return -EFAULT;
74508 +
74509 + err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
74510 + if (err)
74511 + return err;
74512 +
74513 + if (!strcmp(r_tmp->rolename, "default")
74514 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
74515 + polstate->default_role = r_tmp;
74516 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
74517 + polstate->kernel_role = r_tmp;
74518 + }
74519 +
74520 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
74521 + return -ENOMEM;
74522 +
74523 + if (copy_gr_hash_struct(ghash, r_tmp->hash))
74524 + return -EFAULT;
74525 +
74526 + r_tmp->hash = ghash;
74527 +
74528 + num_subjs = count_user_subjs(r_tmp->hash->first);
74529 +
74530 + r_tmp->subj_hash_size = num_subjs;
74531 + r_tmp->subj_hash =
74532 + (struct acl_subject_label **)
74533 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
74534 +
74535 + if (!r_tmp->subj_hash)
74536 + return -ENOMEM;
74537 +
74538 + err = copy_user_allowedips(r_tmp);
74539 + if (err)
74540 + return err;
74541 +
74542 + /* copy domain info */
74543 + if (r_tmp->domain_children != NULL) {
74544 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
74545 + if (domainlist == NULL)
74546 + return -ENOMEM;
74547 +
74548 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
74549 + return -EFAULT;
74550 +
74551 + r_tmp->domain_children = domainlist;
74552 + }
74553 +
74554 + err = copy_user_transitions(r_tmp);
74555 + if (err)
74556 + return err;
74557 +
74558 + memset(r_tmp->subj_hash, 0,
74559 + r_tmp->subj_hash_size *
74560 + sizeof (struct acl_subject_label *));
74561 +
74562 + /* acquire the list of subjects, then NULL out
74563 + the list prior to parsing the subjects for this role,
74564 + as during this parsing the list is replaced with a list
74565 + of *nested* subjects for the role
74566 + */
74567 + subj_list = r_tmp->hash->first;
74568 +
74569 + /* set nested subject list to null */
74570 + r_tmp->hash->first = NULL;
74571 +
74572 + err = copy_user_subjs(subj_list, r_tmp);
74573 +
74574 + if (err)
74575 + return err;
74576 +
74577 + insert_acl_role_label(r_tmp);
74578 + }
74579 +
74580 + if (polstate->default_role == NULL || polstate->kernel_role == NULL)
74581 + return -EINVAL;
74582 +
74583 + return err;
74584 +}
74585 +
74586 +static int gracl_reload_apply_policies(void *reload)
74587 +{
74588 + struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
74589 + struct task_struct *task, *task2;
74590 + struct acl_role_label *role, *rtmp;
74591 + struct acl_subject_label *subj;
74592 + const struct cred *cred;
74593 + int role_applied;
74594 + int ret = 0;
74595 +
74596 + memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
74597 + memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
74598 +
74599 + /* first make sure we'll be able to apply the new policy cleanly */
74600 + do_each_thread(task2, task) {
74601 + if (task->exec_file == NULL)
74602 + continue;
74603 + role_applied = 0;
74604 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74605 + /* preserve special roles */
74606 + FOR_EACH_ROLE_START(role)
74607 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74608 + rtmp = task->role;
74609 + task->role = role;
74610 + role_applied = 1;
74611 + break;
74612 + }
74613 + FOR_EACH_ROLE_END(role)
74614 + }
74615 + if (!role_applied) {
74616 + cred = __task_cred(task);
74617 + rtmp = task->role;
74618 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74619 + }
74620 + /* this handles non-nested inherited subjects, nested subjects will still
74621 + be dropped currently */
74622 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74623 + task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
74624 + /* change the role back so that we've made no modifications to the policy */
74625 + task->role = rtmp;
74626 +
74627 + if (subj == NULL || task->tmpacl == NULL) {
74628 + ret = -EINVAL;
74629 + goto out;
74630 + }
74631 + } while_each_thread(task2, task);
74632 +
74633 + /* now actually apply the policy */
74634 +
74635 + do_each_thread(task2, task) {
74636 + if (task->exec_file) {
74637 + role_applied = 0;
74638 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74639 + /* preserve special roles */
74640 + FOR_EACH_ROLE_START(role)
74641 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74642 + task->role = role;
74643 + role_applied = 1;
74644 + break;
74645 + }
74646 + FOR_EACH_ROLE_END(role)
74647 + }
74648 + if (!role_applied) {
74649 + cred = __task_cred(task);
74650 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74651 + }
74652 + /* this handles non-nested inherited subjects, nested subjects will still
74653 + be dropped currently */
74654 + if (!reload_state->oldmode && task->inherited)
74655 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74656 + else {
74657 + /* looked up and tagged to the task previously */
74658 + subj = task->tmpacl;
74659 + }
74660 + /* subj will be non-null */
74661 + __gr_apply_subject_to_task(polstate, task, subj);
74662 + if (reload_state->oldmode) {
74663 + task->acl_role_id = 0;
74664 + task->acl_sp_role = 0;
74665 + task->inherited = 0;
74666 + }
74667 + } else {
74668 + // it's a kernel process
74669 + task->role = polstate->kernel_role;
74670 + task->acl = polstate->kernel_role->root_label;
74671 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
74672 + task->acl->mode &= ~GR_PROCFIND;
74673 +#endif
74674 + }
74675 + } while_each_thread(task2, task);
74676 +
74677 + memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
74678 + memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
74679 +
74680 +out:
74681 +
74682 + return ret;
74683 +}
74684 +
74685 +static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
74686 +{
74687 + struct gr_reload_state new_reload_state = { };
74688 + int err;
74689 +
74690 + new_reload_state.oldpolicy_ptr = polstate;
74691 + new_reload_state.oldalloc_ptr = current_alloc_state;
74692 + new_reload_state.oldmode = oldmode;
74693 +
74694 + current_alloc_state = &new_reload_state.newalloc;
74695 + polstate = &new_reload_state.newpolicy;
74696 +
74697 + /* everything relevant is now saved off, copy in the new policy */
74698 + if (init_variables(args, true)) {
74699 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74700 + err = -ENOMEM;
74701 + goto error;
74702 + }
74703 +
74704 + err = copy_user_acl(args);
74705 + free_init_variables();
74706 + if (err)
74707 + goto error;
74708 + /* the new policy is copied in, with the old policy available via saved_state
74709 + first go through applying roles, making sure to preserve special roles
74710 + then apply new subjects, making sure to preserve inherited and nested subjects,
74711 + though currently only inherited subjects will be preserved
74712 + */
74713 + err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
74714 + if (err)
74715 + goto error;
74716 +
74717 + /* we've now applied the new policy, so restore the old policy state to free it */
74718 + polstate = &new_reload_state.oldpolicy;
74719 + current_alloc_state = &new_reload_state.oldalloc;
74720 + free_variables(true);
74721 +
74722 + /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
74723 + to running_polstate/current_alloc_state inside stop_machine
74724 + */
74725 + err = 0;
74726 + goto out;
74727 +error:
74728 + /* on error of loading the new policy, we'll just keep the previous
74729 + policy set around
74730 + */
74731 + free_variables(true);
74732 +
74733 + /* doesn't affect runtime, but maintains consistent state */
74734 +out:
74735 + polstate = new_reload_state.oldpolicy_ptr;
74736 + current_alloc_state = new_reload_state.oldalloc_ptr;
74737 +
74738 + return err;
74739 +}
74740 +
74741 +static int
74742 +gracl_init(struct gr_arg *args)
74743 +{
74744 + int error = 0;
74745 +
74746 + memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
74747 + memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
74748 +
74749 + if (init_variables(args, false)) {
74750 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74751 + error = -ENOMEM;
74752 + goto out;
74753 + }
74754 +
74755 + error = copy_user_acl(args);
74756 + free_init_variables();
74757 + if (error)
74758 + goto out;
74759 +
74760 + error = gr_set_acls(0);
74761 + if (error)
74762 + goto out;
74763 +
74764 + gr_enable_rbac_system();
74765 +
74766 + return 0;
74767 +
74768 +out:
74769 + free_variables(false);
74770 + return error;
74771 +}
74772 +
74773 +static int
74774 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
74775 + unsigned char **sum)
74776 +{
74777 + struct acl_role_label *r;
74778 + struct role_allowed_ip *ipp;
74779 + struct role_transition *trans;
74780 + unsigned int i;
74781 + int found = 0;
74782 + u32 curr_ip = current->signal->curr_ip;
74783 +
74784 + current->signal->saved_ip = curr_ip;
74785 +
74786 + /* check transition table */
74787 +
74788 + for (trans = current->role->transitions; trans; trans = trans->next) {
74789 + if (!strcmp(rolename, trans->rolename)) {
74790 + found = 1;
74791 + break;
74792 + }
74793 + }
74794 +
74795 + if (!found)
74796 + return 0;
74797 +
74798 + /* handle special roles that do not require authentication
74799 + and check ip */
74800 +
74801 + FOR_EACH_ROLE_START(r)
74802 + if (!strcmp(rolename, r->rolename) &&
74803 + (r->roletype & GR_ROLE_SPECIAL)) {
74804 + found = 0;
74805 + if (r->allowed_ips != NULL) {
74806 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
74807 + if ((ntohl(curr_ip) & ipp->netmask) ==
74808 + (ntohl(ipp->addr) & ipp->netmask))
74809 + found = 1;
74810 + }
74811 + } else
74812 + found = 2;
74813 + if (!found)
74814 + return 0;
74815 +
74816 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
74817 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
74818 + *salt = NULL;
74819 + *sum = NULL;
74820 + return 1;
74821 + }
74822 + }
74823 + FOR_EACH_ROLE_END(r)
74824 +
74825 + for (i = 0; i < polstate->num_sprole_pws; i++) {
74826 + if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
74827 + *salt = polstate->acl_special_roles[i]->salt;
74828 + *sum = polstate->acl_special_roles[i]->sum;
74829 + return 1;
74830 + }
74831 + }
74832 +
74833 + return 0;
74834 +}
74835 +
74836 +int gr_check_secure_terminal(struct task_struct *task)
74837 +{
74838 + struct task_struct *p, *p2, *p3;
74839 + struct files_struct *files;
74840 + struct fdtable *fdt;
74841 + struct file *our_file = NULL, *file;
74842 + int i;
74843 +
74844 + if (task->signal->tty == NULL)
74845 + return 1;
74846 +
74847 + files = get_files_struct(task);
74848 + if (files != NULL) {
74849 + rcu_read_lock();
74850 + fdt = files_fdtable(files);
74851 + for (i=0; i < fdt->max_fds; i++) {
74852 + file = fcheck_files(files, i);
74853 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
74854 + get_file(file);
74855 + our_file = file;
74856 + }
74857 + }
74858 + rcu_read_unlock();
74859 + put_files_struct(files);
74860 + }
74861 +
74862 + if (our_file == NULL)
74863 + return 1;
74864 +
74865 + read_lock(&tasklist_lock);
74866 + do_each_thread(p2, p) {
74867 + files = get_files_struct(p);
74868 + if (files == NULL ||
74869 + (p->signal && p->signal->tty == task->signal->tty)) {
74870 + if (files != NULL)
74871 + put_files_struct(files);
74872 + continue;
74873 + }
74874 + rcu_read_lock();
74875 + fdt = files_fdtable(files);
74876 + for (i=0; i < fdt->max_fds; i++) {
74877 + file = fcheck_files(files, i);
74878 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
74879 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
74880 + p3 = task;
74881 + while (task_pid_nr(p3) > 0) {
74882 + if (p3 == p)
74883 + break;
74884 + p3 = p3->real_parent;
74885 + }
74886 + if (p3 == p)
74887 + break;
74888 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
74889 + gr_handle_alertkill(p);
74890 + rcu_read_unlock();
74891 + put_files_struct(files);
74892 + read_unlock(&tasklist_lock);
74893 + fput(our_file);
74894 + return 0;
74895 + }
74896 + }
74897 + rcu_read_unlock();
74898 + put_files_struct(files);
74899 + } while_each_thread(p2, p);
74900 + read_unlock(&tasklist_lock);
74901 +
74902 + fput(our_file);
74903 + return 1;
74904 +}
74905 +
74906 +ssize_t
74907 +write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
74908 +{
74909 + struct gr_arg_wrapper uwrap;
74910 + unsigned char *sprole_salt = NULL;
74911 + unsigned char *sprole_sum = NULL;
74912 + int error = 0;
74913 + int error2 = 0;
74914 + size_t req_count = 0;
74915 + unsigned char oldmode = 0;
74916 +
74917 + mutex_lock(&gr_dev_mutex);
74918 +
74919 + if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
74920 + error = -EPERM;
74921 + goto out;
74922 + }
74923 +
74924 +#ifdef CONFIG_COMPAT
74925 + pax_open_kernel();
74926 + if (is_compat_task()) {
74927 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
74928 + copy_gr_arg = &copy_gr_arg_compat;
74929 + copy_acl_object_label = &copy_acl_object_label_compat;
74930 + copy_acl_subject_label = &copy_acl_subject_label_compat;
74931 + copy_acl_role_label = &copy_acl_role_label_compat;
74932 + copy_acl_ip_label = &copy_acl_ip_label_compat;
74933 + copy_role_allowed_ip = &copy_role_allowed_ip_compat;
74934 + copy_role_transition = &copy_role_transition_compat;
74935 + copy_sprole_pw = &copy_sprole_pw_compat;
74936 + copy_gr_hash_struct = &copy_gr_hash_struct_compat;
74937 + copy_pointer_from_array = &copy_pointer_from_array_compat;
74938 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
74939 + } else {
74940 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
74941 + copy_gr_arg = &copy_gr_arg_normal;
74942 + copy_acl_object_label = &copy_acl_object_label_normal;
74943 + copy_acl_subject_label = &copy_acl_subject_label_normal;
74944 + copy_acl_role_label = &copy_acl_role_label_normal;
74945 + copy_acl_ip_label = &copy_acl_ip_label_normal;
74946 + copy_role_allowed_ip = &copy_role_allowed_ip_normal;
74947 + copy_role_transition = &copy_role_transition_normal;
74948 + copy_sprole_pw = &copy_sprole_pw_normal;
74949 + copy_gr_hash_struct = &copy_gr_hash_struct_normal;
74950 + copy_pointer_from_array = &copy_pointer_from_array_normal;
74951 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
74952 + }
74953 + pax_close_kernel();
74954 +#endif
74955 +
74956 + req_count = get_gr_arg_wrapper_size();
74957 +
74958 + if (count != req_count) {
74959 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
74960 + error = -EINVAL;
74961 + goto out;
74962 + }
74963 +
74964 +
74965 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
74966 + gr_auth_expires = 0;
74967 + gr_auth_attempts = 0;
74968 + }
74969 +
74970 + error = copy_gr_arg_wrapper(buf, &uwrap);
74971 + if (error)
74972 + goto out;
74973 +
74974 + error = copy_gr_arg(uwrap.arg, gr_usermode);
74975 + if (error)
74976 + goto out;
74977 +
74978 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
74979 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
74980 + time_after(gr_auth_expires, get_seconds())) {
74981 + error = -EBUSY;
74982 + goto out;
74983 + }
74984 +
74985 + /* if non-root trying to do anything other than use a special role,
74986 + do not attempt authentication, do not count towards authentication
74987 + locking
74988 + */
74989 +
74990 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
74991 + gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
74992 + gr_is_global_nonroot(current_uid())) {
74993 + error = -EPERM;
74994 + goto out;
74995 + }
74996 +
74997 + /* ensure pw and special role name are null terminated */
74998 +
74999 + gr_usermode->pw[GR_PW_LEN - 1] = '\0';
75000 + gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
75001 +
75002 + /* Okay.
75003 + * We have our enough of the argument structure..(we have yet
75004 + * to copy_from_user the tables themselves) . Copy the tables
75005 + * only if we need them, i.e. for loading operations. */
75006 +
75007 + switch (gr_usermode->mode) {
75008 + case GR_STATUS:
75009 + if (gr_acl_is_enabled()) {
75010 + error = 1;
75011 + if (!gr_check_secure_terminal(current))
75012 + error = 3;
75013 + } else
75014 + error = 2;
75015 + goto out;
75016 + case GR_SHUTDOWN:
75017 + if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75018 + stop_machine(gr_rbac_disable, NULL, NULL);
75019 + free_variables(false);
75020 + memset(gr_usermode, 0, sizeof(struct gr_arg));
75021 + memset(gr_system_salt, 0, GR_SALT_LEN);
75022 + memset(gr_system_sum, 0, GR_SHA_LEN);
75023 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
75024 + } else if (gr_acl_is_enabled()) {
75025 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
75026 + error = -EPERM;
75027 + } else {
75028 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
75029 + error = -EAGAIN;
75030 + }
75031 + break;
75032 + case GR_ENABLE:
75033 + if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
75034 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
75035 + else {
75036 + if (gr_acl_is_enabled())
75037 + error = -EAGAIN;
75038 + else
75039 + error = error2;
75040 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
75041 + }
75042 + break;
75043 + case GR_OLDRELOAD:
75044 + oldmode = 1;
75045 + case GR_RELOAD:
75046 + if (!gr_acl_is_enabled()) {
75047 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
75048 + error = -EAGAIN;
75049 + } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75050 + error2 = gracl_reload(gr_usermode, oldmode);
75051 + if (!error2)
75052 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
75053 + else {
75054 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75055 + error = error2;
75056 + }
75057 + } else {
75058 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75059 + error = -EPERM;
75060 + }
75061 + break;
75062 + case GR_SEGVMOD:
75063 + if (unlikely(!gr_acl_is_enabled())) {
75064 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
75065 + error = -EAGAIN;
75066 + break;
75067 + }
75068 +
75069 + if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75070 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
75071 + if (gr_usermode->segv_device && gr_usermode->segv_inode) {
75072 + struct acl_subject_label *segvacl;
75073 + segvacl =
75074 + lookup_acl_subj_label(gr_usermode->segv_inode,
75075 + gr_usermode->segv_device,
75076 + current->role);
75077 + if (segvacl) {
75078 + segvacl->crashes = 0;
75079 + segvacl->expires = 0;
75080 + }
75081 + } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
75082 + gr_remove_uid(gr_usermode->segv_uid);
75083 + }
75084 + } else {
75085 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
75086 + error = -EPERM;
75087 + }
75088 + break;
75089 + case GR_SPROLE:
75090 + case GR_SPROLEPAM:
75091 + if (unlikely(!gr_acl_is_enabled())) {
75092 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
75093 + error = -EAGAIN;
75094 + break;
75095 + }
75096 +
75097 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
75098 + current->role->expires = 0;
75099 + current->role->auth_attempts = 0;
75100 + }
75101 +
75102 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75103 + time_after(current->role->expires, get_seconds())) {
75104 + error = -EBUSY;
75105 + goto out;
75106 + }
75107 +
75108 + if (lookup_special_role_auth
75109 + (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75110 + && ((!sprole_salt && !sprole_sum)
75111 + || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75112 + char *p = "";
75113 + assign_special_role(gr_usermode->sp_role);
75114 + read_lock(&tasklist_lock);
75115 + if (current->real_parent)
75116 + p = current->real_parent->role->rolename;
75117 + read_unlock(&tasklist_lock);
75118 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75119 + p, acl_sp_role_value);
75120 + } else {
75121 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75122 + error = -EPERM;
75123 + if(!(current->role->auth_attempts++))
75124 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75125 +
75126 + goto out;
75127 + }
75128 + break;
75129 + case GR_UNSPROLE:
75130 + if (unlikely(!gr_acl_is_enabled())) {
75131 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75132 + error = -EAGAIN;
75133 + break;
75134 + }
75135 +
75136 + if (current->role->roletype & GR_ROLE_SPECIAL) {
75137 + char *p = "";
75138 + int i = 0;
75139 +
75140 + read_lock(&tasklist_lock);
75141 + if (current->real_parent) {
75142 + p = current->real_parent->role->rolename;
75143 + i = current->real_parent->acl_role_id;
75144 + }
75145 + read_unlock(&tasklist_lock);
75146 +
75147 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75148 + gr_set_acls(1);
75149 + } else {
75150 + error = -EPERM;
75151 + goto out;
75152 + }
75153 + break;
75154 + default:
75155 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75156 + error = -EINVAL;
75157 + break;
75158 + }
75159 +
75160 + if (error != -EPERM)
75161 + goto out;
75162 +
75163 + if(!(gr_auth_attempts++))
75164 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75165 +
75166 + out:
75167 + mutex_unlock(&gr_dev_mutex);
75168 +
75169 + if (!error)
75170 + error = req_count;
75171 +
75172 + return error;
75173 +}
75174 +
75175 +int
75176 +gr_set_acls(const int type)
75177 +{
75178 + struct task_struct *task, *task2;
75179 + struct acl_role_label *role = current->role;
75180 + struct acl_subject_label *subj;
75181 + __u16 acl_role_id = current->acl_role_id;
75182 + const struct cred *cred;
75183 + int ret;
75184 +
75185 + rcu_read_lock();
75186 + read_lock(&tasklist_lock);
75187 + read_lock(&grsec_exec_file_lock);
75188 + do_each_thread(task2, task) {
75189 + /* check to see if we're called from the exit handler,
75190 + if so, only replace ACLs that have inherited the admin
75191 + ACL */
75192 +
75193 + if (type && (task->role != role ||
75194 + task->acl_role_id != acl_role_id))
75195 + continue;
75196 +
75197 + task->acl_role_id = 0;
75198 + task->acl_sp_role = 0;
75199 + task->inherited = 0;
75200 +
75201 + if (task->exec_file) {
75202 + cred = __task_cred(task);
75203 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75204 + subj = __gr_get_subject_for_task(polstate, task, NULL);
75205 + if (subj == NULL) {
75206 + ret = -EINVAL;
75207 + read_unlock(&grsec_exec_file_lock);
75208 + read_unlock(&tasklist_lock);
75209 + rcu_read_unlock();
75210 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75211 + return ret;
75212 + }
75213 + __gr_apply_subject_to_task(polstate, task, subj);
75214 + } else {
75215 + // it's a kernel process
75216 + task->role = polstate->kernel_role;
75217 + task->acl = polstate->kernel_role->root_label;
75218 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75219 + task->acl->mode &= ~GR_PROCFIND;
75220 +#endif
75221 + }
75222 + } while_each_thread(task2, task);
75223 + read_unlock(&grsec_exec_file_lock);
75224 + read_unlock(&tasklist_lock);
75225 + rcu_read_unlock();
75226 +
75227 + return 0;
75228 +}
75229 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75230 new file mode 100644
75231 index 0000000..39645c9
75232 --- /dev/null
75233 +++ b/grsecurity/gracl_res.c
75234 @@ -0,0 +1,68 @@
75235 +#include <linux/kernel.h>
75236 +#include <linux/sched.h>
75237 +#include <linux/gracl.h>
75238 +#include <linux/grinternal.h>
75239 +
75240 +static const char *restab_log[] = {
75241 + [RLIMIT_CPU] = "RLIMIT_CPU",
75242 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75243 + [RLIMIT_DATA] = "RLIMIT_DATA",
75244 + [RLIMIT_STACK] = "RLIMIT_STACK",
75245 + [RLIMIT_CORE] = "RLIMIT_CORE",
75246 + [RLIMIT_RSS] = "RLIMIT_RSS",
75247 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
75248 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75249 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75250 + [RLIMIT_AS] = "RLIMIT_AS",
75251 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75252 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75253 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75254 + [RLIMIT_NICE] = "RLIMIT_NICE",
75255 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75256 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75257 + [GR_CRASH_RES] = "RLIMIT_CRASH"
75258 +};
75259 +
75260 +void
75261 +gr_log_resource(const struct task_struct *task,
75262 + const int res, const unsigned long wanted, const int gt)
75263 +{
75264 + const struct cred *cred;
75265 + unsigned long rlim;
75266 +
75267 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
75268 + return;
75269 +
75270 + // not yet supported resource
75271 + if (unlikely(!restab_log[res]))
75272 + return;
75273 +
75274 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75275 + rlim = task_rlimit_max(task, res);
75276 + else
75277 + rlim = task_rlimit(task, res);
75278 +
75279 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75280 + return;
75281 +
75282 + rcu_read_lock();
75283 + cred = __task_cred(task);
75284 +
75285 + if (res == RLIMIT_NPROC &&
75286 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75287 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75288 + goto out_rcu_unlock;
75289 + else if (res == RLIMIT_MEMLOCK &&
75290 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
75291 + goto out_rcu_unlock;
75292 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
75293 + goto out_rcu_unlock;
75294 + rcu_read_unlock();
75295 +
75296 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
75297 +
75298 + return;
75299 +out_rcu_unlock:
75300 + rcu_read_unlock();
75301 + return;
75302 +}
75303 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
75304 new file mode 100644
75305 index 0000000..2040e61
75306 --- /dev/null
75307 +++ b/grsecurity/gracl_segv.c
75308 @@ -0,0 +1,313 @@
75309 +#include <linux/kernel.h>
75310 +#include <linux/mm.h>
75311 +#include <asm/uaccess.h>
75312 +#include <asm/errno.h>
75313 +#include <asm/mman.h>
75314 +#include <net/sock.h>
75315 +#include <linux/file.h>
75316 +#include <linux/fs.h>
75317 +#include <linux/net.h>
75318 +#include <linux/in.h>
75319 +#include <linux/slab.h>
75320 +#include <linux/types.h>
75321 +#include <linux/sched.h>
75322 +#include <linux/timer.h>
75323 +#include <linux/gracl.h>
75324 +#include <linux/grsecurity.h>
75325 +#include <linux/grinternal.h>
75326 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75327 +#include <linux/magic.h>
75328 +#include <linux/pagemap.h>
75329 +#include "../fs/btrfs/async-thread.h"
75330 +#include "../fs/btrfs/ctree.h"
75331 +#include "../fs/btrfs/btrfs_inode.h"
75332 +#endif
75333 +
75334 +static struct crash_uid *uid_set;
75335 +static unsigned short uid_used;
75336 +static DEFINE_SPINLOCK(gr_uid_lock);
75337 +extern rwlock_t gr_inode_lock;
75338 +extern struct acl_subject_label *
75339 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
75340 + struct acl_role_label *role);
75341 +
75342 +static inline dev_t __get_dev(const struct dentry *dentry)
75343 +{
75344 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75345 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
75346 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
75347 + else
75348 +#endif
75349 + return dentry->d_sb->s_dev;
75350 +}
75351 +
75352 +int
75353 +gr_init_uidset(void)
75354 +{
75355 + uid_set =
75356 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
75357 + uid_used = 0;
75358 +
75359 + return uid_set ? 1 : 0;
75360 +}
75361 +
75362 +void
75363 +gr_free_uidset(void)
75364 +{
75365 + if (uid_set) {
75366 + struct crash_uid *tmpset;
75367 + spin_lock(&gr_uid_lock);
75368 + tmpset = uid_set;
75369 + uid_set = NULL;
75370 + uid_used = 0;
75371 + spin_unlock(&gr_uid_lock);
75372 + if (tmpset)
75373 + kfree(tmpset);
75374 + }
75375 +
75376 + return;
75377 +}
75378 +
75379 +int
75380 +gr_find_uid(const uid_t uid)
75381 +{
75382 + struct crash_uid *tmp = uid_set;
75383 + uid_t buid;
75384 + int low = 0, high = uid_used - 1, mid;
75385 +
75386 + while (high >= low) {
75387 + mid = (low + high) >> 1;
75388 + buid = tmp[mid].uid;
75389 + if (buid == uid)
75390 + return mid;
75391 + if (buid > uid)
75392 + high = mid - 1;
75393 + if (buid < uid)
75394 + low = mid + 1;
75395 + }
75396 +
75397 + return -1;
75398 +}
75399 +
75400 +static __inline__ void
75401 +gr_insertsort(void)
75402 +{
75403 + unsigned short i, j;
75404 + struct crash_uid index;
75405 +
75406 + for (i = 1; i < uid_used; i++) {
75407 + index = uid_set[i];
75408 + j = i;
75409 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
75410 + uid_set[j] = uid_set[j - 1];
75411 + j--;
75412 + }
75413 + uid_set[j] = index;
75414 + }
75415 +
75416 + return;
75417 +}
75418 +
75419 +static __inline__ void
75420 +gr_insert_uid(const kuid_t kuid, const unsigned long expires)
75421 +{
75422 + int loc;
75423 + uid_t uid = GR_GLOBAL_UID(kuid);
75424 +
75425 + if (uid_used == GR_UIDTABLE_MAX)
75426 + return;
75427 +
75428 + loc = gr_find_uid(uid);
75429 +
75430 + if (loc >= 0) {
75431 + uid_set[loc].expires = expires;
75432 + return;
75433 + }
75434 +
75435 + uid_set[uid_used].uid = uid;
75436 + uid_set[uid_used].expires = expires;
75437 + uid_used++;
75438 +
75439 + gr_insertsort();
75440 +
75441 + return;
75442 +}
75443 +
75444 +void
75445 +gr_remove_uid(const unsigned short loc)
75446 +{
75447 + unsigned short i;
75448 +
75449 + for (i = loc + 1; i < uid_used; i++)
75450 + uid_set[i - 1] = uid_set[i];
75451 +
75452 + uid_used--;
75453 +
75454 + return;
75455 +}
75456 +
75457 +int
75458 +gr_check_crash_uid(const kuid_t kuid)
75459 +{
75460 + int loc;
75461 + int ret = 0;
75462 + uid_t uid;
75463 +
75464 + if (unlikely(!gr_acl_is_enabled()))
75465 + return 0;
75466 +
75467 + uid = GR_GLOBAL_UID(kuid);
75468 +
75469 + spin_lock(&gr_uid_lock);
75470 + loc = gr_find_uid(uid);
75471 +
75472 + if (loc < 0)
75473 + goto out_unlock;
75474 +
75475 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
75476 + gr_remove_uid(loc);
75477 + else
75478 + ret = 1;
75479 +
75480 +out_unlock:
75481 + spin_unlock(&gr_uid_lock);
75482 + return ret;
75483 +}
75484 +
75485 +static __inline__ int
75486 +proc_is_setxid(const struct cred *cred)
75487 +{
75488 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
75489 + !uid_eq(cred->uid, cred->fsuid))
75490 + return 1;
75491 + if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
75492 + !gid_eq(cred->gid, cred->fsgid))
75493 + return 1;
75494 +
75495 + return 0;
75496 +}
75497 +
75498 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
75499 +
75500 +void
75501 +gr_handle_crash(struct task_struct *task, const int sig)
75502 +{
75503 + struct acl_subject_label *curr;
75504 + struct task_struct *tsk, *tsk2;
75505 + const struct cred *cred;
75506 + const struct cred *cred2;
75507 +
75508 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
75509 + return;
75510 +
75511 + if (unlikely(!gr_acl_is_enabled()))
75512 + return;
75513 +
75514 + curr = task->acl;
75515 +
75516 + if (!(curr->resmask & (1U << GR_CRASH_RES)))
75517 + return;
75518 +
75519 + if (time_before_eq(curr->expires, get_seconds())) {
75520 + curr->expires = 0;
75521 + curr->crashes = 0;
75522 + }
75523 +
75524 + curr->crashes++;
75525 +
75526 + if (!curr->expires)
75527 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
75528 +
75529 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75530 + time_after(curr->expires, get_seconds())) {
75531 + rcu_read_lock();
75532 + cred = __task_cred(task);
75533 + if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
75534 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75535 + spin_lock(&gr_uid_lock);
75536 + gr_insert_uid(cred->uid, curr->expires);
75537 + spin_unlock(&gr_uid_lock);
75538 + curr->expires = 0;
75539 + curr->crashes = 0;
75540 + read_lock(&tasklist_lock);
75541 + do_each_thread(tsk2, tsk) {
75542 + cred2 = __task_cred(tsk);
75543 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
75544 + gr_fake_force_sig(SIGKILL, tsk);
75545 + } while_each_thread(tsk2, tsk);
75546 + read_unlock(&tasklist_lock);
75547 + } else {
75548 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75549 + read_lock(&tasklist_lock);
75550 + read_lock(&grsec_exec_file_lock);
75551 + do_each_thread(tsk2, tsk) {
75552 + if (likely(tsk != task)) {
75553 + // if this thread has the same subject as the one that triggered
75554 + // RES_CRASH and it's the same binary, kill it
75555 + if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
75556 + gr_fake_force_sig(SIGKILL, tsk);
75557 + }
75558 + } while_each_thread(tsk2, tsk);
75559 + read_unlock(&grsec_exec_file_lock);
75560 + read_unlock(&tasklist_lock);
75561 + }
75562 + rcu_read_unlock();
75563 + }
75564 +
75565 + return;
75566 +}
75567 +
75568 +int
75569 +gr_check_crash_exec(const struct file *filp)
75570 +{
75571 + struct acl_subject_label *curr;
75572 +
75573 + if (unlikely(!gr_acl_is_enabled()))
75574 + return 0;
75575 +
75576 + read_lock(&gr_inode_lock);
75577 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
75578 + __get_dev(filp->f_path.dentry),
75579 + current->role);
75580 + read_unlock(&gr_inode_lock);
75581 +
75582 + if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
75583 + (!curr->crashes && !curr->expires))
75584 + return 0;
75585 +
75586 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75587 + time_after(curr->expires, get_seconds()))
75588 + return 1;
75589 + else if (time_before_eq(curr->expires, get_seconds())) {
75590 + curr->crashes = 0;
75591 + curr->expires = 0;
75592 + }
75593 +
75594 + return 0;
75595 +}
75596 +
75597 +void
75598 +gr_handle_alertkill(struct task_struct *task)
75599 +{
75600 + struct acl_subject_label *curracl;
75601 + __u32 curr_ip;
75602 + struct task_struct *p, *p2;
75603 +
75604 + if (unlikely(!gr_acl_is_enabled()))
75605 + return;
75606 +
75607 + curracl = task->acl;
75608 + curr_ip = task->signal->curr_ip;
75609 +
75610 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
75611 + read_lock(&tasklist_lock);
75612 + do_each_thread(p2, p) {
75613 + if (p->signal->curr_ip == curr_ip)
75614 + gr_fake_force_sig(SIGKILL, p);
75615 + } while_each_thread(p2, p);
75616 + read_unlock(&tasklist_lock);
75617 + } else if (curracl->mode & GR_KILLPROC)
75618 + gr_fake_force_sig(SIGKILL, task);
75619 +
75620 + return;
75621 +}
75622 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
75623 new file mode 100644
75624 index 0000000..6b0c9cc
75625 --- /dev/null
75626 +++ b/grsecurity/gracl_shm.c
75627 @@ -0,0 +1,40 @@
75628 +#include <linux/kernel.h>
75629 +#include <linux/mm.h>
75630 +#include <linux/sched.h>
75631 +#include <linux/file.h>
75632 +#include <linux/ipc.h>
75633 +#include <linux/gracl.h>
75634 +#include <linux/grsecurity.h>
75635 +#include <linux/grinternal.h>
75636 +
75637 +int
75638 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75639 + const u64 shm_createtime, const kuid_t cuid, const int shmid)
75640 +{
75641 + struct task_struct *task;
75642 +
75643 + if (!gr_acl_is_enabled())
75644 + return 1;
75645 +
75646 + rcu_read_lock();
75647 + read_lock(&tasklist_lock);
75648 +
75649 + task = find_task_by_vpid(shm_cprid);
75650 +
75651 + if (unlikely(!task))
75652 + task = find_task_by_vpid(shm_lapid);
75653 +
75654 + if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
75655 + (task_pid_nr(task) == shm_lapid)) &&
75656 + (task->acl->mode & GR_PROTSHM) &&
75657 + (task->acl != current->acl))) {
75658 + read_unlock(&tasklist_lock);
75659 + rcu_read_unlock();
75660 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
75661 + return 0;
75662 + }
75663 + read_unlock(&tasklist_lock);
75664 + rcu_read_unlock();
75665 +
75666 + return 1;
75667 +}
75668 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
75669 new file mode 100644
75670 index 0000000..bc0be01
75671 --- /dev/null
75672 +++ b/grsecurity/grsec_chdir.c
75673 @@ -0,0 +1,19 @@
75674 +#include <linux/kernel.h>
75675 +#include <linux/sched.h>
75676 +#include <linux/fs.h>
75677 +#include <linux/file.h>
75678 +#include <linux/grsecurity.h>
75679 +#include <linux/grinternal.h>
75680 +
75681 +void
75682 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
75683 +{
75684 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
75685 + if ((grsec_enable_chdir && grsec_enable_group &&
75686 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
75687 + !grsec_enable_group)) {
75688 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
75689 + }
75690 +#endif
75691 + return;
75692 +}
75693 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
75694 new file mode 100644
75695 index 0000000..6d99cec
75696 --- /dev/null
75697 +++ b/grsecurity/grsec_chroot.c
75698 @@ -0,0 +1,385 @@
75699 +#include <linux/kernel.h>
75700 +#include <linux/module.h>
75701 +#include <linux/sched.h>
75702 +#include <linux/file.h>
75703 +#include <linux/fs.h>
75704 +#include <linux/mount.h>
75705 +#include <linux/types.h>
75706 +#include "../fs/mount.h"
75707 +#include <linux/grsecurity.h>
75708 +#include <linux/grinternal.h>
75709 +
75710 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75711 +int gr_init_ran;
75712 +#endif
75713 +
75714 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
75715 +{
75716 +#ifdef CONFIG_GRKERNSEC
75717 + if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
75718 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
75719 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75720 + && gr_init_ran
75721 +#endif
75722 + )
75723 + task->gr_is_chrooted = 1;
75724 + else {
75725 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75726 + if (task_pid_nr(task) == 1 && !gr_init_ran)
75727 + gr_init_ran = 1;
75728 +#endif
75729 + task->gr_is_chrooted = 0;
75730 + }
75731 +
75732 + task->gr_chroot_dentry = path->dentry;
75733 +#endif
75734 + return;
75735 +}
75736 +
75737 +void gr_clear_chroot_entries(struct task_struct *task)
75738 +{
75739 +#ifdef CONFIG_GRKERNSEC
75740 + task->gr_is_chrooted = 0;
75741 + task->gr_chroot_dentry = NULL;
75742 +#endif
75743 + return;
75744 +}
75745 +
75746 +int
75747 +gr_handle_chroot_unix(const pid_t pid)
75748 +{
75749 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
75750 + struct task_struct *p;
75751 +
75752 + if (unlikely(!grsec_enable_chroot_unix))
75753 + return 1;
75754 +
75755 + if (likely(!proc_is_chrooted(current)))
75756 + return 1;
75757 +
75758 + rcu_read_lock();
75759 + read_lock(&tasklist_lock);
75760 + p = find_task_by_vpid_unrestricted(pid);
75761 + if (unlikely(p && !have_same_root(current, p))) {
75762 + read_unlock(&tasklist_lock);
75763 + rcu_read_unlock();
75764 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
75765 + return 0;
75766 + }
75767 + read_unlock(&tasklist_lock);
75768 + rcu_read_unlock();
75769 +#endif
75770 + return 1;
75771 +}
75772 +
75773 +int
75774 +gr_handle_chroot_nice(void)
75775 +{
75776 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75777 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
75778 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
75779 + return -EPERM;
75780 + }
75781 +#endif
75782 + return 0;
75783 +}
75784 +
75785 +int
75786 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
75787 +{
75788 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75789 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
75790 + && proc_is_chrooted(current)) {
75791 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
75792 + return -EACCES;
75793 + }
75794 +#endif
75795 + return 0;
75796 +}
75797 +
75798 +int
75799 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
75800 +{
75801 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75802 + struct task_struct *p;
75803 + int ret = 0;
75804 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
75805 + return ret;
75806 +
75807 + read_lock(&tasklist_lock);
75808 + do_each_pid_task(pid, type, p) {
75809 + if (!have_same_root(current, p)) {
75810 + ret = 1;
75811 + goto out;
75812 + }
75813 + } while_each_pid_task(pid, type, p);
75814 +out:
75815 + read_unlock(&tasklist_lock);
75816 + return ret;
75817 +#endif
75818 + return 0;
75819 +}
75820 +
75821 +int
75822 +gr_pid_is_chrooted(struct task_struct *p)
75823 +{
75824 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75825 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
75826 + return 0;
75827 +
75828 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
75829 + !have_same_root(current, p)) {
75830 + return 1;
75831 + }
75832 +#endif
75833 + return 0;
75834 +}
75835 +
75836 +EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
75837 +
75838 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
75839 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
75840 +{
75841 + struct path path, currentroot;
75842 + int ret = 0;
75843 +
75844 + path.dentry = (struct dentry *)u_dentry;
75845 + path.mnt = (struct vfsmount *)u_mnt;
75846 + get_fs_root(current->fs, &currentroot);
75847 + if (path_is_under(&path, &currentroot))
75848 + ret = 1;
75849 + path_put(&currentroot);
75850 +
75851 + return ret;
75852 +}
75853 +#endif
75854 +
75855 +int
75856 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
75857 +{
75858 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75859 + if (!grsec_enable_chroot_fchdir)
75860 + return 1;
75861 +
75862 + if (!proc_is_chrooted(current))
75863 + return 1;
75864 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
75865 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
75866 + return 0;
75867 + }
75868 +#endif
75869 + return 1;
75870 +}
75871 +
75872 +int
75873 +gr_chroot_fhandle(void)
75874 +{
75875 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75876 + if (!grsec_enable_chroot_fchdir)
75877 + return 1;
75878 +
75879 + if (!proc_is_chrooted(current))
75880 + return 1;
75881 + else {
75882 + gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
75883 + return 0;
75884 + }
75885 +#endif
75886 + return 1;
75887 +}
75888 +
75889 +int
75890 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75891 + const u64 shm_createtime)
75892 +{
75893 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
75894 + struct task_struct *p;
75895 +
75896 + if (unlikely(!grsec_enable_chroot_shmat))
75897 + return 1;
75898 +
75899 + if (likely(!proc_is_chrooted(current)))
75900 + return 1;
75901 +
75902 + rcu_read_lock();
75903 + read_lock(&tasklist_lock);
75904 +
75905 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
75906 + if (time_before_eq64(p->start_time, shm_createtime)) {
75907 + if (have_same_root(current, p)) {
75908 + goto allow;
75909 + } else {
75910 + read_unlock(&tasklist_lock);
75911 + rcu_read_unlock();
75912 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75913 + return 0;
75914 + }
75915 + }
75916 + /* creator exited, pid reuse, fall through to next check */
75917 + }
75918 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
75919 + if (unlikely(!have_same_root(current, p))) {
75920 + read_unlock(&tasklist_lock);
75921 + rcu_read_unlock();
75922 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75923 + return 0;
75924 + }
75925 + }
75926 +
75927 +allow:
75928 + read_unlock(&tasklist_lock);
75929 + rcu_read_unlock();
75930 +#endif
75931 + return 1;
75932 +}
75933 +
75934 +void
75935 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
75936 +{
75937 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
75938 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
75939 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
75940 +#endif
75941 + return;
75942 +}
75943 +
75944 +int
75945 +gr_handle_chroot_mknod(const struct dentry *dentry,
75946 + const struct vfsmount *mnt, const int mode)
75947 +{
75948 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
75949 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
75950 + proc_is_chrooted(current)) {
75951 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
75952 + return -EPERM;
75953 + }
75954 +#endif
75955 + return 0;
75956 +}
75957 +
75958 +int
75959 +gr_handle_chroot_mount(const struct dentry *dentry,
75960 + const struct vfsmount *mnt, const char *dev_name)
75961 +{
75962 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
75963 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
75964 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
75965 + return -EPERM;
75966 + }
75967 +#endif
75968 + return 0;
75969 +}
75970 +
75971 +int
75972 +gr_handle_chroot_pivot(void)
75973 +{
75974 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
75975 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
75976 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
75977 + return -EPERM;
75978 + }
75979 +#endif
75980 + return 0;
75981 +}
75982 +
75983 +int
75984 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
75985 +{
75986 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
75987 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
75988 + !gr_is_outside_chroot(dentry, mnt)) {
75989 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
75990 + return -EPERM;
75991 + }
75992 +#endif
75993 + return 0;
75994 +}
75995 +
75996 +extern const char *captab_log[];
75997 +extern int captab_log_entries;
75998 +
75999 +int
76000 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76001 +{
76002 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76003 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76004 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76005 + if (cap_raised(chroot_caps, cap)) {
76006 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
76007 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
76008 + }
76009 + return 0;
76010 + }
76011 + }
76012 +#endif
76013 + return 1;
76014 +}
76015 +
76016 +int
76017 +gr_chroot_is_capable(const int cap)
76018 +{
76019 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76020 + return gr_task_chroot_is_capable(current, current_cred(), cap);
76021 +#endif
76022 + return 1;
76023 +}
76024 +
76025 +int
76026 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
76027 +{
76028 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76029 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76030 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76031 + if (cap_raised(chroot_caps, cap)) {
76032 + return 0;
76033 + }
76034 + }
76035 +#endif
76036 + return 1;
76037 +}
76038 +
76039 +int
76040 +gr_chroot_is_capable_nolog(const int cap)
76041 +{
76042 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76043 + return gr_task_chroot_is_capable_nolog(current, cap);
76044 +#endif
76045 + return 1;
76046 +}
76047 +
76048 +int
76049 +gr_handle_chroot_sysctl(const int op)
76050 +{
76051 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76052 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
76053 + proc_is_chrooted(current))
76054 + return -EACCES;
76055 +#endif
76056 + return 0;
76057 +}
76058 +
76059 +void
76060 +gr_handle_chroot_chdir(const struct path *path)
76061 +{
76062 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76063 + if (grsec_enable_chroot_chdir)
76064 + set_fs_pwd(current->fs, path);
76065 +#endif
76066 + return;
76067 +}
76068 +
76069 +int
76070 +gr_handle_chroot_chmod(const struct dentry *dentry,
76071 + const struct vfsmount *mnt, const int mode)
76072 +{
76073 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76074 + /* allow chmod +s on directories, but not files */
76075 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
76076 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
76077 + proc_is_chrooted(current)) {
76078 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
76079 + return -EPERM;
76080 + }
76081 +#endif
76082 + return 0;
76083 +}
76084 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
76085 new file mode 100644
76086 index 0000000..0f9ac91
76087 --- /dev/null
76088 +++ b/grsecurity/grsec_disabled.c
76089 @@ -0,0 +1,440 @@
76090 +#include <linux/kernel.h>
76091 +#include <linux/module.h>
76092 +#include <linux/sched.h>
76093 +#include <linux/file.h>
76094 +#include <linux/fs.h>
76095 +#include <linux/kdev_t.h>
76096 +#include <linux/net.h>
76097 +#include <linux/in.h>
76098 +#include <linux/ip.h>
76099 +#include <linux/skbuff.h>
76100 +#include <linux/sysctl.h>
76101 +
76102 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
76103 +void
76104 +pax_set_initial_flags(struct linux_binprm *bprm)
76105 +{
76106 + return;
76107 +}
76108 +#endif
76109 +
76110 +#ifdef CONFIG_SYSCTL
76111 +__u32
76112 +gr_handle_sysctl(const struct ctl_table * table, const int op)
76113 +{
76114 + return 0;
76115 +}
76116 +#endif
76117 +
76118 +#ifdef CONFIG_TASKSTATS
76119 +int gr_is_taskstats_denied(int pid)
76120 +{
76121 + return 0;
76122 +}
76123 +#endif
76124 +
76125 +int
76126 +gr_acl_is_enabled(void)
76127 +{
76128 + return 0;
76129 +}
76130 +
76131 +int
76132 +gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76133 +{
76134 + return 0;
76135 +}
76136 +
76137 +void
76138 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76139 +{
76140 + return;
76141 +}
76142 +
76143 +int
76144 +gr_handle_rawio(const struct inode *inode)
76145 +{
76146 + return 0;
76147 +}
76148 +
76149 +void
76150 +gr_acl_handle_psacct(struct task_struct *task, const long code)
76151 +{
76152 + return;
76153 +}
76154 +
76155 +int
76156 +gr_handle_ptrace(struct task_struct *task, const long request)
76157 +{
76158 + return 0;
76159 +}
76160 +
76161 +int
76162 +gr_handle_proc_ptrace(struct task_struct *task)
76163 +{
76164 + return 0;
76165 +}
76166 +
76167 +int
76168 +gr_set_acls(const int type)
76169 +{
76170 + return 0;
76171 +}
76172 +
76173 +int
76174 +gr_check_hidden_task(const struct task_struct *tsk)
76175 +{
76176 + return 0;
76177 +}
76178 +
76179 +int
76180 +gr_check_protected_task(const struct task_struct *task)
76181 +{
76182 + return 0;
76183 +}
76184 +
76185 +int
76186 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76187 +{
76188 + return 0;
76189 +}
76190 +
76191 +void
76192 +gr_copy_label(struct task_struct *tsk)
76193 +{
76194 + return;
76195 +}
76196 +
76197 +void
76198 +gr_set_pax_flags(struct task_struct *task)
76199 +{
76200 + return;
76201 +}
76202 +
76203 +int
76204 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
76205 + const int unsafe_share)
76206 +{
76207 + return 0;
76208 +}
76209 +
76210 +void
76211 +gr_handle_delete(const ino_t ino, const dev_t dev)
76212 +{
76213 + return;
76214 +}
76215 +
76216 +void
76217 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
76218 +{
76219 + return;
76220 +}
76221 +
76222 +void
76223 +gr_handle_crash(struct task_struct *task, const int sig)
76224 +{
76225 + return;
76226 +}
76227 +
76228 +int
76229 +gr_check_crash_exec(const struct file *filp)
76230 +{
76231 + return 0;
76232 +}
76233 +
76234 +int
76235 +gr_check_crash_uid(const kuid_t uid)
76236 +{
76237 + return 0;
76238 +}
76239 +
76240 +void
76241 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76242 + struct dentry *old_dentry,
76243 + struct dentry *new_dentry,
76244 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
76245 +{
76246 + return;
76247 +}
76248 +
76249 +int
76250 +gr_search_socket(const int family, const int type, const int protocol)
76251 +{
76252 + return 1;
76253 +}
76254 +
76255 +int
76256 +gr_search_connectbind(const int mode, const struct socket *sock,
76257 + const struct sockaddr_in *addr)
76258 +{
76259 + return 0;
76260 +}
76261 +
76262 +void
76263 +gr_handle_alertkill(struct task_struct *task)
76264 +{
76265 + return;
76266 +}
76267 +
76268 +__u32
76269 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
76270 +{
76271 + return 1;
76272 +}
76273 +
76274 +__u32
76275 +gr_acl_handle_hidden_file(const struct dentry * dentry,
76276 + const struct vfsmount * mnt)
76277 +{
76278 + return 1;
76279 +}
76280 +
76281 +__u32
76282 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
76283 + int acc_mode)
76284 +{
76285 + return 1;
76286 +}
76287 +
76288 +__u32
76289 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
76290 +{
76291 + return 1;
76292 +}
76293 +
76294 +__u32
76295 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
76296 +{
76297 + return 1;
76298 +}
76299 +
76300 +int
76301 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
76302 + unsigned int *vm_flags)
76303 +{
76304 + return 1;
76305 +}
76306 +
76307 +__u32
76308 +gr_acl_handle_truncate(const struct dentry * dentry,
76309 + const struct vfsmount * mnt)
76310 +{
76311 + return 1;
76312 +}
76313 +
76314 +__u32
76315 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
76316 +{
76317 + return 1;
76318 +}
76319 +
76320 +__u32
76321 +gr_acl_handle_access(const struct dentry * dentry,
76322 + const struct vfsmount * mnt, const int fmode)
76323 +{
76324 + return 1;
76325 +}
76326 +
76327 +__u32
76328 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
76329 + umode_t *mode)
76330 +{
76331 + return 1;
76332 +}
76333 +
76334 +__u32
76335 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
76336 +{
76337 + return 1;
76338 +}
76339 +
76340 +__u32
76341 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
76342 +{
76343 + return 1;
76344 +}
76345 +
76346 +__u32
76347 +gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
76348 +{
76349 + return 1;
76350 +}
76351 +
76352 +void
76353 +grsecurity_init(void)
76354 +{
76355 + return;
76356 +}
76357 +
76358 +umode_t gr_acl_umask(void)
76359 +{
76360 + return 0;
76361 +}
76362 +
76363 +__u32
76364 +gr_acl_handle_mknod(const struct dentry * new_dentry,
76365 + const struct dentry * parent_dentry,
76366 + const struct vfsmount * parent_mnt,
76367 + const int mode)
76368 +{
76369 + return 1;
76370 +}
76371 +
76372 +__u32
76373 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
76374 + const struct dentry * parent_dentry,
76375 + const struct vfsmount * parent_mnt)
76376 +{
76377 + return 1;
76378 +}
76379 +
76380 +__u32
76381 +gr_acl_handle_symlink(const struct dentry * new_dentry,
76382 + const struct dentry * parent_dentry,
76383 + const struct vfsmount * parent_mnt, const struct filename *from)
76384 +{
76385 + return 1;
76386 +}
76387 +
76388 +__u32
76389 +gr_acl_handle_link(const struct dentry * new_dentry,
76390 + const struct dentry * parent_dentry,
76391 + const struct vfsmount * parent_mnt,
76392 + const struct dentry * old_dentry,
76393 + const struct vfsmount * old_mnt, const struct filename *to)
76394 +{
76395 + return 1;
76396 +}
76397 +
76398 +int
76399 +gr_acl_handle_rename(const struct dentry *new_dentry,
76400 + const struct dentry *parent_dentry,
76401 + const struct vfsmount *parent_mnt,
76402 + const struct dentry *old_dentry,
76403 + const struct inode *old_parent_inode,
76404 + const struct vfsmount *old_mnt, const struct filename *newname,
76405 + unsigned int flags)
76406 +{
76407 + return 0;
76408 +}
76409 +
76410 +int
76411 +gr_acl_handle_filldir(const struct file *file, const char *name,
76412 + const int namelen, const ino_t ino)
76413 +{
76414 + return 1;
76415 +}
76416 +
76417 +int
76418 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76419 + const u64 shm_createtime, const kuid_t cuid, const int shmid)
76420 +{
76421 + return 1;
76422 +}
76423 +
76424 +int
76425 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
76426 +{
76427 + return 0;
76428 +}
76429 +
76430 +int
76431 +gr_search_accept(const struct socket *sock)
76432 +{
76433 + return 0;
76434 +}
76435 +
76436 +int
76437 +gr_search_listen(const struct socket *sock)
76438 +{
76439 + return 0;
76440 +}
76441 +
76442 +int
76443 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
76444 +{
76445 + return 0;
76446 +}
76447 +
76448 +__u32
76449 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
76450 +{
76451 + return 1;
76452 +}
76453 +
76454 +__u32
76455 +gr_acl_handle_creat(const struct dentry * dentry,
76456 + const struct dentry * p_dentry,
76457 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
76458 + const int imode)
76459 +{
76460 + return 1;
76461 +}
76462 +
76463 +void
76464 +gr_acl_handle_exit(void)
76465 +{
76466 + return;
76467 +}
76468 +
76469 +int
76470 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
76471 +{
76472 + return 1;
76473 +}
76474 +
76475 +void
76476 +gr_set_role_label(const kuid_t uid, const kgid_t gid)
76477 +{
76478 + return;
76479 +}
76480 +
76481 +int
76482 +gr_acl_handle_procpidmem(const struct task_struct *task)
76483 +{
76484 + return 0;
76485 +}
76486 +
76487 +int
76488 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
76489 +{
76490 + return 0;
76491 +}
76492 +
76493 +int
76494 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
76495 +{
76496 + return 0;
76497 +}
76498 +
76499 +int
76500 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
76501 +{
76502 + return 0;
76503 +}
76504 +
76505 +int
76506 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
76507 +{
76508 + return 0;
76509 +}
76510 +
76511 +int gr_acl_enable_at_secure(void)
76512 +{
76513 + return 0;
76514 +}
76515 +
76516 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
76517 +{
76518 + return dentry->d_sb->s_dev;
76519 +}
76520 +
76521 +void gr_put_exec_file(struct task_struct *task)
76522 +{
76523 + return;
76524 +}
76525 +
76526 +#ifdef CONFIG_SECURITY
76527 +EXPORT_SYMBOL_GPL(gr_check_user_change);
76528 +EXPORT_SYMBOL_GPL(gr_check_group_change);
76529 +#endif
76530 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
76531 new file mode 100644
76532 index 0000000..14638ff
76533 --- /dev/null
76534 +++ b/grsecurity/grsec_exec.c
76535 @@ -0,0 +1,188 @@
76536 +#include <linux/kernel.h>
76537 +#include <linux/sched.h>
76538 +#include <linux/file.h>
76539 +#include <linux/binfmts.h>
76540 +#include <linux/fs.h>
76541 +#include <linux/types.h>
76542 +#include <linux/grdefs.h>
76543 +#include <linux/grsecurity.h>
76544 +#include <linux/grinternal.h>
76545 +#include <linux/capability.h>
76546 +#include <linux/module.h>
76547 +#include <linux/compat.h>
76548 +
76549 +#include <asm/uaccess.h>
76550 +
76551 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76552 +static char gr_exec_arg_buf[132];
76553 +static DEFINE_MUTEX(gr_exec_arg_mutex);
76554 +#endif
76555 +
76556 +struct user_arg_ptr {
76557 +#ifdef CONFIG_COMPAT
76558 + bool is_compat;
76559 +#endif
76560 + union {
76561 + const char __user *const __user *native;
76562 +#ifdef CONFIG_COMPAT
76563 + const compat_uptr_t __user *compat;
76564 +#endif
76565 + } ptr;
76566 +};
76567 +
76568 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
76569 +
76570 +void
76571 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
76572 +{
76573 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76574 + char *grarg = gr_exec_arg_buf;
76575 + unsigned int i, x, execlen = 0;
76576 + char c;
76577 +
76578 + if (!((grsec_enable_execlog && grsec_enable_group &&
76579 + in_group_p(grsec_audit_gid))
76580 + || (grsec_enable_execlog && !grsec_enable_group)))
76581 + return;
76582 +
76583 + mutex_lock(&gr_exec_arg_mutex);
76584 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
76585 +
76586 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
76587 + const char __user *p;
76588 + unsigned int len;
76589 +
76590 + p = get_user_arg_ptr(argv, i);
76591 + if (IS_ERR(p))
76592 + goto log;
76593 +
76594 + len = strnlen_user(p, 128 - execlen);
76595 + if (len > 128 - execlen)
76596 + len = 128 - execlen;
76597 + else if (len > 0)
76598 + len--;
76599 + if (copy_from_user(grarg + execlen, p, len))
76600 + goto log;
76601 +
76602 + /* rewrite unprintable characters */
76603 + for (x = 0; x < len; x++) {
76604 + c = *(grarg + execlen + x);
76605 + if (c < 32 || c > 126)
76606 + *(grarg + execlen + x) = ' ';
76607 + }
76608 +
76609 + execlen += len;
76610 + *(grarg + execlen) = ' ';
76611 + *(grarg + execlen + 1) = '\0';
76612 + execlen++;
76613 + }
76614 +
76615 + log:
76616 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
76617 + bprm->file->f_path.mnt, grarg);
76618 + mutex_unlock(&gr_exec_arg_mutex);
76619 +#endif
76620 + return;
76621 +}
76622 +
76623 +#ifdef CONFIG_GRKERNSEC
76624 +extern int gr_acl_is_capable(const int cap);
76625 +extern int gr_acl_is_capable_nolog(const int cap);
76626 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76627 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
76628 +extern int gr_chroot_is_capable(const int cap);
76629 +extern int gr_chroot_is_capable_nolog(const int cap);
76630 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76631 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
76632 +#endif
76633 +
76634 +const char *captab_log[] = {
76635 + "CAP_CHOWN",
76636 + "CAP_DAC_OVERRIDE",
76637 + "CAP_DAC_READ_SEARCH",
76638 + "CAP_FOWNER",
76639 + "CAP_FSETID",
76640 + "CAP_KILL",
76641 + "CAP_SETGID",
76642 + "CAP_SETUID",
76643 + "CAP_SETPCAP",
76644 + "CAP_LINUX_IMMUTABLE",
76645 + "CAP_NET_BIND_SERVICE",
76646 + "CAP_NET_BROADCAST",
76647 + "CAP_NET_ADMIN",
76648 + "CAP_NET_RAW",
76649 + "CAP_IPC_LOCK",
76650 + "CAP_IPC_OWNER",
76651 + "CAP_SYS_MODULE",
76652 + "CAP_SYS_RAWIO",
76653 + "CAP_SYS_CHROOT",
76654 + "CAP_SYS_PTRACE",
76655 + "CAP_SYS_PACCT",
76656 + "CAP_SYS_ADMIN",
76657 + "CAP_SYS_BOOT",
76658 + "CAP_SYS_NICE",
76659 + "CAP_SYS_RESOURCE",
76660 + "CAP_SYS_TIME",
76661 + "CAP_SYS_TTY_CONFIG",
76662 + "CAP_MKNOD",
76663 + "CAP_LEASE",
76664 + "CAP_AUDIT_WRITE",
76665 + "CAP_AUDIT_CONTROL",
76666 + "CAP_SETFCAP",
76667 + "CAP_MAC_OVERRIDE",
76668 + "CAP_MAC_ADMIN",
76669 + "CAP_SYSLOG",
76670 + "CAP_WAKE_ALARM",
76671 + "CAP_BLOCK_SUSPEND"
76672 +};
76673 +
76674 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
76675 +
76676 +int gr_is_capable(const int cap)
76677 +{
76678 +#ifdef CONFIG_GRKERNSEC
76679 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
76680 + return 1;
76681 + return 0;
76682 +#else
76683 + return 1;
76684 +#endif
76685 +}
76686 +
76687 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76688 +{
76689 +#ifdef CONFIG_GRKERNSEC
76690 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
76691 + return 1;
76692 + return 0;
76693 +#else
76694 + return 1;
76695 +#endif
76696 +}
76697 +
76698 +int gr_is_capable_nolog(const int cap)
76699 +{
76700 +#ifdef CONFIG_GRKERNSEC
76701 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
76702 + return 1;
76703 + return 0;
76704 +#else
76705 + return 1;
76706 +#endif
76707 +}
76708 +
76709 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
76710 +{
76711 +#ifdef CONFIG_GRKERNSEC
76712 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
76713 + return 1;
76714 + return 0;
76715 +#else
76716 + return 1;
76717 +#endif
76718 +}
76719 +
76720 +EXPORT_SYMBOL_GPL(gr_is_capable);
76721 +EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
76722 +EXPORT_SYMBOL_GPL(gr_task_is_capable);
76723 +EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
76724 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
76725 new file mode 100644
76726 index 0000000..06cc6ea
76727 --- /dev/null
76728 +++ b/grsecurity/grsec_fifo.c
76729 @@ -0,0 +1,24 @@
76730 +#include <linux/kernel.h>
76731 +#include <linux/sched.h>
76732 +#include <linux/fs.h>
76733 +#include <linux/file.h>
76734 +#include <linux/grinternal.h>
76735 +
76736 +int
76737 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
76738 + const struct dentry *dir, const int flag, const int acc_mode)
76739 +{
76740 +#ifdef CONFIG_GRKERNSEC_FIFO
76741 + const struct cred *cred = current_cred();
76742 +
76743 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
76744 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
76745 + !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
76746 + !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
76747 + if (!inode_permission(dentry->d_inode, acc_mode))
76748 + 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));
76749 + return -EACCES;
76750 + }
76751 +#endif
76752 + return 0;
76753 +}
76754 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
76755 new file mode 100644
76756 index 0000000..8ca18bf
76757 --- /dev/null
76758 +++ b/grsecurity/grsec_fork.c
76759 @@ -0,0 +1,23 @@
76760 +#include <linux/kernel.h>
76761 +#include <linux/sched.h>
76762 +#include <linux/grsecurity.h>
76763 +#include <linux/grinternal.h>
76764 +#include <linux/errno.h>
76765 +
76766 +void
76767 +gr_log_forkfail(const int retval)
76768 +{
76769 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
76770 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
76771 + switch (retval) {
76772 + case -EAGAIN:
76773 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
76774 + break;
76775 + case -ENOMEM:
76776 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
76777 + break;
76778 + }
76779 + }
76780 +#endif
76781 + return;
76782 +}
76783 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
76784 new file mode 100644
76785 index 0000000..b7cb191
76786 --- /dev/null
76787 +++ b/grsecurity/grsec_init.c
76788 @@ -0,0 +1,286 @@
76789 +#include <linux/kernel.h>
76790 +#include <linux/sched.h>
76791 +#include <linux/mm.h>
76792 +#include <linux/gracl.h>
76793 +#include <linux/slab.h>
76794 +#include <linux/vmalloc.h>
76795 +#include <linux/percpu.h>
76796 +#include <linux/module.h>
76797 +
76798 +int grsec_enable_ptrace_readexec;
76799 +int grsec_enable_setxid;
76800 +int grsec_enable_symlinkown;
76801 +kgid_t grsec_symlinkown_gid;
76802 +int grsec_enable_brute;
76803 +int grsec_enable_link;
76804 +int grsec_enable_dmesg;
76805 +int grsec_enable_harden_ptrace;
76806 +int grsec_enable_harden_ipc;
76807 +int grsec_enable_fifo;
76808 +int grsec_enable_execlog;
76809 +int grsec_enable_signal;
76810 +int grsec_enable_forkfail;
76811 +int grsec_enable_audit_ptrace;
76812 +int grsec_enable_time;
76813 +int grsec_enable_group;
76814 +kgid_t grsec_audit_gid;
76815 +int grsec_enable_chdir;
76816 +int grsec_enable_mount;
76817 +int grsec_enable_rofs;
76818 +int grsec_deny_new_usb;
76819 +int grsec_enable_chroot_findtask;
76820 +int grsec_enable_chroot_mount;
76821 +int grsec_enable_chroot_shmat;
76822 +int grsec_enable_chroot_fchdir;
76823 +int grsec_enable_chroot_double;
76824 +int grsec_enable_chroot_pivot;
76825 +int grsec_enable_chroot_chdir;
76826 +int grsec_enable_chroot_chmod;
76827 +int grsec_enable_chroot_mknod;
76828 +int grsec_enable_chroot_nice;
76829 +int grsec_enable_chroot_execlog;
76830 +int grsec_enable_chroot_caps;
76831 +int grsec_enable_chroot_sysctl;
76832 +int grsec_enable_chroot_unix;
76833 +int grsec_enable_tpe;
76834 +kgid_t grsec_tpe_gid;
76835 +int grsec_enable_blackhole;
76836 +#ifdef CONFIG_IPV6_MODULE
76837 +EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
76838 +#endif
76839 +int grsec_lastack_retries;
76840 +int grsec_enable_tpe_all;
76841 +int grsec_enable_tpe_invert;
76842 +int grsec_enable_socket_all;
76843 +kgid_t grsec_socket_all_gid;
76844 +int grsec_enable_socket_client;
76845 +kgid_t grsec_socket_client_gid;
76846 +int grsec_enable_socket_server;
76847 +kgid_t grsec_socket_server_gid;
76848 +int grsec_resource_logging;
76849 +int grsec_disable_privio;
76850 +int grsec_enable_log_rwxmaps;
76851 +int grsec_lock;
76852 +
76853 +DEFINE_SPINLOCK(grsec_alert_lock);
76854 +unsigned long grsec_alert_wtime = 0;
76855 +unsigned long grsec_alert_fyet = 0;
76856 +
76857 +DEFINE_SPINLOCK(grsec_audit_lock);
76858 +
76859 +DEFINE_RWLOCK(grsec_exec_file_lock);
76860 +
76861 +char *gr_shared_page[4];
76862 +
76863 +char *gr_alert_log_fmt;
76864 +char *gr_audit_log_fmt;
76865 +char *gr_alert_log_buf;
76866 +char *gr_audit_log_buf;
76867 +
76868 +extern struct gr_arg *gr_usermode;
76869 +extern unsigned char *gr_system_salt;
76870 +extern unsigned char *gr_system_sum;
76871 +
76872 +void __init
76873 +grsecurity_init(void)
76874 +{
76875 + int j;
76876 + /* create the per-cpu shared pages */
76877 +
76878 +#ifdef CONFIG_X86
76879 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
76880 +#endif
76881 +
76882 + for (j = 0; j < 4; j++) {
76883 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
76884 + if (gr_shared_page[j] == NULL) {
76885 + panic("Unable to allocate grsecurity shared page");
76886 + return;
76887 + }
76888 + }
76889 +
76890 + /* allocate log buffers */
76891 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
76892 + if (!gr_alert_log_fmt) {
76893 + panic("Unable to allocate grsecurity alert log format buffer");
76894 + return;
76895 + }
76896 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
76897 + if (!gr_audit_log_fmt) {
76898 + panic("Unable to allocate grsecurity audit log format buffer");
76899 + return;
76900 + }
76901 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76902 + if (!gr_alert_log_buf) {
76903 + panic("Unable to allocate grsecurity alert log buffer");
76904 + return;
76905 + }
76906 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76907 + if (!gr_audit_log_buf) {
76908 + panic("Unable to allocate grsecurity audit log buffer");
76909 + return;
76910 + }
76911 +
76912 + /* allocate memory for authentication structure */
76913 + gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
76914 + gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
76915 + gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
76916 +
76917 + if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
76918 + panic("Unable to allocate grsecurity authentication structure");
76919 + return;
76920 + }
76921 +
76922 +#ifdef CONFIG_GRKERNSEC_IO
76923 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
76924 + grsec_disable_privio = 1;
76925 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76926 + grsec_disable_privio = 1;
76927 +#else
76928 + grsec_disable_privio = 0;
76929 +#endif
76930 +#endif
76931 +
76932 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76933 + /* for backward compatibility, tpe_invert always defaults to on if
76934 + enabled in the kernel
76935 + */
76936 + grsec_enable_tpe_invert = 1;
76937 +#endif
76938 +
76939 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76940 +#ifndef CONFIG_GRKERNSEC_SYSCTL
76941 + grsec_lock = 1;
76942 +#endif
76943 +
76944 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
76945 + grsec_enable_log_rwxmaps = 1;
76946 +#endif
76947 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
76948 + grsec_enable_group = 1;
76949 + grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
76950 +#endif
76951 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
76952 + grsec_enable_ptrace_readexec = 1;
76953 +#endif
76954 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76955 + grsec_enable_chdir = 1;
76956 +#endif
76957 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
76958 + grsec_enable_harden_ptrace = 1;
76959 +#endif
76960 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76961 + grsec_enable_harden_ipc = 1;
76962 +#endif
76963 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
76964 + grsec_enable_mount = 1;
76965 +#endif
76966 +#ifdef CONFIG_GRKERNSEC_LINK
76967 + grsec_enable_link = 1;
76968 +#endif
76969 +#ifdef CONFIG_GRKERNSEC_BRUTE
76970 + grsec_enable_brute = 1;
76971 +#endif
76972 +#ifdef CONFIG_GRKERNSEC_DMESG
76973 + grsec_enable_dmesg = 1;
76974 +#endif
76975 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76976 + grsec_enable_blackhole = 1;
76977 + grsec_lastack_retries = 4;
76978 +#endif
76979 +#ifdef CONFIG_GRKERNSEC_FIFO
76980 + grsec_enable_fifo = 1;
76981 +#endif
76982 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76983 + grsec_enable_execlog = 1;
76984 +#endif
76985 +#ifdef CONFIG_GRKERNSEC_SETXID
76986 + grsec_enable_setxid = 1;
76987 +#endif
76988 +#ifdef CONFIG_GRKERNSEC_SIGNAL
76989 + grsec_enable_signal = 1;
76990 +#endif
76991 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
76992 + grsec_enable_forkfail = 1;
76993 +#endif
76994 +#ifdef CONFIG_GRKERNSEC_TIME
76995 + grsec_enable_time = 1;
76996 +#endif
76997 +#ifdef CONFIG_GRKERNSEC_RESLOG
76998 + grsec_resource_logging = 1;
76999 +#endif
77000 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77001 + grsec_enable_chroot_findtask = 1;
77002 +#endif
77003 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
77004 + grsec_enable_chroot_unix = 1;
77005 +#endif
77006 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
77007 + grsec_enable_chroot_mount = 1;
77008 +#endif
77009 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77010 + grsec_enable_chroot_fchdir = 1;
77011 +#endif
77012 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
77013 + grsec_enable_chroot_shmat = 1;
77014 +#endif
77015 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77016 + grsec_enable_audit_ptrace = 1;
77017 +#endif
77018 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
77019 + grsec_enable_chroot_double = 1;
77020 +#endif
77021 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
77022 + grsec_enable_chroot_pivot = 1;
77023 +#endif
77024 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
77025 + grsec_enable_chroot_chdir = 1;
77026 +#endif
77027 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
77028 + grsec_enable_chroot_chmod = 1;
77029 +#endif
77030 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
77031 + grsec_enable_chroot_mknod = 1;
77032 +#endif
77033 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77034 + grsec_enable_chroot_nice = 1;
77035 +#endif
77036 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
77037 + grsec_enable_chroot_execlog = 1;
77038 +#endif
77039 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77040 + grsec_enable_chroot_caps = 1;
77041 +#endif
77042 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
77043 + grsec_enable_chroot_sysctl = 1;
77044 +#endif
77045 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77046 + grsec_enable_symlinkown = 1;
77047 + grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
77048 +#endif
77049 +#ifdef CONFIG_GRKERNSEC_TPE
77050 + grsec_enable_tpe = 1;
77051 + grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
77052 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
77053 + grsec_enable_tpe_all = 1;
77054 +#endif
77055 +#endif
77056 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
77057 + grsec_enable_socket_all = 1;
77058 + grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
77059 +#endif
77060 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
77061 + grsec_enable_socket_client = 1;
77062 + grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
77063 +#endif
77064 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
77065 + grsec_enable_socket_server = 1;
77066 + grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
77067 +#endif
77068 +#endif
77069 +#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
77070 + grsec_deny_new_usb = 1;
77071 +#endif
77072 +
77073 + return;
77074 +}
77075 diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
77076 new file mode 100644
77077 index 0000000..1773300
77078 --- /dev/null
77079 +++ b/grsecurity/grsec_ipc.c
77080 @@ -0,0 +1,48 @@
77081 +#include <linux/kernel.h>
77082 +#include <linux/mm.h>
77083 +#include <linux/sched.h>
77084 +#include <linux/file.h>
77085 +#include <linux/ipc.h>
77086 +#include <linux/ipc_namespace.h>
77087 +#include <linux/grsecurity.h>
77088 +#include <linux/grinternal.h>
77089 +
77090 +int
77091 +gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
77092 +{
77093 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77094 + int write;
77095 + int orig_granted_mode;
77096 + kuid_t euid;
77097 + kgid_t egid;
77098 +
77099 + if (!grsec_enable_harden_ipc)
77100 + return 1;
77101 +
77102 + euid = current_euid();
77103 + egid = current_egid();
77104 +
77105 + write = requested_mode & 00002;
77106 + orig_granted_mode = ipcp->mode;
77107 +
77108 + if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77109 + orig_granted_mode >>= 6;
77110 + else {
77111 + /* if likely wrong permissions, lock to user */
77112 + if (orig_granted_mode & 0007)
77113 + orig_granted_mode = 0;
77114 + /* otherwise do a egid-only check */
77115 + else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77116 + orig_granted_mode >>= 3;
77117 + /* otherwise, no access */
77118 + else
77119 + orig_granted_mode = 0;
77120 + }
77121 + if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77122 + !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77123 + gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77124 + return 0;
77125 + }
77126 +#endif
77127 + return 1;
77128 +}
77129 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77130 new file mode 100644
77131 index 0000000..5e05e20
77132 --- /dev/null
77133 +++ b/grsecurity/grsec_link.c
77134 @@ -0,0 +1,58 @@
77135 +#include <linux/kernel.h>
77136 +#include <linux/sched.h>
77137 +#include <linux/fs.h>
77138 +#include <linux/file.h>
77139 +#include <linux/grinternal.h>
77140 +
77141 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77142 +{
77143 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77144 + const struct inode *link_inode = link->dentry->d_inode;
77145 +
77146 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77147 + /* ignore root-owned links, e.g. /proc/self */
77148 + gr_is_global_nonroot(link_inode->i_uid) && target &&
77149 + !uid_eq(link_inode->i_uid, target->i_uid)) {
77150 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77151 + return 1;
77152 + }
77153 +#endif
77154 + return 0;
77155 +}
77156 +
77157 +int
77158 +gr_handle_follow_link(const struct inode *parent,
77159 + const struct inode *inode,
77160 + const struct dentry *dentry, const struct vfsmount *mnt)
77161 +{
77162 +#ifdef CONFIG_GRKERNSEC_LINK
77163 + const struct cred *cred = current_cred();
77164 +
77165 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77166 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77167 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77168 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77169 + return -EACCES;
77170 + }
77171 +#endif
77172 + return 0;
77173 +}
77174 +
77175 +int
77176 +gr_handle_hardlink(const struct dentry *dentry,
77177 + const struct vfsmount *mnt,
77178 + struct inode *inode, const int mode, const struct filename *to)
77179 +{
77180 +#ifdef CONFIG_GRKERNSEC_LINK
77181 + const struct cred *cred = current_cred();
77182 +
77183 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77184 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77185 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77186 + !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77187 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
77188 + return -EPERM;
77189 + }
77190 +#endif
77191 + return 0;
77192 +}
77193 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
77194 new file mode 100644
77195 index 0000000..dbe0a6b
77196 --- /dev/null
77197 +++ b/grsecurity/grsec_log.c
77198 @@ -0,0 +1,341 @@
77199 +#include <linux/kernel.h>
77200 +#include <linux/sched.h>
77201 +#include <linux/file.h>
77202 +#include <linux/tty.h>
77203 +#include <linux/fs.h>
77204 +#include <linux/mm.h>
77205 +#include <linux/grinternal.h>
77206 +
77207 +#ifdef CONFIG_TREE_PREEMPT_RCU
77208 +#define DISABLE_PREEMPT() preempt_disable()
77209 +#define ENABLE_PREEMPT() preempt_enable()
77210 +#else
77211 +#define DISABLE_PREEMPT()
77212 +#define ENABLE_PREEMPT()
77213 +#endif
77214 +
77215 +#define BEGIN_LOCKS(x) \
77216 + DISABLE_PREEMPT(); \
77217 + rcu_read_lock(); \
77218 + read_lock(&tasklist_lock); \
77219 + read_lock(&grsec_exec_file_lock); \
77220 + if (x != GR_DO_AUDIT) \
77221 + spin_lock(&grsec_alert_lock); \
77222 + else \
77223 + spin_lock(&grsec_audit_lock)
77224 +
77225 +#define END_LOCKS(x) \
77226 + if (x != GR_DO_AUDIT) \
77227 + spin_unlock(&grsec_alert_lock); \
77228 + else \
77229 + spin_unlock(&grsec_audit_lock); \
77230 + read_unlock(&grsec_exec_file_lock); \
77231 + read_unlock(&tasklist_lock); \
77232 + rcu_read_unlock(); \
77233 + ENABLE_PREEMPT(); \
77234 + if (x == GR_DONT_AUDIT) \
77235 + gr_handle_alertkill(current)
77236 +
77237 +enum {
77238 + FLOODING,
77239 + NO_FLOODING
77240 +};
77241 +
77242 +extern char *gr_alert_log_fmt;
77243 +extern char *gr_audit_log_fmt;
77244 +extern char *gr_alert_log_buf;
77245 +extern char *gr_audit_log_buf;
77246 +
77247 +static int gr_log_start(int audit)
77248 +{
77249 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
77250 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
77251 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77252 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
77253 + unsigned long curr_secs = get_seconds();
77254 +
77255 + if (audit == GR_DO_AUDIT)
77256 + goto set_fmt;
77257 +
77258 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
77259 + grsec_alert_wtime = curr_secs;
77260 + grsec_alert_fyet = 0;
77261 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
77262 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
77263 + grsec_alert_fyet++;
77264 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
77265 + grsec_alert_wtime = curr_secs;
77266 + grsec_alert_fyet++;
77267 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
77268 + return FLOODING;
77269 + }
77270 + else return FLOODING;
77271 +
77272 +set_fmt:
77273 +#endif
77274 + memset(buf, 0, PAGE_SIZE);
77275 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
77276 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
77277 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77278 + } else if (current->signal->curr_ip) {
77279 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
77280 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
77281 + } else if (gr_acl_is_enabled()) {
77282 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
77283 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77284 + } else {
77285 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
77286 + strcpy(buf, fmt);
77287 + }
77288 +
77289 + return NO_FLOODING;
77290 +}
77291 +
77292 +static void gr_log_middle(int audit, const char *msg, va_list ap)
77293 + __attribute__ ((format (printf, 2, 0)));
77294 +
77295 +static void gr_log_middle(int audit, const char *msg, va_list ap)
77296 +{
77297 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77298 + unsigned int len = strlen(buf);
77299 +
77300 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77301 +
77302 + return;
77303 +}
77304 +
77305 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
77306 + __attribute__ ((format (printf, 2, 3)));
77307 +
77308 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
77309 +{
77310 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77311 + unsigned int len = strlen(buf);
77312 + va_list ap;
77313 +
77314 + va_start(ap, msg);
77315 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77316 + va_end(ap);
77317 +
77318 + return;
77319 +}
77320 +
77321 +static void gr_log_end(int audit, int append_default)
77322 +{
77323 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77324 + if (append_default) {
77325 + struct task_struct *task = current;
77326 + struct task_struct *parent = task->real_parent;
77327 + const struct cred *cred = __task_cred(task);
77328 + const struct cred *pcred = __task_cred(parent);
77329 + unsigned int len = strlen(buf);
77330 +
77331 + 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));
77332 + }
77333 +
77334 + printk("%s\n", buf);
77335 +
77336 + return;
77337 +}
77338 +
77339 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
77340 +{
77341 + int logtype;
77342 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
77343 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
77344 + void *voidptr = NULL;
77345 + int num1 = 0, num2 = 0;
77346 + unsigned long ulong1 = 0, ulong2 = 0;
77347 + struct dentry *dentry = NULL;
77348 + struct vfsmount *mnt = NULL;
77349 + struct file *file = NULL;
77350 + struct task_struct *task = NULL;
77351 + struct vm_area_struct *vma = NULL;
77352 + const struct cred *cred, *pcred;
77353 + va_list ap;
77354 +
77355 + BEGIN_LOCKS(audit);
77356 + logtype = gr_log_start(audit);
77357 + if (logtype == FLOODING) {
77358 + END_LOCKS(audit);
77359 + return;
77360 + }
77361 + va_start(ap, argtypes);
77362 + switch (argtypes) {
77363 + case GR_TTYSNIFF:
77364 + task = va_arg(ap, struct task_struct *);
77365 + 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));
77366 + break;
77367 + case GR_SYSCTL_HIDDEN:
77368 + str1 = va_arg(ap, char *);
77369 + gr_log_middle_varargs(audit, msg, result, str1);
77370 + break;
77371 + case GR_RBAC:
77372 + dentry = va_arg(ap, struct dentry *);
77373 + mnt = va_arg(ap, struct vfsmount *);
77374 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
77375 + break;
77376 + case GR_RBAC_STR:
77377 + dentry = va_arg(ap, struct dentry *);
77378 + mnt = va_arg(ap, struct vfsmount *);
77379 + str1 = va_arg(ap, char *);
77380 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
77381 + break;
77382 + case GR_STR_RBAC:
77383 + str1 = va_arg(ap, char *);
77384 + dentry = va_arg(ap, struct dentry *);
77385 + mnt = va_arg(ap, struct vfsmount *);
77386 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
77387 + break;
77388 + case GR_RBAC_MODE2:
77389 + dentry = va_arg(ap, struct dentry *);
77390 + mnt = va_arg(ap, struct vfsmount *);
77391 + str1 = va_arg(ap, char *);
77392 + str2 = va_arg(ap, char *);
77393 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
77394 + break;
77395 + case GR_RBAC_MODE3:
77396 + dentry = va_arg(ap, struct dentry *);
77397 + mnt = va_arg(ap, struct vfsmount *);
77398 + str1 = va_arg(ap, char *);
77399 + str2 = va_arg(ap, char *);
77400 + str3 = va_arg(ap, char *);
77401 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
77402 + break;
77403 + case GR_FILENAME:
77404 + dentry = va_arg(ap, struct dentry *);
77405 + mnt = va_arg(ap, struct vfsmount *);
77406 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
77407 + break;
77408 + case GR_STR_FILENAME:
77409 + str1 = va_arg(ap, char *);
77410 + dentry = va_arg(ap, struct dentry *);
77411 + mnt = va_arg(ap, struct vfsmount *);
77412 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
77413 + break;
77414 + case GR_FILENAME_STR:
77415 + dentry = va_arg(ap, struct dentry *);
77416 + mnt = va_arg(ap, struct vfsmount *);
77417 + str1 = va_arg(ap, char *);
77418 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
77419 + break;
77420 + case GR_FILENAME_TWO_INT:
77421 + dentry = va_arg(ap, struct dentry *);
77422 + mnt = va_arg(ap, struct vfsmount *);
77423 + num1 = va_arg(ap, int);
77424 + num2 = va_arg(ap, int);
77425 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
77426 + break;
77427 + case GR_FILENAME_TWO_INT_STR:
77428 + dentry = va_arg(ap, struct dentry *);
77429 + mnt = va_arg(ap, struct vfsmount *);
77430 + num1 = va_arg(ap, int);
77431 + num2 = va_arg(ap, int);
77432 + str1 = va_arg(ap, char *);
77433 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
77434 + break;
77435 + case GR_TEXTREL:
77436 + file = va_arg(ap, struct file *);
77437 + ulong1 = va_arg(ap, unsigned long);
77438 + ulong2 = va_arg(ap, unsigned long);
77439 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
77440 + break;
77441 + case GR_PTRACE:
77442 + task = va_arg(ap, struct task_struct *);
77443 + 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));
77444 + break;
77445 + case GR_RESOURCE:
77446 + task = va_arg(ap, struct task_struct *);
77447 + cred = __task_cred(task);
77448 + pcred = __task_cred(task->real_parent);
77449 + ulong1 = va_arg(ap, unsigned long);
77450 + str1 = va_arg(ap, char *);
77451 + ulong2 = va_arg(ap, unsigned long);
77452 + 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));
77453 + break;
77454 + case GR_CAP:
77455 + task = va_arg(ap, struct task_struct *);
77456 + cred = __task_cred(task);
77457 + pcred = __task_cred(task->real_parent);
77458 + str1 = va_arg(ap, char *);
77459 + 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));
77460 + break;
77461 + case GR_SIG:
77462 + str1 = va_arg(ap, char *);
77463 + voidptr = va_arg(ap, void *);
77464 + gr_log_middle_varargs(audit, msg, str1, voidptr);
77465 + break;
77466 + case GR_SIG2:
77467 + task = va_arg(ap, struct task_struct *);
77468 + cred = __task_cred(task);
77469 + pcred = __task_cred(task->real_parent);
77470 + num1 = va_arg(ap, int);
77471 + 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));
77472 + break;
77473 + case GR_CRASH1:
77474 + task = va_arg(ap, struct task_struct *);
77475 + cred = __task_cred(task);
77476 + pcred = __task_cred(task->real_parent);
77477 + ulong1 = va_arg(ap, unsigned long);
77478 + 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);
77479 + break;
77480 + case GR_CRASH2:
77481 + task = va_arg(ap, struct task_struct *);
77482 + cred = __task_cred(task);
77483 + pcred = __task_cred(task->real_parent);
77484 + ulong1 = va_arg(ap, unsigned long);
77485 + 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);
77486 + break;
77487 + case GR_RWXMAP:
77488 + file = va_arg(ap, struct file *);
77489 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
77490 + break;
77491 + case GR_RWXMAPVMA:
77492 + vma = va_arg(ap, struct vm_area_struct *);
77493 + if (vma->vm_file)
77494 + str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
77495 + else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
77496 + str1 = "<stack>";
77497 + else if (vma->vm_start <= current->mm->brk &&
77498 + vma->vm_end >= current->mm->start_brk)
77499 + str1 = "<heap>";
77500 + else
77501 + str1 = "<anonymous mapping>";
77502 + gr_log_middle_varargs(audit, msg, str1);
77503 + break;
77504 + case GR_PSACCT:
77505 + {
77506 + unsigned int wday, cday;
77507 + __u8 whr, chr;
77508 + __u8 wmin, cmin;
77509 + __u8 wsec, csec;
77510 + char cur_tty[64] = { 0 };
77511 + char parent_tty[64] = { 0 };
77512 +
77513 + task = va_arg(ap, struct task_struct *);
77514 + wday = va_arg(ap, unsigned int);
77515 + cday = va_arg(ap, unsigned int);
77516 + whr = va_arg(ap, int);
77517 + chr = va_arg(ap, int);
77518 + wmin = va_arg(ap, int);
77519 + cmin = va_arg(ap, int);
77520 + wsec = va_arg(ap, int);
77521 + csec = va_arg(ap, int);
77522 + ulong1 = va_arg(ap, unsigned long);
77523 + cred = __task_cred(task);
77524 + pcred = __task_cred(task->real_parent);
77525 +
77526 + 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));
77527 + }
77528 + break;
77529 + default:
77530 + gr_log_middle(audit, msg, ap);
77531 + }
77532 + va_end(ap);
77533 + // these don't need DEFAULTSECARGS printed on the end
77534 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
77535 + gr_log_end(audit, 0);
77536 + else
77537 + gr_log_end(audit, 1);
77538 + END_LOCKS(audit);
77539 +}
77540 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
77541 new file mode 100644
77542 index 0000000..0e39d8c
77543 --- /dev/null
77544 +++ b/grsecurity/grsec_mem.c
77545 @@ -0,0 +1,48 @@
77546 +#include <linux/kernel.h>
77547 +#include <linux/sched.h>
77548 +#include <linux/mm.h>
77549 +#include <linux/mman.h>
77550 +#include <linux/module.h>
77551 +#include <linux/grinternal.h>
77552 +
77553 +void gr_handle_msr_write(void)
77554 +{
77555 + gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
77556 + return;
77557 +}
77558 +EXPORT_SYMBOL_GPL(gr_handle_msr_write);
77559 +
77560 +void
77561 +gr_handle_ioperm(void)
77562 +{
77563 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
77564 + return;
77565 +}
77566 +
77567 +void
77568 +gr_handle_iopl(void)
77569 +{
77570 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
77571 + return;
77572 +}
77573 +
77574 +void
77575 +gr_handle_mem_readwrite(u64 from, u64 to)
77576 +{
77577 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
77578 + return;
77579 +}
77580 +
77581 +void
77582 +gr_handle_vm86(void)
77583 +{
77584 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
77585 + return;
77586 +}
77587 +
77588 +void
77589 +gr_log_badprocpid(const char *entry)
77590 +{
77591 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
77592 + return;
77593 +}
77594 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
77595 new file mode 100644
77596 index 0000000..6f9eb73
77597 --- /dev/null
77598 +++ b/grsecurity/grsec_mount.c
77599 @@ -0,0 +1,65 @@
77600 +#include <linux/kernel.h>
77601 +#include <linux/sched.h>
77602 +#include <linux/mount.h>
77603 +#include <linux/major.h>
77604 +#include <linux/grsecurity.h>
77605 +#include <linux/grinternal.h>
77606 +
77607 +void
77608 +gr_log_remount(const char *devname, const int retval)
77609 +{
77610 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77611 + if (grsec_enable_mount && (retval >= 0))
77612 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
77613 +#endif
77614 + return;
77615 +}
77616 +
77617 +void
77618 +gr_log_unmount(const char *devname, const int retval)
77619 +{
77620 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77621 + if (grsec_enable_mount && (retval >= 0))
77622 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
77623 +#endif
77624 + return;
77625 +}
77626 +
77627 +void
77628 +gr_log_mount(const char *from, struct path *to, const int retval)
77629 +{
77630 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77631 + if (grsec_enable_mount && (retval >= 0))
77632 + gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
77633 +#endif
77634 + return;
77635 +}
77636 +
77637 +int
77638 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
77639 +{
77640 +#ifdef CONFIG_GRKERNSEC_ROFS
77641 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
77642 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
77643 + return -EPERM;
77644 + } else
77645 + return 0;
77646 +#endif
77647 + return 0;
77648 +}
77649 +
77650 +int
77651 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
77652 +{
77653 +#ifdef CONFIG_GRKERNSEC_ROFS
77654 + struct inode *inode = dentry->d_inode;
77655 +
77656 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
77657 + inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
77658 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
77659 + return -EPERM;
77660 + } else
77661 + return 0;
77662 +#endif
77663 + return 0;
77664 +}
77665 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
77666 new file mode 100644
77667 index 0000000..6ee9d50
77668 --- /dev/null
77669 +++ b/grsecurity/grsec_pax.c
77670 @@ -0,0 +1,45 @@
77671 +#include <linux/kernel.h>
77672 +#include <linux/sched.h>
77673 +#include <linux/mm.h>
77674 +#include <linux/file.h>
77675 +#include <linux/grinternal.h>
77676 +#include <linux/grsecurity.h>
77677 +
77678 +void
77679 +gr_log_textrel(struct vm_area_struct * vma)
77680 +{
77681 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77682 + if (grsec_enable_log_rwxmaps)
77683 + gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
77684 +#endif
77685 + return;
77686 +}
77687 +
77688 +void gr_log_ptgnustack(struct file *file)
77689 +{
77690 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77691 + if (grsec_enable_log_rwxmaps)
77692 + gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
77693 +#endif
77694 + return;
77695 +}
77696 +
77697 +void
77698 +gr_log_rwxmmap(struct file *file)
77699 +{
77700 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77701 + if (grsec_enable_log_rwxmaps)
77702 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
77703 +#endif
77704 + return;
77705 +}
77706 +
77707 +void
77708 +gr_log_rwxmprotect(struct vm_area_struct *vma)
77709 +{
77710 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77711 + if (grsec_enable_log_rwxmaps)
77712 + gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
77713 +#endif
77714 + return;
77715 +}
77716 diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
77717 new file mode 100644
77718 index 0000000..2005a3a
77719 --- /dev/null
77720 +++ b/grsecurity/grsec_proc.c
77721 @@ -0,0 +1,20 @@
77722 +#include <linux/kernel.h>
77723 +#include <linux/sched.h>
77724 +#include <linux/grsecurity.h>
77725 +#include <linux/grinternal.h>
77726 +
77727 +int gr_proc_is_restricted(void)
77728 +{
77729 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77730 + const struct cred *cred = current_cred();
77731 +#endif
77732 +
77733 +#ifdef CONFIG_GRKERNSEC_PROC_USER
77734 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
77735 + return -EACCES;
77736 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77737 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
77738 + return -EACCES;
77739 +#endif
77740 + return 0;
77741 +}
77742 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
77743 new file mode 100644
77744 index 0000000..f7f29aa
77745 --- /dev/null
77746 +++ b/grsecurity/grsec_ptrace.c
77747 @@ -0,0 +1,30 @@
77748 +#include <linux/kernel.h>
77749 +#include <linux/sched.h>
77750 +#include <linux/grinternal.h>
77751 +#include <linux/security.h>
77752 +
77753 +void
77754 +gr_audit_ptrace(struct task_struct *task)
77755 +{
77756 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77757 + if (grsec_enable_audit_ptrace)
77758 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
77759 +#endif
77760 + return;
77761 +}
77762 +
77763 +int
77764 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
77765 +{
77766 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77767 + const struct dentry *dentry = file->f_path.dentry;
77768 + const struct vfsmount *mnt = file->f_path.mnt;
77769 +
77770 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
77771 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
77772 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
77773 + return -EACCES;
77774 + }
77775 +#endif
77776 + return 0;
77777 +}
77778 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
77779 new file mode 100644
77780 index 0000000..3860c7e
77781 --- /dev/null
77782 +++ b/grsecurity/grsec_sig.c
77783 @@ -0,0 +1,236 @@
77784 +#include <linux/kernel.h>
77785 +#include <linux/sched.h>
77786 +#include <linux/fs.h>
77787 +#include <linux/delay.h>
77788 +#include <linux/grsecurity.h>
77789 +#include <linux/grinternal.h>
77790 +#include <linux/hardirq.h>
77791 +
77792 +char *signames[] = {
77793 + [SIGSEGV] = "Segmentation fault",
77794 + [SIGILL] = "Illegal instruction",
77795 + [SIGABRT] = "Abort",
77796 + [SIGBUS] = "Invalid alignment/Bus error"
77797 +};
77798 +
77799 +void
77800 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
77801 +{
77802 +#ifdef CONFIG_GRKERNSEC_SIGNAL
77803 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
77804 + (sig == SIGABRT) || (sig == SIGBUS))) {
77805 + if (task_pid_nr(t) == task_pid_nr(current)) {
77806 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
77807 + } else {
77808 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
77809 + }
77810 + }
77811 +#endif
77812 + return;
77813 +}
77814 +
77815 +int
77816 +gr_handle_signal(const struct task_struct *p, const int sig)
77817 +{
77818 +#ifdef CONFIG_GRKERNSEC
77819 + /* ignore the 0 signal for protected task checks */
77820 + if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
77821 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
77822 + return -EPERM;
77823 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
77824 + return -EPERM;
77825 + }
77826 +#endif
77827 + return 0;
77828 +}
77829 +
77830 +#ifdef CONFIG_GRKERNSEC
77831 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
77832 +
77833 +int gr_fake_force_sig(int sig, struct task_struct *t)
77834 +{
77835 + unsigned long int flags;
77836 + int ret, blocked, ignored;
77837 + struct k_sigaction *action;
77838 +
77839 + spin_lock_irqsave(&t->sighand->siglock, flags);
77840 + action = &t->sighand->action[sig-1];
77841 + ignored = action->sa.sa_handler == SIG_IGN;
77842 + blocked = sigismember(&t->blocked, sig);
77843 + if (blocked || ignored) {
77844 + action->sa.sa_handler = SIG_DFL;
77845 + if (blocked) {
77846 + sigdelset(&t->blocked, sig);
77847 + recalc_sigpending_and_wake(t);
77848 + }
77849 + }
77850 + if (action->sa.sa_handler == SIG_DFL)
77851 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
77852 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
77853 +
77854 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
77855 +
77856 + return ret;
77857 +}
77858 +#endif
77859 +
77860 +#define GR_USER_BAN_TIME (15 * 60)
77861 +#define GR_DAEMON_BRUTE_TIME (30 * 60)
77862 +
77863 +void gr_handle_brute_attach(int dumpable)
77864 +{
77865 +#ifdef CONFIG_GRKERNSEC_BRUTE
77866 + struct task_struct *p = current;
77867 + kuid_t uid = GLOBAL_ROOT_UID;
77868 + int daemon = 0;
77869 +
77870 + if (!grsec_enable_brute)
77871 + return;
77872 +
77873 + rcu_read_lock();
77874 + read_lock(&tasklist_lock);
77875 + read_lock(&grsec_exec_file_lock);
77876 + if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
77877 + p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
77878 + p->real_parent->brute = 1;
77879 + daemon = 1;
77880 + } else {
77881 + const struct cred *cred = __task_cred(p), *cred2;
77882 + struct task_struct *tsk, *tsk2;
77883 +
77884 + if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
77885 + struct user_struct *user;
77886 +
77887 + uid = cred->uid;
77888 +
77889 + /* this is put upon execution past expiration */
77890 + user = find_user(uid);
77891 + if (user == NULL)
77892 + goto unlock;
77893 + user->suid_banned = 1;
77894 + user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
77895 + if (user->suid_ban_expires == ~0UL)
77896 + user->suid_ban_expires--;
77897 +
77898 + /* only kill other threads of the same binary, from the same user */
77899 + do_each_thread(tsk2, tsk) {
77900 + cred2 = __task_cred(tsk);
77901 + if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
77902 + gr_fake_force_sig(SIGKILL, tsk);
77903 + } while_each_thread(tsk2, tsk);
77904 + }
77905 + }
77906 +unlock:
77907 + read_unlock(&grsec_exec_file_lock);
77908 + read_unlock(&tasklist_lock);
77909 + rcu_read_unlock();
77910 +
77911 + if (gr_is_global_nonroot(uid))
77912 + 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);
77913 + else if (daemon)
77914 + gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
77915 +
77916 +#endif
77917 + return;
77918 +}
77919 +
77920 +void gr_handle_brute_check(void)
77921 +{
77922 +#ifdef CONFIG_GRKERNSEC_BRUTE
77923 + struct task_struct *p = current;
77924 +
77925 + if (unlikely(p->brute)) {
77926 + if (!grsec_enable_brute)
77927 + p->brute = 0;
77928 + else if (time_before(get_seconds(), p->brute_expires))
77929 + msleep(30 * 1000);
77930 + }
77931 +#endif
77932 + return;
77933 +}
77934 +
77935 +void gr_handle_kernel_exploit(void)
77936 +{
77937 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77938 + const struct cred *cred;
77939 + struct task_struct *tsk, *tsk2;
77940 + struct user_struct *user;
77941 + kuid_t uid;
77942 +
77943 + if (in_irq() || in_serving_softirq() || in_nmi())
77944 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
77945 +
77946 + uid = current_uid();
77947 +
77948 + if (gr_is_global_root(uid))
77949 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
77950 + else {
77951 + /* kill all the processes of this user, hold a reference
77952 + to their creds struct, and prevent them from creating
77953 + another process until system reset
77954 + */
77955 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
77956 + GR_GLOBAL_UID(uid));
77957 + /* we intentionally leak this ref */
77958 + user = get_uid(current->cred->user);
77959 + if (user)
77960 + user->kernel_banned = 1;
77961 +
77962 + /* kill all processes of this user */
77963 + read_lock(&tasklist_lock);
77964 + do_each_thread(tsk2, tsk) {
77965 + cred = __task_cred(tsk);
77966 + if (uid_eq(cred->uid, uid))
77967 + gr_fake_force_sig(SIGKILL, tsk);
77968 + } while_each_thread(tsk2, tsk);
77969 + read_unlock(&tasklist_lock);
77970 + }
77971 +#endif
77972 +}
77973 +
77974 +#ifdef CONFIG_GRKERNSEC_BRUTE
77975 +static bool suid_ban_expired(struct user_struct *user)
77976 +{
77977 + if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
77978 + user->suid_banned = 0;
77979 + user->suid_ban_expires = 0;
77980 + free_uid(user);
77981 + return true;
77982 + }
77983 +
77984 + return false;
77985 +}
77986 +#endif
77987 +
77988 +int gr_process_kernel_exec_ban(void)
77989 +{
77990 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77991 + if (unlikely(current->cred->user->kernel_banned))
77992 + return -EPERM;
77993 +#endif
77994 + return 0;
77995 +}
77996 +
77997 +int gr_process_kernel_setuid_ban(struct user_struct *user)
77998 +{
77999 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78000 + if (unlikely(user->kernel_banned))
78001 + gr_fake_force_sig(SIGKILL, current);
78002 +#endif
78003 + return 0;
78004 +}
78005 +
78006 +int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
78007 +{
78008 +#ifdef CONFIG_GRKERNSEC_BRUTE
78009 + struct user_struct *user = current->cred->user;
78010 + if (unlikely(user->suid_banned)) {
78011 + if (suid_ban_expired(user))
78012 + return 0;
78013 + /* disallow execution of suid binaries only */
78014 + else if (!uid_eq(bprm->cred->euid, current->cred->uid))
78015 + return -EPERM;
78016 + }
78017 +#endif
78018 + return 0;
78019 +}
78020 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
78021 new file mode 100644
78022 index 0000000..e3650b6
78023 --- /dev/null
78024 +++ b/grsecurity/grsec_sock.c
78025 @@ -0,0 +1,244 @@
78026 +#include <linux/kernel.h>
78027 +#include <linux/module.h>
78028 +#include <linux/sched.h>
78029 +#include <linux/file.h>
78030 +#include <linux/net.h>
78031 +#include <linux/in.h>
78032 +#include <linux/ip.h>
78033 +#include <net/sock.h>
78034 +#include <net/inet_sock.h>
78035 +#include <linux/grsecurity.h>
78036 +#include <linux/grinternal.h>
78037 +#include <linux/gracl.h>
78038 +
78039 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
78040 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
78041 +
78042 +EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
78043 +EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
78044 +
78045 +#ifdef CONFIG_UNIX_MODULE
78046 +EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
78047 +EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
78048 +EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
78049 +EXPORT_SYMBOL_GPL(gr_handle_create);
78050 +#endif
78051 +
78052 +#ifdef CONFIG_GRKERNSEC
78053 +#define gr_conn_table_size 32749
78054 +struct conn_table_entry {
78055 + struct conn_table_entry *next;
78056 + struct signal_struct *sig;
78057 +};
78058 +
78059 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
78060 +DEFINE_SPINLOCK(gr_conn_table_lock);
78061 +
78062 +extern const char * gr_socktype_to_name(unsigned char type);
78063 +extern const char * gr_proto_to_name(unsigned char proto);
78064 +extern const char * gr_sockfamily_to_name(unsigned char family);
78065 +
78066 +static __inline__ int
78067 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
78068 +{
78069 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
78070 +}
78071 +
78072 +static __inline__ int
78073 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
78074 + __u16 sport, __u16 dport)
78075 +{
78076 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
78077 + sig->gr_sport == sport && sig->gr_dport == dport))
78078 + return 1;
78079 + else
78080 + return 0;
78081 +}
78082 +
78083 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
78084 +{
78085 + struct conn_table_entry **match;
78086 + unsigned int index;
78087 +
78088 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78089 + sig->gr_sport, sig->gr_dport,
78090 + gr_conn_table_size);
78091 +
78092 + newent->sig = sig;
78093 +
78094 + match = &gr_conn_table[index];
78095 + newent->next = *match;
78096 + *match = newent;
78097 +
78098 + return;
78099 +}
78100 +
78101 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
78102 +{
78103 + struct conn_table_entry *match, *last = NULL;
78104 + unsigned int index;
78105 +
78106 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78107 + sig->gr_sport, sig->gr_dport,
78108 + gr_conn_table_size);
78109 +
78110 + match = gr_conn_table[index];
78111 + while (match && !conn_match(match->sig,
78112 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78113 + sig->gr_dport)) {
78114 + last = match;
78115 + match = match->next;
78116 + }
78117 +
78118 + if (match) {
78119 + if (last)
78120 + last->next = match->next;
78121 + else
78122 + gr_conn_table[index] = NULL;
78123 + kfree(match);
78124 + }
78125 +
78126 + return;
78127 +}
78128 +
78129 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78130 + __u16 sport, __u16 dport)
78131 +{
78132 + struct conn_table_entry *match;
78133 + unsigned int index;
78134 +
78135 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78136 +
78137 + match = gr_conn_table[index];
78138 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78139 + match = match->next;
78140 +
78141 + if (match)
78142 + return match->sig;
78143 + else
78144 + return NULL;
78145 +}
78146 +
78147 +#endif
78148 +
78149 +void gr_update_task_in_ip_table(const struct inet_sock *inet)
78150 +{
78151 +#ifdef CONFIG_GRKERNSEC
78152 + struct signal_struct *sig = current->signal;
78153 + struct conn_table_entry *newent;
78154 +
78155 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78156 + if (newent == NULL)
78157 + return;
78158 + /* no bh lock needed since we are called with bh disabled */
78159 + spin_lock(&gr_conn_table_lock);
78160 + gr_del_task_from_ip_table_nolock(sig);
78161 + sig->gr_saddr = inet->inet_rcv_saddr;
78162 + sig->gr_daddr = inet->inet_daddr;
78163 + sig->gr_sport = inet->inet_sport;
78164 + sig->gr_dport = inet->inet_dport;
78165 + gr_add_to_task_ip_table_nolock(sig, newent);
78166 + spin_unlock(&gr_conn_table_lock);
78167 +#endif
78168 + return;
78169 +}
78170 +
78171 +void gr_del_task_from_ip_table(struct task_struct *task)
78172 +{
78173 +#ifdef CONFIG_GRKERNSEC
78174 + spin_lock_bh(&gr_conn_table_lock);
78175 + gr_del_task_from_ip_table_nolock(task->signal);
78176 + spin_unlock_bh(&gr_conn_table_lock);
78177 +#endif
78178 + return;
78179 +}
78180 +
78181 +void
78182 +gr_attach_curr_ip(const struct sock *sk)
78183 +{
78184 +#ifdef CONFIG_GRKERNSEC
78185 + struct signal_struct *p, *set;
78186 + const struct inet_sock *inet = inet_sk(sk);
78187 +
78188 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
78189 + return;
78190 +
78191 + set = current->signal;
78192 +
78193 + spin_lock_bh(&gr_conn_table_lock);
78194 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
78195 + inet->inet_dport, inet->inet_sport);
78196 + if (unlikely(p != NULL)) {
78197 + set->curr_ip = p->curr_ip;
78198 + set->used_accept = 1;
78199 + gr_del_task_from_ip_table_nolock(p);
78200 + spin_unlock_bh(&gr_conn_table_lock);
78201 + return;
78202 + }
78203 + spin_unlock_bh(&gr_conn_table_lock);
78204 +
78205 + set->curr_ip = inet->inet_daddr;
78206 + set->used_accept = 1;
78207 +#endif
78208 + return;
78209 +}
78210 +
78211 +int
78212 +gr_handle_sock_all(const int family, const int type, const int protocol)
78213 +{
78214 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78215 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
78216 + (family != AF_UNIX)) {
78217 + if (family == AF_INET)
78218 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
78219 + else
78220 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
78221 + return -EACCES;
78222 + }
78223 +#endif
78224 + return 0;
78225 +}
78226 +
78227 +int
78228 +gr_handle_sock_server(const struct sockaddr *sck)
78229 +{
78230 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78231 + if (grsec_enable_socket_server &&
78232 + in_group_p(grsec_socket_server_gid) &&
78233 + sck && (sck->sa_family != AF_UNIX) &&
78234 + (sck->sa_family != AF_LOCAL)) {
78235 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78236 + return -EACCES;
78237 + }
78238 +#endif
78239 + return 0;
78240 +}
78241 +
78242 +int
78243 +gr_handle_sock_server_other(const struct sock *sck)
78244 +{
78245 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78246 + if (grsec_enable_socket_server &&
78247 + in_group_p(grsec_socket_server_gid) &&
78248 + sck && (sck->sk_family != AF_UNIX) &&
78249 + (sck->sk_family != AF_LOCAL)) {
78250 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78251 + return -EACCES;
78252 + }
78253 +#endif
78254 + return 0;
78255 +}
78256 +
78257 +int
78258 +gr_handle_sock_client(const struct sockaddr *sck)
78259 +{
78260 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78261 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
78262 + sck && (sck->sa_family != AF_UNIX) &&
78263 + (sck->sa_family != AF_LOCAL)) {
78264 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
78265 + return -EACCES;
78266 + }
78267 +#endif
78268 + return 0;
78269 +}
78270 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
78271 new file mode 100644
78272 index 0000000..8159888
78273 --- /dev/null
78274 +++ b/grsecurity/grsec_sysctl.c
78275 @@ -0,0 +1,479 @@
78276 +#include <linux/kernel.h>
78277 +#include <linux/sched.h>
78278 +#include <linux/sysctl.h>
78279 +#include <linux/grsecurity.h>
78280 +#include <linux/grinternal.h>
78281 +
78282 +int
78283 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
78284 +{
78285 +#ifdef CONFIG_GRKERNSEC_SYSCTL
78286 + if (dirname == NULL || name == NULL)
78287 + return 0;
78288 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
78289 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
78290 + return -EACCES;
78291 + }
78292 +#endif
78293 + return 0;
78294 +}
78295 +
78296 +#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
78297 +static int __maybe_unused __read_only one = 1;
78298 +#endif
78299 +
78300 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
78301 + defined(CONFIG_GRKERNSEC_DENYUSB)
78302 +struct ctl_table grsecurity_table[] = {
78303 +#ifdef CONFIG_GRKERNSEC_SYSCTL
78304 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
78305 +#ifdef CONFIG_GRKERNSEC_IO
78306 + {
78307 + .procname = "disable_priv_io",
78308 + .data = &grsec_disable_privio,
78309 + .maxlen = sizeof(int),
78310 + .mode = 0600,
78311 + .proc_handler = &proc_dointvec,
78312 + },
78313 +#endif
78314 +#endif
78315 +#ifdef CONFIG_GRKERNSEC_LINK
78316 + {
78317 + .procname = "linking_restrictions",
78318 + .data = &grsec_enable_link,
78319 + .maxlen = sizeof(int),
78320 + .mode = 0600,
78321 + .proc_handler = &proc_dointvec,
78322 + },
78323 +#endif
78324 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78325 + {
78326 + .procname = "enforce_symlinksifowner",
78327 + .data = &grsec_enable_symlinkown,
78328 + .maxlen = sizeof(int),
78329 + .mode = 0600,
78330 + .proc_handler = &proc_dointvec,
78331 + },
78332 + {
78333 + .procname = "symlinkown_gid",
78334 + .data = &grsec_symlinkown_gid,
78335 + .maxlen = sizeof(int),
78336 + .mode = 0600,
78337 + .proc_handler = &proc_dointvec,
78338 + },
78339 +#endif
78340 +#ifdef CONFIG_GRKERNSEC_BRUTE
78341 + {
78342 + .procname = "deter_bruteforce",
78343 + .data = &grsec_enable_brute,
78344 + .maxlen = sizeof(int),
78345 + .mode = 0600,
78346 + .proc_handler = &proc_dointvec,
78347 + },
78348 +#endif
78349 +#ifdef CONFIG_GRKERNSEC_FIFO
78350 + {
78351 + .procname = "fifo_restrictions",
78352 + .data = &grsec_enable_fifo,
78353 + .maxlen = sizeof(int),
78354 + .mode = 0600,
78355 + .proc_handler = &proc_dointvec,
78356 + },
78357 +#endif
78358 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78359 + {
78360 + .procname = "ptrace_readexec",
78361 + .data = &grsec_enable_ptrace_readexec,
78362 + .maxlen = sizeof(int),
78363 + .mode = 0600,
78364 + .proc_handler = &proc_dointvec,
78365 + },
78366 +#endif
78367 +#ifdef CONFIG_GRKERNSEC_SETXID
78368 + {
78369 + .procname = "consistent_setxid",
78370 + .data = &grsec_enable_setxid,
78371 + .maxlen = sizeof(int),
78372 + .mode = 0600,
78373 + .proc_handler = &proc_dointvec,
78374 + },
78375 +#endif
78376 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78377 + {
78378 + .procname = "ip_blackhole",
78379 + .data = &grsec_enable_blackhole,
78380 + .maxlen = sizeof(int),
78381 + .mode = 0600,
78382 + .proc_handler = &proc_dointvec,
78383 + },
78384 + {
78385 + .procname = "lastack_retries",
78386 + .data = &grsec_lastack_retries,
78387 + .maxlen = sizeof(int),
78388 + .mode = 0600,
78389 + .proc_handler = &proc_dointvec,
78390 + },
78391 +#endif
78392 +#ifdef CONFIG_GRKERNSEC_EXECLOG
78393 + {
78394 + .procname = "exec_logging",
78395 + .data = &grsec_enable_execlog,
78396 + .maxlen = sizeof(int),
78397 + .mode = 0600,
78398 + .proc_handler = &proc_dointvec,
78399 + },
78400 +#endif
78401 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78402 + {
78403 + .procname = "rwxmap_logging",
78404 + .data = &grsec_enable_log_rwxmaps,
78405 + .maxlen = sizeof(int),
78406 + .mode = 0600,
78407 + .proc_handler = &proc_dointvec,
78408 + },
78409 +#endif
78410 +#ifdef CONFIG_GRKERNSEC_SIGNAL
78411 + {
78412 + .procname = "signal_logging",
78413 + .data = &grsec_enable_signal,
78414 + .maxlen = sizeof(int),
78415 + .mode = 0600,
78416 + .proc_handler = &proc_dointvec,
78417 + },
78418 +#endif
78419 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
78420 + {
78421 + .procname = "forkfail_logging",
78422 + .data = &grsec_enable_forkfail,
78423 + .maxlen = sizeof(int),
78424 + .mode = 0600,
78425 + .proc_handler = &proc_dointvec,
78426 + },
78427 +#endif
78428 +#ifdef CONFIG_GRKERNSEC_TIME
78429 + {
78430 + .procname = "timechange_logging",
78431 + .data = &grsec_enable_time,
78432 + .maxlen = sizeof(int),
78433 + .mode = 0600,
78434 + .proc_handler = &proc_dointvec,
78435 + },
78436 +#endif
78437 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
78438 + {
78439 + .procname = "chroot_deny_shmat",
78440 + .data = &grsec_enable_chroot_shmat,
78441 + .maxlen = sizeof(int),
78442 + .mode = 0600,
78443 + .proc_handler = &proc_dointvec,
78444 + },
78445 +#endif
78446 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
78447 + {
78448 + .procname = "chroot_deny_unix",
78449 + .data = &grsec_enable_chroot_unix,
78450 + .maxlen = sizeof(int),
78451 + .mode = 0600,
78452 + .proc_handler = &proc_dointvec,
78453 + },
78454 +#endif
78455 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
78456 + {
78457 + .procname = "chroot_deny_mount",
78458 + .data = &grsec_enable_chroot_mount,
78459 + .maxlen = sizeof(int),
78460 + .mode = 0600,
78461 + .proc_handler = &proc_dointvec,
78462 + },
78463 +#endif
78464 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
78465 + {
78466 + .procname = "chroot_deny_fchdir",
78467 + .data = &grsec_enable_chroot_fchdir,
78468 + .maxlen = sizeof(int),
78469 + .mode = 0600,
78470 + .proc_handler = &proc_dointvec,
78471 + },
78472 +#endif
78473 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
78474 + {
78475 + .procname = "chroot_deny_chroot",
78476 + .data = &grsec_enable_chroot_double,
78477 + .maxlen = sizeof(int),
78478 + .mode = 0600,
78479 + .proc_handler = &proc_dointvec,
78480 + },
78481 +#endif
78482 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
78483 + {
78484 + .procname = "chroot_deny_pivot",
78485 + .data = &grsec_enable_chroot_pivot,
78486 + .maxlen = sizeof(int),
78487 + .mode = 0600,
78488 + .proc_handler = &proc_dointvec,
78489 + },
78490 +#endif
78491 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
78492 + {
78493 + .procname = "chroot_enforce_chdir",
78494 + .data = &grsec_enable_chroot_chdir,
78495 + .maxlen = sizeof(int),
78496 + .mode = 0600,
78497 + .proc_handler = &proc_dointvec,
78498 + },
78499 +#endif
78500 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
78501 + {
78502 + .procname = "chroot_deny_chmod",
78503 + .data = &grsec_enable_chroot_chmod,
78504 + .maxlen = sizeof(int),
78505 + .mode = 0600,
78506 + .proc_handler = &proc_dointvec,
78507 + },
78508 +#endif
78509 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
78510 + {
78511 + .procname = "chroot_deny_mknod",
78512 + .data = &grsec_enable_chroot_mknod,
78513 + .maxlen = sizeof(int),
78514 + .mode = 0600,
78515 + .proc_handler = &proc_dointvec,
78516 + },
78517 +#endif
78518 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
78519 + {
78520 + .procname = "chroot_restrict_nice",
78521 + .data = &grsec_enable_chroot_nice,
78522 + .maxlen = sizeof(int),
78523 + .mode = 0600,
78524 + .proc_handler = &proc_dointvec,
78525 + },
78526 +#endif
78527 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
78528 + {
78529 + .procname = "chroot_execlog",
78530 + .data = &grsec_enable_chroot_execlog,
78531 + .maxlen = sizeof(int),
78532 + .mode = 0600,
78533 + .proc_handler = &proc_dointvec,
78534 + },
78535 +#endif
78536 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
78537 + {
78538 + .procname = "chroot_caps",
78539 + .data = &grsec_enable_chroot_caps,
78540 + .maxlen = sizeof(int),
78541 + .mode = 0600,
78542 + .proc_handler = &proc_dointvec,
78543 + },
78544 +#endif
78545 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
78546 + {
78547 + .procname = "chroot_deny_sysctl",
78548 + .data = &grsec_enable_chroot_sysctl,
78549 + .maxlen = sizeof(int),
78550 + .mode = 0600,
78551 + .proc_handler = &proc_dointvec,
78552 + },
78553 +#endif
78554 +#ifdef CONFIG_GRKERNSEC_TPE
78555 + {
78556 + .procname = "tpe",
78557 + .data = &grsec_enable_tpe,
78558 + .maxlen = sizeof(int),
78559 + .mode = 0600,
78560 + .proc_handler = &proc_dointvec,
78561 + },
78562 + {
78563 + .procname = "tpe_gid",
78564 + .data = &grsec_tpe_gid,
78565 + .maxlen = sizeof(int),
78566 + .mode = 0600,
78567 + .proc_handler = &proc_dointvec,
78568 + },
78569 +#endif
78570 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78571 + {
78572 + .procname = "tpe_invert",
78573 + .data = &grsec_enable_tpe_invert,
78574 + .maxlen = sizeof(int),
78575 + .mode = 0600,
78576 + .proc_handler = &proc_dointvec,
78577 + },
78578 +#endif
78579 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
78580 + {
78581 + .procname = "tpe_restrict_all",
78582 + .data = &grsec_enable_tpe_all,
78583 + .maxlen = sizeof(int),
78584 + .mode = 0600,
78585 + .proc_handler = &proc_dointvec,
78586 + },
78587 +#endif
78588 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78589 + {
78590 + .procname = "socket_all",
78591 + .data = &grsec_enable_socket_all,
78592 + .maxlen = sizeof(int),
78593 + .mode = 0600,
78594 + .proc_handler = &proc_dointvec,
78595 + },
78596 + {
78597 + .procname = "socket_all_gid",
78598 + .data = &grsec_socket_all_gid,
78599 + .maxlen = sizeof(int),
78600 + .mode = 0600,
78601 + .proc_handler = &proc_dointvec,
78602 + },
78603 +#endif
78604 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78605 + {
78606 + .procname = "socket_client",
78607 + .data = &grsec_enable_socket_client,
78608 + .maxlen = sizeof(int),
78609 + .mode = 0600,
78610 + .proc_handler = &proc_dointvec,
78611 + },
78612 + {
78613 + .procname = "socket_client_gid",
78614 + .data = &grsec_socket_client_gid,
78615 + .maxlen = sizeof(int),
78616 + .mode = 0600,
78617 + .proc_handler = &proc_dointvec,
78618 + },
78619 +#endif
78620 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78621 + {
78622 + .procname = "socket_server",
78623 + .data = &grsec_enable_socket_server,
78624 + .maxlen = sizeof(int),
78625 + .mode = 0600,
78626 + .proc_handler = &proc_dointvec,
78627 + },
78628 + {
78629 + .procname = "socket_server_gid",
78630 + .data = &grsec_socket_server_gid,
78631 + .maxlen = sizeof(int),
78632 + .mode = 0600,
78633 + .proc_handler = &proc_dointvec,
78634 + },
78635 +#endif
78636 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
78637 + {
78638 + .procname = "audit_group",
78639 + .data = &grsec_enable_group,
78640 + .maxlen = sizeof(int),
78641 + .mode = 0600,
78642 + .proc_handler = &proc_dointvec,
78643 + },
78644 + {
78645 + .procname = "audit_gid",
78646 + .data = &grsec_audit_gid,
78647 + .maxlen = sizeof(int),
78648 + .mode = 0600,
78649 + .proc_handler = &proc_dointvec,
78650 + },
78651 +#endif
78652 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
78653 + {
78654 + .procname = "audit_chdir",
78655 + .data = &grsec_enable_chdir,
78656 + .maxlen = sizeof(int),
78657 + .mode = 0600,
78658 + .proc_handler = &proc_dointvec,
78659 + },
78660 +#endif
78661 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78662 + {
78663 + .procname = "audit_mount",
78664 + .data = &grsec_enable_mount,
78665 + .maxlen = sizeof(int),
78666 + .mode = 0600,
78667 + .proc_handler = &proc_dointvec,
78668 + },
78669 +#endif
78670 +#ifdef CONFIG_GRKERNSEC_DMESG
78671 + {
78672 + .procname = "dmesg",
78673 + .data = &grsec_enable_dmesg,
78674 + .maxlen = sizeof(int),
78675 + .mode = 0600,
78676 + .proc_handler = &proc_dointvec,
78677 + },
78678 +#endif
78679 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
78680 + {
78681 + .procname = "chroot_findtask",
78682 + .data = &grsec_enable_chroot_findtask,
78683 + .maxlen = sizeof(int),
78684 + .mode = 0600,
78685 + .proc_handler = &proc_dointvec,
78686 + },
78687 +#endif
78688 +#ifdef CONFIG_GRKERNSEC_RESLOG
78689 + {
78690 + .procname = "resource_logging",
78691 + .data = &grsec_resource_logging,
78692 + .maxlen = sizeof(int),
78693 + .mode = 0600,
78694 + .proc_handler = &proc_dointvec,
78695 + },
78696 +#endif
78697 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78698 + {
78699 + .procname = "audit_ptrace",
78700 + .data = &grsec_enable_audit_ptrace,
78701 + .maxlen = sizeof(int),
78702 + .mode = 0600,
78703 + .proc_handler = &proc_dointvec,
78704 + },
78705 +#endif
78706 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
78707 + {
78708 + .procname = "harden_ptrace",
78709 + .data = &grsec_enable_harden_ptrace,
78710 + .maxlen = sizeof(int),
78711 + .mode = 0600,
78712 + .proc_handler = &proc_dointvec,
78713 + },
78714 +#endif
78715 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
78716 + {
78717 + .procname = "harden_ipc",
78718 + .data = &grsec_enable_harden_ipc,
78719 + .maxlen = sizeof(int),
78720 + .mode = 0600,
78721 + .proc_handler = &proc_dointvec,
78722 + },
78723 +#endif
78724 + {
78725 + .procname = "grsec_lock",
78726 + .data = &grsec_lock,
78727 + .maxlen = sizeof(int),
78728 + .mode = 0600,
78729 + .proc_handler = &proc_dointvec,
78730 + },
78731 +#endif
78732 +#ifdef CONFIG_GRKERNSEC_ROFS
78733 + {
78734 + .procname = "romount_protect",
78735 + .data = &grsec_enable_rofs,
78736 + .maxlen = sizeof(int),
78737 + .mode = 0600,
78738 + .proc_handler = &proc_dointvec_minmax,
78739 + .extra1 = &one,
78740 + .extra2 = &one,
78741 + },
78742 +#endif
78743 +#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
78744 + {
78745 + .procname = "deny_new_usb",
78746 + .data = &grsec_deny_new_usb,
78747 + .maxlen = sizeof(int),
78748 + .mode = 0600,
78749 + .proc_handler = &proc_dointvec,
78750 + },
78751 +#endif
78752 + { }
78753 +};
78754 +#endif
78755 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
78756 new file mode 100644
78757 index 0000000..61b514e
78758 --- /dev/null
78759 +++ b/grsecurity/grsec_time.c
78760 @@ -0,0 +1,16 @@
78761 +#include <linux/kernel.h>
78762 +#include <linux/sched.h>
78763 +#include <linux/grinternal.h>
78764 +#include <linux/module.h>
78765 +
78766 +void
78767 +gr_log_timechange(void)
78768 +{
78769 +#ifdef CONFIG_GRKERNSEC_TIME
78770 + if (grsec_enable_time)
78771 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
78772 +#endif
78773 + return;
78774 +}
78775 +
78776 +EXPORT_SYMBOL_GPL(gr_log_timechange);
78777 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
78778 new file mode 100644
78779 index 0000000..d1953de
78780 --- /dev/null
78781 +++ b/grsecurity/grsec_tpe.c
78782 @@ -0,0 +1,78 @@
78783 +#include <linux/kernel.h>
78784 +#include <linux/sched.h>
78785 +#include <linux/file.h>
78786 +#include <linux/fs.h>
78787 +#include <linux/grinternal.h>
78788 +
78789 +extern int gr_acl_tpe_check(void);
78790 +
78791 +int
78792 +gr_tpe_allow(const struct file *file)
78793 +{
78794 +#ifdef CONFIG_GRKERNSEC
78795 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
78796 + struct inode *file_inode = file->f_path.dentry->d_inode;
78797 + const struct cred *cred = current_cred();
78798 + char *msg = NULL;
78799 + char *msg2 = NULL;
78800 +
78801 + // never restrict root
78802 + if (gr_is_global_root(cred->uid))
78803 + return 1;
78804 +
78805 + if (grsec_enable_tpe) {
78806 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78807 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
78808 + msg = "not being in trusted group";
78809 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
78810 + msg = "being in untrusted group";
78811 +#else
78812 + if (in_group_p(grsec_tpe_gid))
78813 + msg = "being in untrusted group";
78814 +#endif
78815 + }
78816 + if (!msg && gr_acl_tpe_check())
78817 + msg = "being in untrusted role";
78818 +
78819 + // not in any affected group/role
78820 + if (!msg)
78821 + goto next_check;
78822 +
78823 + if (gr_is_global_nonroot(inode->i_uid))
78824 + msg2 = "file in non-root-owned directory";
78825 + else if (inode->i_mode & S_IWOTH)
78826 + msg2 = "file in world-writable directory";
78827 + else if (inode->i_mode & S_IWGRP)
78828 + msg2 = "file in group-writable directory";
78829 + else if (file_inode->i_mode & S_IWOTH)
78830 + msg2 = "file is world-writable";
78831 +
78832 + if (msg && msg2) {
78833 + char fullmsg[70] = {0};
78834 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
78835 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
78836 + return 0;
78837 + }
78838 + msg = NULL;
78839 +next_check:
78840 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
78841 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
78842 + return 1;
78843 +
78844 + if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
78845 + msg = "directory not owned by user";
78846 + else if (inode->i_mode & S_IWOTH)
78847 + msg = "file in world-writable directory";
78848 + else if (inode->i_mode & S_IWGRP)
78849 + msg = "file in group-writable directory";
78850 + else if (file_inode->i_mode & S_IWOTH)
78851 + msg = "file is world-writable";
78852 +
78853 + if (msg) {
78854 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
78855 + return 0;
78856 + }
78857 +#endif
78858 +#endif
78859 + return 1;
78860 +}
78861 diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
78862 new file mode 100644
78863 index 0000000..ae02d8e
78864 --- /dev/null
78865 +++ b/grsecurity/grsec_usb.c
78866 @@ -0,0 +1,15 @@
78867 +#include <linux/kernel.h>
78868 +#include <linux/grinternal.h>
78869 +#include <linux/module.h>
78870 +
78871 +int gr_handle_new_usb(void)
78872 +{
78873 +#ifdef CONFIG_GRKERNSEC_DENYUSB
78874 + if (grsec_deny_new_usb) {
78875 + printk(KERN_ALERT "grsec: denied insert of new USB device\n");
78876 + return 1;
78877 + }
78878 +#endif
78879 + return 0;
78880 +}
78881 +EXPORT_SYMBOL_GPL(gr_handle_new_usb);
78882 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
78883 new file mode 100644
78884 index 0000000..158b330
78885 --- /dev/null
78886 +++ b/grsecurity/grsum.c
78887 @@ -0,0 +1,64 @@
78888 +#include <linux/err.h>
78889 +#include <linux/kernel.h>
78890 +#include <linux/sched.h>
78891 +#include <linux/mm.h>
78892 +#include <linux/scatterlist.h>
78893 +#include <linux/crypto.h>
78894 +#include <linux/gracl.h>
78895 +
78896 +
78897 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
78898 +#error "crypto and sha256 must be built into the kernel"
78899 +#endif
78900 +
78901 +int
78902 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
78903 +{
78904 + struct crypto_hash *tfm;
78905 + struct hash_desc desc;
78906 + struct scatterlist sg[2];
78907 + unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
78908 + unsigned long *tmpsumptr = (unsigned long *)temp_sum;
78909 + unsigned long *sumptr = (unsigned long *)sum;
78910 + int cryptres;
78911 + int retval = 1;
78912 + volatile int mismatched = 0;
78913 + volatile int dummy = 0;
78914 + unsigned int i;
78915 +
78916 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
78917 + if (IS_ERR(tfm)) {
78918 + /* should never happen, since sha256 should be built in */
78919 + memset(entry->pw, 0, GR_PW_LEN);
78920 + return 1;
78921 + }
78922 +
78923 + sg_init_table(sg, 2);
78924 + sg_set_buf(&sg[0], salt, GR_SALT_LEN);
78925 + sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
78926 +
78927 + desc.tfm = tfm;
78928 + desc.flags = 0;
78929 +
78930 + cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
78931 + temp_sum);
78932 +
78933 + memset(entry->pw, 0, GR_PW_LEN);
78934 +
78935 + if (cryptres)
78936 + goto out;
78937 +
78938 + for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
78939 + if (sumptr[i] != tmpsumptr[i])
78940 + mismatched = 1;
78941 + else
78942 + dummy = 1; // waste a cycle
78943 +
78944 + if (!mismatched)
78945 + retval = dummy - 1;
78946 +
78947 +out:
78948 + crypto_free_hash(tfm);
78949 +
78950 + return retval;
78951 +}
78952 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
78953 index 77ff547..181834f 100644
78954 --- a/include/asm-generic/4level-fixup.h
78955 +++ b/include/asm-generic/4level-fixup.h
78956 @@ -13,8 +13,10 @@
78957 #define pmd_alloc(mm, pud, address) \
78958 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
78959 NULL: pmd_offset(pud, address))
78960 +#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
78961
78962 #define pud_alloc(mm, pgd, address) (pgd)
78963 +#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
78964 #define pud_offset(pgd, start) (pgd)
78965 #define pud_none(pud) 0
78966 #define pud_bad(pud) 0
78967 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
78968 index b7babf0..1e4b4f1 100644
78969 --- a/include/asm-generic/atomic-long.h
78970 +++ b/include/asm-generic/atomic-long.h
78971 @@ -22,6 +22,12 @@
78972
78973 typedef atomic64_t atomic_long_t;
78974
78975 +#ifdef CONFIG_PAX_REFCOUNT
78976 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
78977 +#else
78978 +typedef atomic64_t atomic_long_unchecked_t;
78979 +#endif
78980 +
78981 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
78982
78983 static inline long atomic_long_read(atomic_long_t *l)
78984 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
78985 return (long)atomic64_read(v);
78986 }
78987
78988 +#ifdef CONFIG_PAX_REFCOUNT
78989 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
78990 +{
78991 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78992 +
78993 + return (long)atomic64_read_unchecked(v);
78994 +}
78995 +#endif
78996 +
78997 static inline void atomic_long_set(atomic_long_t *l, long i)
78998 {
78999 atomic64_t *v = (atomic64_t *)l;
79000 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79001 atomic64_set(v, i);
79002 }
79003
79004 +#ifdef CONFIG_PAX_REFCOUNT
79005 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79006 +{
79007 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79008 +
79009 + atomic64_set_unchecked(v, i);
79010 +}
79011 +#endif
79012 +
79013 static inline void atomic_long_inc(atomic_long_t *l)
79014 {
79015 atomic64_t *v = (atomic64_t *)l;
79016 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79017 atomic64_inc(v);
79018 }
79019
79020 +#ifdef CONFIG_PAX_REFCOUNT
79021 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79022 +{
79023 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79024 +
79025 + atomic64_inc_unchecked(v);
79026 +}
79027 +#endif
79028 +
79029 static inline void atomic_long_dec(atomic_long_t *l)
79030 {
79031 atomic64_t *v = (atomic64_t *)l;
79032 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79033 atomic64_dec(v);
79034 }
79035
79036 +#ifdef CONFIG_PAX_REFCOUNT
79037 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79038 +{
79039 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79040 +
79041 + atomic64_dec_unchecked(v);
79042 +}
79043 +#endif
79044 +
79045 static inline void atomic_long_add(long i, atomic_long_t *l)
79046 {
79047 atomic64_t *v = (atomic64_t *)l;
79048 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79049 atomic64_add(i, v);
79050 }
79051
79052 +#ifdef CONFIG_PAX_REFCOUNT
79053 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79054 +{
79055 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79056 +
79057 + atomic64_add_unchecked(i, v);
79058 +}
79059 +#endif
79060 +
79061 static inline void atomic_long_sub(long i, atomic_long_t *l)
79062 {
79063 atomic64_t *v = (atomic64_t *)l;
79064 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79065 atomic64_sub(i, v);
79066 }
79067
79068 +#ifdef CONFIG_PAX_REFCOUNT
79069 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79070 +{
79071 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79072 +
79073 + atomic64_sub_unchecked(i, v);
79074 +}
79075 +#endif
79076 +
79077 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79078 {
79079 atomic64_t *v = (atomic64_t *)l;
79080 @@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79081 return atomic64_add_negative(i, v);
79082 }
79083
79084 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
79085 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79086 {
79087 atomic64_t *v = (atomic64_t *)l;
79088
79089 return (long)atomic64_add_return(i, v);
79090 }
79091
79092 +#ifdef CONFIG_PAX_REFCOUNT
79093 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79094 +{
79095 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79096 +
79097 + return (long)atomic64_add_return_unchecked(i, v);
79098 +}
79099 +#endif
79100 +
79101 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79102 {
79103 atomic64_t *v = (atomic64_t *)l;
79104 @@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79105 return (long)atomic64_inc_return(v);
79106 }
79107
79108 +#ifdef CONFIG_PAX_REFCOUNT
79109 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79110 +{
79111 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79112 +
79113 + return (long)atomic64_inc_return_unchecked(v);
79114 +}
79115 +#endif
79116 +
79117 static inline long atomic_long_dec_return(atomic_long_t *l)
79118 {
79119 atomic64_t *v = (atomic64_t *)l;
79120 @@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79121
79122 typedef atomic_t atomic_long_t;
79123
79124 +#ifdef CONFIG_PAX_REFCOUNT
79125 +typedef atomic_unchecked_t atomic_long_unchecked_t;
79126 +#else
79127 +typedef atomic_t atomic_long_unchecked_t;
79128 +#endif
79129 +
79130 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79131 static inline long atomic_long_read(atomic_long_t *l)
79132 {
79133 @@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79134 return (long)atomic_read(v);
79135 }
79136
79137 +#ifdef CONFIG_PAX_REFCOUNT
79138 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79139 +{
79140 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79141 +
79142 + return (long)atomic_read_unchecked(v);
79143 +}
79144 +#endif
79145 +
79146 static inline void atomic_long_set(atomic_long_t *l, long i)
79147 {
79148 atomic_t *v = (atomic_t *)l;
79149 @@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79150 atomic_set(v, i);
79151 }
79152
79153 +#ifdef CONFIG_PAX_REFCOUNT
79154 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79155 +{
79156 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79157 +
79158 + atomic_set_unchecked(v, i);
79159 +}
79160 +#endif
79161 +
79162 static inline void atomic_long_inc(atomic_long_t *l)
79163 {
79164 atomic_t *v = (atomic_t *)l;
79165 @@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79166 atomic_inc(v);
79167 }
79168
79169 +#ifdef CONFIG_PAX_REFCOUNT
79170 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79171 +{
79172 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79173 +
79174 + atomic_inc_unchecked(v);
79175 +}
79176 +#endif
79177 +
79178 static inline void atomic_long_dec(atomic_long_t *l)
79179 {
79180 atomic_t *v = (atomic_t *)l;
79181 @@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79182 atomic_dec(v);
79183 }
79184
79185 +#ifdef CONFIG_PAX_REFCOUNT
79186 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79187 +{
79188 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79189 +
79190 + atomic_dec_unchecked(v);
79191 +}
79192 +#endif
79193 +
79194 static inline void atomic_long_add(long i, atomic_long_t *l)
79195 {
79196 atomic_t *v = (atomic_t *)l;
79197 @@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79198 atomic_add(i, v);
79199 }
79200
79201 +#ifdef CONFIG_PAX_REFCOUNT
79202 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79203 +{
79204 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79205 +
79206 + atomic_add_unchecked(i, v);
79207 +}
79208 +#endif
79209 +
79210 static inline void atomic_long_sub(long i, atomic_long_t *l)
79211 {
79212 atomic_t *v = (atomic_t *)l;
79213 @@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79214 atomic_sub(i, v);
79215 }
79216
79217 +#ifdef CONFIG_PAX_REFCOUNT
79218 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79219 +{
79220 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79221 +
79222 + atomic_sub_unchecked(i, v);
79223 +}
79224 +#endif
79225 +
79226 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79227 {
79228 atomic_t *v = (atomic_t *)l;
79229 @@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79230 return atomic_add_negative(i, v);
79231 }
79232
79233 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
79234 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79235 {
79236 atomic_t *v = (atomic_t *)l;
79237
79238 return (long)atomic_add_return(i, v);
79239 }
79240
79241 +#ifdef CONFIG_PAX_REFCOUNT
79242 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79243 +{
79244 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79245 +
79246 + return (long)atomic_add_return_unchecked(i, v);
79247 +}
79248 +
79249 +#endif
79250 +
79251 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79252 {
79253 atomic_t *v = (atomic_t *)l;
79254 @@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79255 return (long)atomic_inc_return(v);
79256 }
79257
79258 +#ifdef CONFIG_PAX_REFCOUNT
79259 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79260 +{
79261 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79262 +
79263 + return (long)atomic_inc_return_unchecked(v);
79264 +}
79265 +#endif
79266 +
79267 static inline long atomic_long_dec_return(atomic_long_t *l)
79268 {
79269 atomic_t *v = (atomic_t *)l;
79270 @@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79271
79272 #endif /* BITS_PER_LONG == 64 */
79273
79274 +#ifdef CONFIG_PAX_REFCOUNT
79275 +static inline void pax_refcount_needs_these_functions(void)
79276 +{
79277 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
79278 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
79279 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
79280 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
79281 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
79282 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
79283 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
79284 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
79285 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
79286 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
79287 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
79288 +#ifdef CONFIG_X86
79289 + atomic_clear_mask_unchecked(0, NULL);
79290 + atomic_set_mask_unchecked(0, NULL);
79291 +#endif
79292 +
79293 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
79294 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
79295 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
79296 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
79297 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
79298 + atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
79299 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
79300 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
79301 +}
79302 +#else
79303 +#define atomic_read_unchecked(v) atomic_read(v)
79304 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
79305 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
79306 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
79307 +#define atomic_inc_unchecked(v) atomic_inc(v)
79308 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
79309 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
79310 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
79311 +#define atomic_dec_unchecked(v) atomic_dec(v)
79312 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
79313 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
79314 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
79315 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
79316 +
79317 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
79318 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
79319 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
79320 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
79321 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
79322 +#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
79323 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
79324 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
79325 +#endif
79326 +
79327 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
79328 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
79329 index 30ad9c8..c70c170 100644
79330 --- a/include/asm-generic/atomic64.h
79331 +++ b/include/asm-generic/atomic64.h
79332 @@ -16,6 +16,8 @@ typedef struct {
79333 long long counter;
79334 } atomic64_t;
79335
79336 +typedef atomic64_t atomic64_unchecked_t;
79337 +
79338 #define ATOMIC64_INIT(i) { (i) }
79339
79340 extern long long atomic64_read(const atomic64_t *v);
79341 @@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
79342 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
79343 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
79344
79345 +#define atomic64_read_unchecked(v) atomic64_read(v)
79346 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
79347 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
79348 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
79349 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
79350 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
79351 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
79352 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
79353 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
79354 +
79355 #endif /* _ASM_GENERIC_ATOMIC64_H */
79356 diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
79357 index 1402fa8..025a736 100644
79358 --- a/include/asm-generic/barrier.h
79359 +++ b/include/asm-generic/barrier.h
79360 @@ -74,7 +74,7 @@
79361 do { \
79362 compiletime_assert_atomic_type(*p); \
79363 smp_mb(); \
79364 - ACCESS_ONCE(*p) = (v); \
79365 + ACCESS_ONCE_RW(*p) = (v); \
79366 } while (0)
79367
79368 #define smp_load_acquire(p) \
79369 diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
79370 index a60a7cc..0fe12f2 100644
79371 --- a/include/asm-generic/bitops/__fls.h
79372 +++ b/include/asm-generic/bitops/__fls.h
79373 @@ -9,7 +9,7 @@
79374 *
79375 * Undefined if no set bit exists, so code should check against 0 first.
79376 */
79377 -static __always_inline unsigned long __fls(unsigned long word)
79378 +static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
79379 {
79380 int num = BITS_PER_LONG - 1;
79381
79382 diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
79383 index 0576d1f..dad6c71 100644
79384 --- a/include/asm-generic/bitops/fls.h
79385 +++ b/include/asm-generic/bitops/fls.h
79386 @@ -9,7 +9,7 @@
79387 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
79388 */
79389
79390 -static __always_inline int fls(int x)
79391 +static __always_inline int __intentional_overflow(-1) fls(int x)
79392 {
79393 int r = 32;
79394
79395 diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
79396 index b097cf8..3d40e14 100644
79397 --- a/include/asm-generic/bitops/fls64.h
79398 +++ b/include/asm-generic/bitops/fls64.h
79399 @@ -15,7 +15,7 @@
79400 * at position 64.
79401 */
79402 #if BITS_PER_LONG == 32
79403 -static __always_inline int fls64(__u64 x)
79404 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79405 {
79406 __u32 h = x >> 32;
79407 if (h)
79408 @@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
79409 return fls(x);
79410 }
79411 #elif BITS_PER_LONG == 64
79412 -static __always_inline int fls64(__u64 x)
79413 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79414 {
79415 if (x == 0)
79416 return 0;
79417 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
79418 index 1bfcfe5..e04c5c9 100644
79419 --- a/include/asm-generic/cache.h
79420 +++ b/include/asm-generic/cache.h
79421 @@ -6,7 +6,7 @@
79422 * cache lines need to provide their own cache.h.
79423 */
79424
79425 -#define L1_CACHE_SHIFT 5
79426 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
79427 +#define L1_CACHE_SHIFT 5UL
79428 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
79429
79430 #endif /* __ASM_GENERIC_CACHE_H */
79431 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
79432 index 0d68a1e..b74a761 100644
79433 --- a/include/asm-generic/emergency-restart.h
79434 +++ b/include/asm-generic/emergency-restart.h
79435 @@ -1,7 +1,7 @@
79436 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
79437 #define _ASM_GENERIC_EMERGENCY_RESTART_H
79438
79439 -static inline void machine_emergency_restart(void)
79440 +static inline __noreturn void machine_emergency_restart(void)
79441 {
79442 machine_restart(NULL);
79443 }
79444 diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
79445 index b8fdc57..c6d5a5c 100644
79446 --- a/include/asm-generic/io.h
79447 +++ b/include/asm-generic/io.h
79448 @@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
79449 * These are pretty trivial
79450 */
79451 #ifndef virt_to_phys
79452 -static inline unsigned long virt_to_phys(volatile void *address)
79453 +static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
79454 {
79455 return __pa((unsigned long)address);
79456 }
79457 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
79458 index 90f99c7..00ce236 100644
79459 --- a/include/asm-generic/kmap_types.h
79460 +++ b/include/asm-generic/kmap_types.h
79461 @@ -2,9 +2,9 @@
79462 #define _ASM_GENERIC_KMAP_TYPES_H
79463
79464 #ifdef __WITH_KM_FENCE
79465 -# define KM_TYPE_NR 41
79466 +# define KM_TYPE_NR 42
79467 #else
79468 -# define KM_TYPE_NR 20
79469 +# define KM_TYPE_NR 21
79470 #endif
79471
79472 #endif
79473 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
79474 index 9ceb03b..62b0b8f 100644
79475 --- a/include/asm-generic/local.h
79476 +++ b/include/asm-generic/local.h
79477 @@ -23,24 +23,37 @@ typedef struct
79478 atomic_long_t a;
79479 } local_t;
79480
79481 +typedef struct {
79482 + atomic_long_unchecked_t a;
79483 +} local_unchecked_t;
79484 +
79485 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
79486
79487 #define local_read(l) atomic_long_read(&(l)->a)
79488 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
79489 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
79490 +#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
79491 #define local_inc(l) atomic_long_inc(&(l)->a)
79492 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
79493 #define local_dec(l) atomic_long_dec(&(l)->a)
79494 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
79495 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
79496 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
79497 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
79498 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
79499
79500 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
79501 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
79502 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
79503 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
79504 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
79505 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
79506 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
79507 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
79508 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
79509
79510 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79511 +#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79512 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
79513 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
79514 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
79515 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
79516 index 725612b..9cc513a 100644
79517 --- a/include/asm-generic/pgtable-nopmd.h
79518 +++ b/include/asm-generic/pgtable-nopmd.h
79519 @@ -1,14 +1,19 @@
79520 #ifndef _PGTABLE_NOPMD_H
79521 #define _PGTABLE_NOPMD_H
79522
79523 -#ifndef __ASSEMBLY__
79524 -
79525 #include <asm-generic/pgtable-nopud.h>
79526
79527 -struct mm_struct;
79528 -
79529 #define __PAGETABLE_PMD_FOLDED
79530
79531 +#define PMD_SHIFT PUD_SHIFT
79532 +#define PTRS_PER_PMD 1
79533 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
79534 +#define PMD_MASK (~(PMD_SIZE-1))
79535 +
79536 +#ifndef __ASSEMBLY__
79537 +
79538 +struct mm_struct;
79539 +
79540 /*
79541 * Having the pmd type consist of a pud gets the size right, and allows
79542 * us to conceptually access the pud entry that this pmd is folded into
79543 @@ -16,11 +21,6 @@ struct mm_struct;
79544 */
79545 typedef struct { pud_t pud; } pmd_t;
79546
79547 -#define PMD_SHIFT PUD_SHIFT
79548 -#define PTRS_PER_PMD 1
79549 -#define PMD_SIZE (1UL << PMD_SHIFT)
79550 -#define PMD_MASK (~(PMD_SIZE-1))
79551 -
79552 /*
79553 * The "pud_xxx()" functions here are trivial for a folded two-level
79554 * setup: the pmd is never bad, and a pmd always exists (as it's folded
79555 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
79556 index 810431d..0ec4804f 100644
79557 --- a/include/asm-generic/pgtable-nopud.h
79558 +++ b/include/asm-generic/pgtable-nopud.h
79559 @@ -1,10 +1,15 @@
79560 #ifndef _PGTABLE_NOPUD_H
79561 #define _PGTABLE_NOPUD_H
79562
79563 -#ifndef __ASSEMBLY__
79564 -
79565 #define __PAGETABLE_PUD_FOLDED
79566
79567 +#define PUD_SHIFT PGDIR_SHIFT
79568 +#define PTRS_PER_PUD 1
79569 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
79570 +#define PUD_MASK (~(PUD_SIZE-1))
79571 +
79572 +#ifndef __ASSEMBLY__
79573 +
79574 /*
79575 * Having the pud type consist of a pgd gets the size right, and allows
79576 * us to conceptually access the pgd entry that this pud is folded into
79577 @@ -12,11 +17,6 @@
79578 */
79579 typedef struct { pgd_t pgd; } pud_t;
79580
79581 -#define PUD_SHIFT PGDIR_SHIFT
79582 -#define PTRS_PER_PUD 1
79583 -#define PUD_SIZE (1UL << PUD_SHIFT)
79584 -#define PUD_MASK (~(PUD_SIZE-1))
79585 -
79586 /*
79587 * The "pgd_xxx()" functions here are trivial for a folded two-level
79588 * setup: the pud is never bad, and a pud always exists (as it's folded
79589 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
79590 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
79591
79592 #define pgd_populate(mm, pgd, pud) do { } while (0)
79593 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
79594 /*
79595 * (puds are folded into pgds so this doesn't get actually called,
79596 * but the define is needed for a generic inline function.)
79597 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
79598 index 752e30d..87f172d 100644
79599 --- a/include/asm-generic/pgtable.h
79600 +++ b/include/asm-generic/pgtable.h
79601 @@ -828,6 +828,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
79602 }
79603 #endif /* CONFIG_NUMA_BALANCING */
79604
79605 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
79606 +#ifdef CONFIG_PAX_KERNEXEC
79607 +#error KERNEXEC requires pax_open_kernel
79608 +#else
79609 +static inline unsigned long pax_open_kernel(void) { return 0; }
79610 +#endif
79611 +#endif
79612 +
79613 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
79614 +#ifdef CONFIG_PAX_KERNEXEC
79615 +#error KERNEXEC requires pax_close_kernel
79616 +#else
79617 +static inline unsigned long pax_close_kernel(void) { return 0; }
79618 +#endif
79619 +#endif
79620 +
79621 #endif /* CONFIG_MMU */
79622
79623 #endif /* !__ASSEMBLY__ */
79624 diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
79625 index 72d8803..cb9749c 100644
79626 --- a/include/asm-generic/uaccess.h
79627 +++ b/include/asm-generic/uaccess.h
79628 @@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
79629 return __clear_user(to, n);
79630 }
79631
79632 +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
79633 +#ifdef CONFIG_PAX_MEMORY_UDEREF
79634 +#error UDEREF requires pax_open_userland
79635 +#else
79636 +static inline unsigned long pax_open_userland(void) { return 0; }
79637 +#endif
79638 +#endif
79639 +
79640 +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
79641 +#ifdef CONFIG_PAX_MEMORY_UDEREF
79642 +#error UDEREF requires pax_close_userland
79643 +#else
79644 +static inline unsigned long pax_close_userland(void) { return 0; }
79645 +#endif
79646 +#endif
79647 +
79648 #endif /* __ASM_GENERIC_UACCESS_H */
79649 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
79650 index aa70cbd..fd72c7a 100644
79651 --- a/include/asm-generic/vmlinux.lds.h
79652 +++ b/include/asm-generic/vmlinux.lds.h
79653 @@ -233,6 +233,7 @@
79654 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
79655 VMLINUX_SYMBOL(__start_rodata) = .; \
79656 *(.rodata) *(.rodata.*) \
79657 + *(.data..read_only) \
79658 *(__vermagic) /* Kernel version magic */ \
79659 . = ALIGN(8); \
79660 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
79661 @@ -724,17 +725,18 @@
79662 * section in the linker script will go there too. @phdr should have
79663 * a leading colon.
79664 *
79665 - * Note that this macros defines __per_cpu_load as an absolute symbol.
79666 + * Note that this macros defines per_cpu_load as an absolute symbol.
79667 * If there is no need to put the percpu section at a predetermined
79668 * address, use PERCPU_SECTION.
79669 */
79670 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
79671 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
79672 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
79673 + per_cpu_load = .; \
79674 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
79675 - LOAD_OFFSET) { \
79676 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
79677 PERCPU_INPUT(cacheline) \
79678 } phdr \
79679 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
79680 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
79681
79682 /**
79683 * PERCPU_SECTION - define output section for percpu area, simple version
79684 diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
79685 index 623a59c..1e79ab9 100644
79686 --- a/include/crypto/algapi.h
79687 +++ b/include/crypto/algapi.h
79688 @@ -34,7 +34,7 @@ struct crypto_type {
79689 unsigned int maskclear;
79690 unsigned int maskset;
79691 unsigned int tfmsize;
79692 -};
79693 +} __do_const;
79694
79695 struct crypto_instance {
79696 struct crypto_alg alg;
79697 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
79698 index 53ed876..5bb09be 100644
79699 --- a/include/drm/drmP.h
79700 +++ b/include/drm/drmP.h
79701 @@ -59,6 +59,7 @@
79702
79703 #include <asm/mman.h>
79704 #include <asm/pgalloc.h>
79705 +#include <asm/local.h>
79706 #include <asm/uaccess.h>
79707
79708 #include <uapi/drm/drm.h>
79709 @@ -223,10 +224,12 @@ void drm_err(const char *func, const char *format, ...);
79710 * \param cmd command.
79711 * \param arg argument.
79712 */
79713 -typedef int drm_ioctl_t(struct drm_device *dev, void *data,
79714 +typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
79715 + struct drm_file *file_priv);
79716 +typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
79717 struct drm_file *file_priv);
79718
79719 -typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79720 +typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
79721 unsigned long arg);
79722
79723 #define DRM_IOCTL_NR(n) _IOC_NR(n)
79724 @@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79725 struct drm_ioctl_desc {
79726 unsigned int cmd;
79727 int flags;
79728 - drm_ioctl_t *func;
79729 + drm_ioctl_t func;
79730 unsigned int cmd_drv;
79731 const char *name;
79732 -};
79733 +} __do_const;
79734
79735 /**
79736 * Creates a driver or general drm_ioctl_desc array entry for the given
79737 @@ -629,7 +632,8 @@ struct drm_info_list {
79738 int (*show)(struct seq_file*, void*); /** show callback */
79739 u32 driver_features; /**< Required driver features for this entry */
79740 void *data;
79741 -};
79742 +} __do_const;
79743 +typedef struct drm_info_list __no_const drm_info_list_no_const;
79744
79745 /**
79746 * debugfs node structure. This structure represents a debugfs file.
79747 @@ -713,7 +717,7 @@ struct drm_device {
79748
79749 /** \name Usage Counters */
79750 /*@{ */
79751 - int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79752 + local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79753 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
79754 int buf_use; /**< Buffers in use -- cannot alloc */
79755 atomic_t buf_alloc; /**< Buffer allocation in progress */
79756 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
79757 index a3d75fe..6802f9c 100644
79758 --- a/include/drm/drm_crtc_helper.h
79759 +++ b/include/drm/drm_crtc_helper.h
79760 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
79761 struct drm_connector *connector);
79762 /* disable encoder when not in use - more explicit than dpms off */
79763 void (*disable)(struct drm_encoder *encoder);
79764 -};
79765 +} __no_const;
79766
79767 /**
79768 * drm_connector_helper_funcs - helper operations for connectors
79769 diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
79770 index a70d456..6ea07cd 100644
79771 --- a/include/drm/i915_pciids.h
79772 +++ b/include/drm/i915_pciids.h
79773 @@ -37,7 +37,7 @@
79774 */
79775 #define INTEL_VGA_DEVICE(id, info) { \
79776 0x8086, id, \
79777 - ~0, ~0, \
79778 + PCI_ANY_ID, PCI_ANY_ID, \
79779 0x030000, 0xff0000, \
79780 (unsigned long) info }
79781
79782 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
79783 index 72dcbe8..8db58d7 100644
79784 --- a/include/drm/ttm/ttm_memory.h
79785 +++ b/include/drm/ttm/ttm_memory.h
79786 @@ -48,7 +48,7 @@
79787
79788 struct ttm_mem_shrink {
79789 int (*do_shrink) (struct ttm_mem_shrink *);
79790 -};
79791 +} __no_const;
79792
79793 /**
79794 * struct ttm_mem_global - Global memory accounting structure.
79795 diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
79796 index 49a8284..9643967 100644
79797 --- a/include/drm/ttm/ttm_page_alloc.h
79798 +++ b/include/drm/ttm/ttm_page_alloc.h
79799 @@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
79800 */
79801 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
79802
79803 +struct device;
79804 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79805 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79806
79807 diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
79808 index 4b840e8..155d235 100644
79809 --- a/include/keys/asymmetric-subtype.h
79810 +++ b/include/keys/asymmetric-subtype.h
79811 @@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
79812 /* Verify the signature on a key of this subtype (optional) */
79813 int (*verify_signature)(const struct key *key,
79814 const struct public_key_signature *sig);
79815 -};
79816 +} __do_const;
79817
79818 /**
79819 * asymmetric_key_subtype - Get the subtype from an asymmetric key
79820 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
79821 index c1da539..1dcec55 100644
79822 --- a/include/linux/atmdev.h
79823 +++ b/include/linux/atmdev.h
79824 @@ -28,7 +28,7 @@ struct compat_atm_iobuf {
79825 #endif
79826
79827 struct k_atm_aal_stats {
79828 -#define __HANDLE_ITEM(i) atomic_t i
79829 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
79830 __AAL_STAT_ITEMS
79831 #undef __HANDLE_ITEM
79832 };
79833 @@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
79834 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
79835 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
79836 struct module *owner;
79837 -};
79838 +} __do_const ;
79839
79840 struct atmphy_ops {
79841 int (*start)(struct atm_dev *dev);
79842 diff --git a/include/linux/audit.h b/include/linux/audit.h
79843 index e58fe7d..be9f6d8 100644
79844 --- a/include/linux/audit.h
79845 +++ b/include/linux/audit.h
79846 @@ -215,7 +215,7 @@ static inline void audit_ptrace(struct task_struct *t)
79847 extern unsigned int audit_serial(void);
79848 extern int auditsc_get_stamp(struct audit_context *ctx,
79849 struct timespec *t, unsigned int *serial);
79850 -extern int audit_set_loginuid(kuid_t loginuid);
79851 +extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
79852
79853 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
79854 {
79855 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
79856 index 61f29e5..e67c658 100644
79857 --- a/include/linux/binfmts.h
79858 +++ b/include/linux/binfmts.h
79859 @@ -44,7 +44,7 @@ struct linux_binprm {
79860 unsigned interp_flags;
79861 unsigned interp_data;
79862 unsigned long loader, exec;
79863 -};
79864 +} __randomize_layout;
79865
79866 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
79867 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
79868 @@ -73,8 +73,10 @@ struct linux_binfmt {
79869 int (*load_binary)(struct linux_binprm *);
79870 int (*load_shlib)(struct file *);
79871 int (*core_dump)(struct coredump_params *cprm);
79872 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
79873 + void (*handle_mmap)(struct file *);
79874 unsigned long min_coredump; /* minimal dump size */
79875 -};
79876 +} __do_const __randomize_layout;
79877
79878 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
79879
79880 diff --git a/include/linux/bitops.h b/include/linux/bitops.h
79881 index 5d858e0..336c1d9 100644
79882 --- a/include/linux/bitops.h
79883 +++ b/include/linux/bitops.h
79884 @@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
79885 * @word: value to rotate
79886 * @shift: bits to roll
79887 */
79888 -static inline __u32 rol32(__u32 word, unsigned int shift)
79889 +static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
79890 {
79891 return (word << shift) | (word >> (32 - shift));
79892 }
79893 @@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
79894 * @word: value to rotate
79895 * @shift: bits to roll
79896 */
79897 -static inline __u32 ror32(__u32 word, unsigned int shift)
79898 +static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
79899 {
79900 return (word >> shift) | (word << (32 - shift));
79901 }
79902 @@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
79903 return (__s32)(value << shift) >> shift;
79904 }
79905
79906 -static inline unsigned fls_long(unsigned long l)
79907 +static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
79908 {
79909 if (sizeof(l) == 4)
79910 return fls(l);
79911 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
79912 index aac0f9e..73c9869 100644
79913 --- a/include/linux/blkdev.h
79914 +++ b/include/linux/blkdev.h
79915 @@ -1615,7 +1615,7 @@ struct block_device_operations {
79916 /* this callback is with swap_lock and sometimes page table lock held */
79917 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
79918 struct module *owner;
79919 -};
79920 +} __do_const;
79921
79922 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
79923 unsigned long);
79924 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
79925 index afc1343..9735539 100644
79926 --- a/include/linux/blktrace_api.h
79927 +++ b/include/linux/blktrace_api.h
79928 @@ -25,7 +25,7 @@ struct blk_trace {
79929 struct dentry *dropped_file;
79930 struct dentry *msg_file;
79931 struct list_head running_list;
79932 - atomic_t dropped;
79933 + atomic_unchecked_t dropped;
79934 };
79935
79936 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
79937 diff --git a/include/linux/cache.h b/include/linux/cache.h
79938 index 17e7e82..1d7da26 100644
79939 --- a/include/linux/cache.h
79940 +++ b/include/linux/cache.h
79941 @@ -16,6 +16,14 @@
79942 #define __read_mostly
79943 #endif
79944
79945 +#ifndef __read_only
79946 +#ifdef CONFIG_PAX_KERNEXEC
79947 +#error KERNEXEC requires __read_only
79948 +#else
79949 +#define __read_only __read_mostly
79950 +#endif
79951 +#endif
79952 +
79953 #ifndef ____cacheline_aligned
79954 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
79955 #endif
79956 diff --git a/include/linux/capability.h b/include/linux/capability.h
79957 index aa93e5e..985a1b0 100644
79958 --- a/include/linux/capability.h
79959 +++ b/include/linux/capability.h
79960 @@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
79961 extern bool capable(int cap);
79962 extern bool ns_capable(struct user_namespace *ns, int cap);
79963 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
79964 +extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
79965 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
79966 +extern bool capable_nolog(int cap);
79967 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
79968
79969 /* audit system wants to get cap info from files as well */
79970 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
79971
79972 +extern int is_privileged_binary(const struct dentry *dentry);
79973 +
79974 #endif /* !_LINUX_CAPABILITY_H */
79975 diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
79976 index 8609d57..86e4d79 100644
79977 --- a/include/linux/cdrom.h
79978 +++ b/include/linux/cdrom.h
79979 @@ -87,7 +87,6 @@ struct cdrom_device_ops {
79980
79981 /* driver specifications */
79982 const int capability; /* capability flags */
79983 - int n_minors; /* number of active minor devices */
79984 /* handle uniform packets for scsi type devices (scsi,atapi) */
79985 int (*generic_packet) (struct cdrom_device_info *,
79986 struct packet_command *);
79987 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
79988 index 4ce9056..86caac6 100644
79989 --- a/include/linux/cleancache.h
79990 +++ b/include/linux/cleancache.h
79991 @@ -31,7 +31,7 @@ struct cleancache_ops {
79992 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
79993 void (*invalidate_inode)(int, struct cleancache_filekey);
79994 void (*invalidate_fs)(int);
79995 -};
79996 +} __no_const;
79997
79998 extern struct cleancache_ops *
79999 cleancache_register_ops(struct cleancache_ops *ops);
80000 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
80001 index 2839c63..5b06b6b 100644
80002 --- a/include/linux/clk-provider.h
80003 +++ b/include/linux/clk-provider.h
80004 @@ -191,6 +191,7 @@ struct clk_ops {
80005 void (*init)(struct clk_hw *hw);
80006 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
80007 };
80008 +typedef struct clk_ops __no_const clk_ops_no_const;
80009
80010 /**
80011 * struct clk_init_data - holds init data that's common to all clocks and is
80012 diff --git a/include/linux/compat.h b/include/linux/compat.h
80013 index e649426..a74047b 100644
80014 --- a/include/linux/compat.h
80015 +++ b/include/linux/compat.h
80016 @@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
80017 compat_size_t __user *len_ptr);
80018
80019 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
80020 -asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
80021 +asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
80022 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
80023 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
80024 compat_ssize_t msgsz, int msgflg);
80025 @@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
80026 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
80027 compat_ulong_t addr, compat_ulong_t data);
80028 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80029 - compat_long_t addr, compat_long_t data);
80030 + compat_ulong_t addr, compat_ulong_t data);
80031
80032 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
80033 /*
80034 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
80035 index d1a5582..4424efa 100644
80036 --- a/include/linux/compiler-gcc4.h
80037 +++ b/include/linux/compiler-gcc4.h
80038 @@ -39,9 +39,34 @@
80039 # define __compiletime_warning(message) __attribute__((warning(message)))
80040 # define __compiletime_error(message) __attribute__((error(message)))
80041 #endif /* __CHECKER__ */
80042 +
80043 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80044 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80045 +#define __bos0(ptr) __bos((ptr), 0)
80046 +#define __bos1(ptr) __bos((ptr), 1)
80047 #endif /* GCC_VERSION >= 40300 */
80048
80049 #if GCC_VERSION >= 40500
80050 +
80051 +#ifdef RANDSTRUCT_PLUGIN
80052 +#define __randomize_layout __attribute__((randomize_layout))
80053 +#define __no_randomize_layout __attribute__((no_randomize_layout))
80054 +#endif
80055 +
80056 +#ifdef CONSTIFY_PLUGIN
80057 +#define __no_const __attribute__((no_const))
80058 +#define __do_const __attribute__((do_const))
80059 +#endif
80060 +
80061 +#ifdef SIZE_OVERFLOW_PLUGIN
80062 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80063 +#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80064 +#endif
80065 +
80066 +#ifdef LATENT_ENTROPY_PLUGIN
80067 +#define __latent_entropy __attribute__((latent_entropy))
80068 +#endif
80069 +
80070 /*
80071 * Mark a position in code as unreachable. This can be used to
80072 * suppress control flow warnings after asm blocks that transfer
80073 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
80074 index d5ad7b1..3b74638 100644
80075 --- a/include/linux/compiler.h
80076 +++ b/include/linux/compiler.h
80077 @@ -5,11 +5,14 @@
80078
80079 #ifdef __CHECKER__
80080 # define __user __attribute__((noderef, address_space(1)))
80081 +# define __force_user __force __user
80082 # define __kernel __attribute__((address_space(0)))
80083 +# define __force_kernel __force __kernel
80084 # define __safe __attribute__((safe))
80085 # define __force __attribute__((force))
80086 # define __nocast __attribute__((nocast))
80087 # define __iomem __attribute__((noderef, address_space(2)))
80088 +# define __force_iomem __force __iomem
80089 # define __must_hold(x) __attribute__((context(x,1,1)))
80090 # define __acquires(x) __attribute__((context(x,0,1)))
80091 # define __releases(x) __attribute__((context(x,1,0)))
80092 @@ -17,20 +20,37 @@
80093 # define __release(x) __context__(x,-1)
80094 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
80095 # define __percpu __attribute__((noderef, address_space(3)))
80096 +# define __force_percpu __force __percpu
80097 #ifdef CONFIG_SPARSE_RCU_POINTER
80098 # define __rcu __attribute__((noderef, address_space(4)))
80099 +# define __force_rcu __force __rcu
80100 #else
80101 # define __rcu
80102 +# define __force_rcu
80103 #endif
80104 extern void __chk_user_ptr(const volatile void __user *);
80105 extern void __chk_io_ptr(const volatile void __iomem *);
80106 #else
80107 -# define __user
80108 -# define __kernel
80109 +# ifdef CHECKER_PLUGIN
80110 +//# define __user
80111 +//# define __force_user
80112 +//# define __kernel
80113 +//# define __force_kernel
80114 +# else
80115 +# ifdef STRUCTLEAK_PLUGIN
80116 +# define __user __attribute__((user))
80117 +# else
80118 +# define __user
80119 +# endif
80120 +# define __force_user
80121 +# define __kernel
80122 +# define __force_kernel
80123 +# endif
80124 # define __safe
80125 # define __force
80126 # define __nocast
80127 # define __iomem
80128 +# define __force_iomem
80129 # define __chk_user_ptr(x) (void)0
80130 # define __chk_io_ptr(x) (void)0
80131 # define __builtin_warning(x, y...) (1)
80132 @@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80133 # define __release(x) (void)0
80134 # define __cond_lock(x,c) (c)
80135 # define __percpu
80136 +# define __force_percpu
80137 # define __rcu
80138 +# define __force_rcu
80139 #endif
80140
80141 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
80142 @@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80143 # define __attribute_const__ /* unimplemented */
80144 #endif
80145
80146 +#ifndef __randomize_layout
80147 +# define __randomize_layout
80148 +#endif
80149 +
80150 +#ifndef __no_randomize_layout
80151 +# define __no_randomize_layout
80152 +#endif
80153 +
80154 +#ifndef __no_const
80155 +# define __no_const
80156 +#endif
80157 +
80158 +#ifndef __do_const
80159 +# define __do_const
80160 +#endif
80161 +
80162 +#ifndef __size_overflow
80163 +# define __size_overflow(...)
80164 +#endif
80165 +
80166 +#ifndef __intentional_overflow
80167 +# define __intentional_overflow(...)
80168 +#endif
80169 +
80170 +#ifndef __latent_entropy
80171 +# define __latent_entropy
80172 +#endif
80173 +
80174 /*
80175 * Tell gcc if a function is cold. The compiler will assume any path
80176 * directly leading to the call is unlikely.
80177 @@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80178 #define __cold
80179 #endif
80180
80181 +#ifndef __alloc_size
80182 +#define __alloc_size(...)
80183 +#endif
80184 +
80185 +#ifndef __bos
80186 +#define __bos(ptr, arg)
80187 +#endif
80188 +
80189 +#ifndef __bos0
80190 +#define __bos0(ptr)
80191 +#endif
80192 +
80193 +#ifndef __bos1
80194 +#define __bos1(ptr)
80195 +#endif
80196 +
80197 /* Simple shorthand for a section definition */
80198 #ifndef __section
80199 # define __section(S) __attribute__ ((__section__(#S)))
80200 @@ -378,7 +444,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80201 * use is to mediate communication between process-level code and irq/NMI
80202 * handlers, all running on the same CPU.
80203 */
80204 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
80205 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
80206 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
80207
80208 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
80209 #ifdef CONFIG_KPROBES
80210 diff --git a/include/linux/completion.h b/include/linux/completion.h
80211 index 5d5aaae..0ea9b84 100644
80212 --- a/include/linux/completion.h
80213 +++ b/include/linux/completion.h
80214 @@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
80215
80216 extern void wait_for_completion(struct completion *);
80217 extern void wait_for_completion_io(struct completion *);
80218 -extern int wait_for_completion_interruptible(struct completion *x);
80219 -extern int wait_for_completion_killable(struct completion *x);
80220 +extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
80221 +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
80222 extern unsigned long wait_for_completion_timeout(struct completion *x,
80223 - unsigned long timeout);
80224 + unsigned long timeout) __intentional_overflow(-1);
80225 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
80226 - unsigned long timeout);
80227 + unsigned long timeout) __intentional_overflow(-1);
80228 extern long wait_for_completion_interruptible_timeout(
80229 - struct completion *x, unsigned long timeout);
80230 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80231 extern long wait_for_completion_killable_timeout(
80232 - struct completion *x, unsigned long timeout);
80233 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80234 extern bool try_wait_for_completion(struct completion *x);
80235 extern bool completion_done(struct completion *x);
80236
80237 diff --git a/include/linux/configfs.h b/include/linux/configfs.h
80238 index 34025df..d94bbbc 100644
80239 --- a/include/linux/configfs.h
80240 +++ b/include/linux/configfs.h
80241 @@ -125,7 +125,7 @@ struct configfs_attribute {
80242 const char *ca_name;
80243 struct module *ca_owner;
80244 umode_t ca_mode;
80245 -};
80246 +} __do_const;
80247
80248 /*
80249 * Users often need to create attribute structures for their configurable
80250 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
80251 index 503b085b..1638c9e 100644
80252 --- a/include/linux/cpufreq.h
80253 +++ b/include/linux/cpufreq.h
80254 @@ -206,6 +206,7 @@ struct global_attr {
80255 ssize_t (*store)(struct kobject *a, struct attribute *b,
80256 const char *c, size_t count);
80257 };
80258 +typedef struct global_attr __no_const global_attr_no_const;
80259
80260 #define define_one_global_ro(_name) \
80261 static struct global_attr _name = \
80262 @@ -273,7 +274,7 @@ struct cpufreq_driver {
80263 bool boost_supported;
80264 bool boost_enabled;
80265 int (*set_boost) (int state);
80266 -};
80267 +} __do_const;
80268
80269 /* flags */
80270 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
80271 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
80272 index 25e0df6..952dffd 100644
80273 --- a/include/linux/cpuidle.h
80274 +++ b/include/linux/cpuidle.h
80275 @@ -50,7 +50,8 @@ struct cpuidle_state {
80276 int index);
80277
80278 int (*enter_dead) (struct cpuidle_device *dev, int index);
80279 -};
80280 +} __do_const;
80281 +typedef struct cpuidle_state __no_const cpuidle_state_no_const;
80282
80283 /* Idle State Flags */
80284 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
80285 @@ -209,7 +210,7 @@ struct cpuidle_governor {
80286 void (*reflect) (struct cpuidle_device *dev, int index);
80287
80288 struct module *owner;
80289 -};
80290 +} __do_const;
80291
80292 #ifdef CONFIG_CPU_IDLE
80293 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
80294 diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
80295 index 0a9a6da..ea597ca 100644
80296 --- a/include/linux/cpumask.h
80297 +++ b/include/linux/cpumask.h
80298 @@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80299 }
80300
80301 /* Valid inputs for n are -1 and 0. */
80302 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80303 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80304 {
80305 return n+1;
80306 }
80307
80308 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80309 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80310 {
80311 return n+1;
80312 }
80313
80314 -static inline unsigned int cpumask_next_and(int n,
80315 +static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
80316 const struct cpumask *srcp,
80317 const struct cpumask *andp)
80318 {
80319 @@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80320 *
80321 * Returns >= nr_cpu_ids if no further cpus set.
80322 */
80323 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80324 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80325 {
80326 /* -1 is a legal arg here. */
80327 if (n != -1)
80328 @@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80329 *
80330 * Returns >= nr_cpu_ids if no further cpus unset.
80331 */
80332 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80333 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80334 {
80335 /* -1 is a legal arg here. */
80336 if (n != -1)
80337 @@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80338 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
80339 }
80340
80341 -int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
80342 +int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
80343 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
80344 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
80345
80346 diff --git a/include/linux/cred.h b/include/linux/cred.h
80347 index b2d0820..2ecafd3 100644
80348 --- a/include/linux/cred.h
80349 +++ b/include/linux/cred.h
80350 @@ -35,7 +35,7 @@ struct group_info {
80351 int nblocks;
80352 kgid_t small_block[NGROUPS_SMALL];
80353 kgid_t *blocks[0];
80354 -};
80355 +} __randomize_layout;
80356
80357 /**
80358 * get_group_info - Get a reference to a group info structure
80359 @@ -136,7 +136,7 @@ struct cred {
80360 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
80361 struct group_info *group_info; /* supplementary groups for euid/fsgid */
80362 struct rcu_head rcu; /* RCU deletion hook */
80363 -};
80364 +} __randomize_layout;
80365
80366 extern void __put_cred(struct cred *);
80367 extern void exit_creds(struct task_struct *);
80368 @@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
80369 static inline void validate_process_creds(void)
80370 {
80371 }
80372 +static inline void validate_task_creds(struct task_struct *task)
80373 +{
80374 +}
80375 #endif
80376
80377 /**
80378 @@ -331,6 +334,7 @@ static inline void put_cred(const struct cred *_cred)
80379
80380 #define task_uid(task) (task_cred_xxx((task), uid))
80381 #define task_euid(task) (task_cred_xxx((task), euid))
80382 +#define task_securebits(task) (task_cred_xxx((task), securebits))
80383
80384 #define current_cred_xxx(xxx) \
80385 ({ \
80386 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
80387 index d45e949..51cf5ea 100644
80388 --- a/include/linux/crypto.h
80389 +++ b/include/linux/crypto.h
80390 @@ -373,7 +373,7 @@ struct cipher_tfm {
80391 const u8 *key, unsigned int keylen);
80392 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80393 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80394 -};
80395 +} __no_const;
80396
80397 struct hash_tfm {
80398 int (*init)(struct hash_desc *desc);
80399 @@ -394,13 +394,13 @@ struct compress_tfm {
80400 int (*cot_decompress)(struct crypto_tfm *tfm,
80401 const u8 *src, unsigned int slen,
80402 u8 *dst, unsigned int *dlen);
80403 -};
80404 +} __no_const;
80405
80406 struct rng_tfm {
80407 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
80408 unsigned int dlen);
80409 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
80410 -};
80411 +} __no_const;
80412
80413 #define crt_ablkcipher crt_u.ablkcipher
80414 #define crt_aead crt_u.aead
80415 diff --git a/include/linux/ctype.h b/include/linux/ctype.h
80416 index 653589e..4ef254a 100644
80417 --- a/include/linux/ctype.h
80418 +++ b/include/linux/ctype.h
80419 @@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
80420 * Fast implementation of tolower() for internal usage. Do not use in your
80421 * code.
80422 */
80423 -static inline char _tolower(const char c)
80424 +static inline unsigned char _tolower(const unsigned char c)
80425 {
80426 return c | 0x20;
80427 }
80428 diff --git a/include/linux/dcache.h b/include/linux/dcache.h
80429 index 1c2f1b8..c67151e 100644
80430 --- a/include/linux/dcache.h
80431 +++ b/include/linux/dcache.h
80432 @@ -133,7 +133,7 @@ struct dentry {
80433 struct hlist_node d_alias; /* inode alias list */
80434 struct rcu_head d_rcu;
80435 } d_u;
80436 -};
80437 +} __randomize_layout;
80438
80439 /*
80440 * dentry->d_lock spinlock nesting subclasses:
80441 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
80442 index 7925bf0..d5143d2 100644
80443 --- a/include/linux/decompress/mm.h
80444 +++ b/include/linux/decompress/mm.h
80445 @@ -77,7 +77,7 @@ static void free(void *where)
80446 * warnings when not needed (indeed large_malloc / large_free are not
80447 * needed by inflate */
80448
80449 -#define malloc(a) kmalloc(a, GFP_KERNEL)
80450 +#define malloc(a) kmalloc((a), GFP_KERNEL)
80451 #define free(a) kfree(a)
80452
80453 #define large_malloc(a) vmalloc(a)
80454 diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
80455 index f1863dc..5c26074 100644
80456 --- a/include/linux/devfreq.h
80457 +++ b/include/linux/devfreq.h
80458 @@ -114,7 +114,7 @@ struct devfreq_governor {
80459 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
80460 int (*event_handler)(struct devfreq *devfreq,
80461 unsigned int event, void *data);
80462 -};
80463 +} __do_const;
80464
80465 /**
80466 * struct devfreq - Device devfreq structure
80467 diff --git a/include/linux/device.h b/include/linux/device.h
80468 index ce1f2160..189bc33 100644
80469 --- a/include/linux/device.h
80470 +++ b/include/linux/device.h
80471 @@ -311,7 +311,7 @@ struct subsys_interface {
80472 struct list_head node;
80473 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
80474 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
80475 -};
80476 +} __do_const;
80477
80478 int subsys_interface_register(struct subsys_interface *sif);
80479 void subsys_interface_unregister(struct subsys_interface *sif);
80480 @@ -507,7 +507,7 @@ struct device_type {
80481 void (*release)(struct device *dev);
80482
80483 const struct dev_pm_ops *pm;
80484 -};
80485 +} __do_const;
80486
80487 /* interface for exporting device attributes */
80488 struct device_attribute {
80489 @@ -517,11 +517,12 @@ struct device_attribute {
80490 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
80491 const char *buf, size_t count);
80492 };
80493 +typedef struct device_attribute __no_const device_attribute_no_const;
80494
80495 struct dev_ext_attribute {
80496 struct device_attribute attr;
80497 void *var;
80498 -};
80499 +} __do_const;
80500
80501 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
80502 char *buf);
80503 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
80504 index d5d3881..7ed54af 100644
80505 --- a/include/linux/dma-mapping.h
80506 +++ b/include/linux/dma-mapping.h
80507 @@ -60,7 +60,7 @@ struct dma_map_ops {
80508 u64 (*get_required_mask)(struct device *dev);
80509 #endif
80510 int is_phys;
80511 -};
80512 +} __do_const;
80513
80514 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
80515
80516 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
80517 index 653a1fd..9133cd1 100644
80518 --- a/include/linux/dmaengine.h
80519 +++ b/include/linux/dmaengine.h
80520 @@ -1136,9 +1136,9 @@ struct dma_pinned_list {
80521 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
80522 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
80523
80524 -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80525 +dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80526 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
80527 -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80528 +dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80529 struct dma_pinned_list *pinned_list, struct page *page,
80530 unsigned int offset, size_t len);
80531
80532 diff --git a/include/linux/efi.h b/include/linux/efi.h
80533 index 0949f9c..04cb9a5 100644
80534 --- a/include/linux/efi.h
80535 +++ b/include/linux/efi.h
80536 @@ -1050,6 +1050,7 @@ struct efivar_operations {
80537 efi_set_variable_nonblocking_t *set_variable_nonblocking;
80538 efi_query_variable_store_t *query_variable_store;
80539 };
80540 +typedef struct efivar_operations __no_const efivar_operations_no_const;
80541
80542 struct efivars {
80543 /*
80544 diff --git a/include/linux/elf.h b/include/linux/elf.h
80545 index 67a5fa7..b817372 100644
80546 --- a/include/linux/elf.h
80547 +++ b/include/linux/elf.h
80548 @@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
80549 #define elf_note elf32_note
80550 #define elf_addr_t Elf32_Off
80551 #define Elf_Half Elf32_Half
80552 +#define elf_dyn Elf32_Dyn
80553
80554 #else
80555
80556 @@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
80557 #define elf_note elf64_note
80558 #define elf_addr_t Elf64_Off
80559 #define Elf_Half Elf64_Half
80560 +#define elf_dyn Elf64_Dyn
80561
80562 #endif
80563
80564 diff --git a/include/linux/err.h b/include/linux/err.h
80565 index a729120..6ede2c9 100644
80566 --- a/include/linux/err.h
80567 +++ b/include/linux/err.h
80568 @@ -20,12 +20,12 @@
80569
80570 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
80571
80572 -static inline void * __must_check ERR_PTR(long error)
80573 +static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
80574 {
80575 return (void *) error;
80576 }
80577
80578 -static inline long __must_check PTR_ERR(__force const void *ptr)
80579 +static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
80580 {
80581 return (long) ptr;
80582 }
80583 diff --git a/include/linux/extcon.h b/include/linux/extcon.h
80584 index 36f49c4..a2a1f4c 100644
80585 --- a/include/linux/extcon.h
80586 +++ b/include/linux/extcon.h
80587 @@ -135,7 +135,7 @@ struct extcon_dev {
80588 /* /sys/class/extcon/.../mutually_exclusive/... */
80589 struct attribute_group attr_g_muex;
80590 struct attribute **attrs_muex;
80591 - struct device_attribute *d_attrs_muex;
80592 + device_attribute_no_const *d_attrs_muex;
80593 };
80594
80595 /**
80596 diff --git a/include/linux/fb.h b/include/linux/fb.h
80597 index 09bb7a1..d98870a 100644
80598 --- a/include/linux/fb.h
80599 +++ b/include/linux/fb.h
80600 @@ -305,7 +305,7 @@ struct fb_ops {
80601 /* called at KDB enter and leave time to prepare the console */
80602 int (*fb_debug_enter)(struct fb_info *info);
80603 int (*fb_debug_leave)(struct fb_info *info);
80604 -};
80605 +} __do_const;
80606
80607 #ifdef CONFIG_FB_TILEBLITTING
80608 #define FB_TILE_CURSOR_NONE 0
80609 diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
80610 index 230f87b..1fd0485 100644
80611 --- a/include/linux/fdtable.h
80612 +++ b/include/linux/fdtable.h
80613 @@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
80614 void put_files_struct(struct files_struct *fs);
80615 void reset_files_struct(struct files_struct *);
80616 int unshare_files(struct files_struct **);
80617 -struct files_struct *dup_fd(struct files_struct *, int *);
80618 +struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
80619 void do_close_on_exec(struct files_struct *);
80620 int iterate_fd(struct files_struct *, unsigned,
80621 int (*)(const void *, struct file *, unsigned),
80622 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
80623 index 8293262..2b3b8bd 100644
80624 --- a/include/linux/frontswap.h
80625 +++ b/include/linux/frontswap.h
80626 @@ -11,7 +11,7 @@ struct frontswap_ops {
80627 int (*load)(unsigned, pgoff_t, struct page *);
80628 void (*invalidate_page)(unsigned, pgoff_t);
80629 void (*invalidate_area)(unsigned);
80630 -};
80631 +} __no_const;
80632
80633 extern bool frontswap_enabled;
80634 extern struct frontswap_ops *
80635 diff --git a/include/linux/fs.h b/include/linux/fs.h
80636 index 9ab779e..0c636f2 100644
80637 --- a/include/linux/fs.h
80638 +++ b/include/linux/fs.h
80639 @@ -412,7 +412,7 @@ struct address_space {
80640 spinlock_t private_lock; /* for use by the address_space */
80641 struct list_head private_list; /* ditto */
80642 void *private_data; /* ditto */
80643 -} __attribute__((aligned(sizeof(long))));
80644 +} __attribute__((aligned(sizeof(long)))) __randomize_layout;
80645 /*
80646 * On most architectures that alignment is already the case; but
80647 * must be enforced here for CRIS, to let the least significant bit
80648 @@ -455,7 +455,7 @@ struct block_device {
80649 int bd_fsfreeze_count;
80650 /* Mutex for freeze */
80651 struct mutex bd_fsfreeze_mutex;
80652 -};
80653 +} __randomize_layout;
80654
80655 /*
80656 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
80657 @@ -624,7 +624,7 @@ struct inode {
80658 #endif
80659
80660 void *i_private; /* fs or device private pointer */
80661 -};
80662 +} __randomize_layout;
80663
80664 static inline int inode_unhashed(struct inode *inode)
80665 {
80666 @@ -820,7 +820,7 @@ struct file {
80667 struct list_head f_tfile_llink;
80668 #endif /* #ifdef CONFIG_EPOLL */
80669 struct address_space *f_mapping;
80670 -} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
80671 +} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
80672
80673 struct file_handle {
80674 __u32 handle_bytes;
80675 @@ -945,7 +945,7 @@ struct file_lock {
80676 int state; /* state of grant or error if -ve */
80677 } afs;
80678 } fl_u;
80679 -};
80680 +} __randomize_layout;
80681
80682 /* The following constant reflects the upper bound of the file/locking space */
80683 #ifndef OFFSET_MAX
80684 @@ -1287,7 +1287,7 @@ struct super_block {
80685 * Indicates how deep in a filesystem stack this SB is
80686 */
80687 int s_stack_depth;
80688 -};
80689 +} __randomize_layout;
80690
80691 extern struct timespec current_fs_time(struct super_block *sb);
80692
80693 @@ -1514,7 +1514,8 @@ struct file_operations {
80694 long (*fallocate)(struct file *file, int mode, loff_t offset,
80695 loff_t len);
80696 int (*show_fdinfo)(struct seq_file *m, struct file *f);
80697 -};
80698 +} __do_const __randomize_layout;
80699 +typedef struct file_operations __no_const file_operations_no_const;
80700
80701 struct inode_operations {
80702 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
80703 @@ -2823,4 +2824,14 @@ static inline bool dir_relax(struct inode *inode)
80704 return !IS_DEADDIR(inode);
80705 }
80706
80707 +static inline bool is_sidechannel_device(const struct inode *inode)
80708 +{
80709 +#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
80710 + umode_t mode = inode->i_mode;
80711 + return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
80712 +#else
80713 + return false;
80714 +#endif
80715 +}
80716 +
80717 #endif /* _LINUX_FS_H */
80718 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
80719 index 0efc3e6..fd23610 100644
80720 --- a/include/linux/fs_struct.h
80721 +++ b/include/linux/fs_struct.h
80722 @@ -6,13 +6,13 @@
80723 #include <linux/seqlock.h>
80724
80725 struct fs_struct {
80726 - int users;
80727 + atomic_t users;
80728 spinlock_t lock;
80729 seqcount_t seq;
80730 int umask;
80731 int in_exec;
80732 struct path root, pwd;
80733 -};
80734 +} __randomize_layout;
80735
80736 extern struct kmem_cache *fs_cachep;
80737
80738 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
80739 index 7714849..a4a5c7a 100644
80740 --- a/include/linux/fscache-cache.h
80741 +++ b/include/linux/fscache-cache.h
80742 @@ -113,7 +113,7 @@ struct fscache_operation {
80743 fscache_operation_release_t release;
80744 };
80745
80746 -extern atomic_t fscache_op_debug_id;
80747 +extern atomic_unchecked_t fscache_op_debug_id;
80748 extern void fscache_op_work_func(struct work_struct *work);
80749
80750 extern void fscache_enqueue_operation(struct fscache_operation *);
80751 @@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
80752 INIT_WORK(&op->work, fscache_op_work_func);
80753 atomic_set(&op->usage, 1);
80754 op->state = FSCACHE_OP_ST_INITIALISED;
80755 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
80756 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
80757 op->processor = processor;
80758 op->release = release;
80759 INIT_LIST_HEAD(&op->pend_link);
80760 diff --git a/include/linux/fscache.h b/include/linux/fscache.h
80761 index 115bb81..e7b812b 100644
80762 --- a/include/linux/fscache.h
80763 +++ b/include/linux/fscache.h
80764 @@ -152,7 +152,7 @@ struct fscache_cookie_def {
80765 * - this is mandatory for any object that may have data
80766 */
80767 void (*now_uncached)(void *cookie_netfs_data);
80768 -};
80769 +} __do_const;
80770
80771 /*
80772 * fscache cached network filesystem type
80773 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
80774 index 1c804b0..1432c2b 100644
80775 --- a/include/linux/fsnotify.h
80776 +++ b/include/linux/fsnotify.h
80777 @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
80778 struct inode *inode = file_inode(file);
80779 __u32 mask = FS_ACCESS;
80780
80781 + if (is_sidechannel_device(inode))
80782 + return;
80783 +
80784 if (S_ISDIR(inode->i_mode))
80785 mask |= FS_ISDIR;
80786
80787 @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
80788 struct inode *inode = file_inode(file);
80789 __u32 mask = FS_MODIFY;
80790
80791 + if (is_sidechannel_device(inode))
80792 + return;
80793 +
80794 if (S_ISDIR(inode->i_mode))
80795 mask |= FS_ISDIR;
80796
80797 @@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
80798 */
80799 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
80800 {
80801 - return kstrdup(name, GFP_KERNEL);
80802 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
80803 }
80804
80805 /*
80806 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
80807 index ec274e0..e678159 100644
80808 --- a/include/linux/genhd.h
80809 +++ b/include/linux/genhd.h
80810 @@ -194,7 +194,7 @@ struct gendisk {
80811 struct kobject *slave_dir;
80812
80813 struct timer_rand_state *random;
80814 - atomic_t sync_io; /* RAID */
80815 + atomic_unchecked_t sync_io; /* RAID */
80816 struct disk_events *ev;
80817 #ifdef CONFIG_BLK_DEV_INTEGRITY
80818 struct blk_integrity *integrity;
80819 @@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
80820 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
80821
80822 /* drivers/char/random.c */
80823 -extern void add_disk_randomness(struct gendisk *disk);
80824 +extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
80825 extern void rand_initialize_disk(struct gendisk *disk);
80826
80827 static inline sector_t get_start_sect(struct block_device *bdev)
80828 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
80829 index 667c311..abac2a7 100644
80830 --- a/include/linux/genl_magic_func.h
80831 +++ b/include/linux/genl_magic_func.h
80832 @@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
80833 },
80834
80835 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
80836 -static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
80837 +static struct genl_ops ZZZ_genl_ops[] = {
80838 #include GENL_MAGIC_INCLUDE_FILE
80839 };
80840
80841 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
80842 index 41b30fd..a3718cf 100644
80843 --- a/include/linux/gfp.h
80844 +++ b/include/linux/gfp.h
80845 @@ -34,6 +34,13 @@ struct vm_area_struct;
80846 #define ___GFP_NO_KSWAPD 0x400000u
80847 #define ___GFP_OTHER_NODE 0x800000u
80848 #define ___GFP_WRITE 0x1000000u
80849 +
80850 +#ifdef CONFIG_PAX_USERCOPY_SLABS
80851 +#define ___GFP_USERCOPY 0x2000000u
80852 +#else
80853 +#define ___GFP_USERCOPY 0
80854 +#endif
80855 +
80856 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
80857
80858 /*
80859 @@ -90,6 +97,7 @@ struct vm_area_struct;
80860 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
80861 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
80862 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
80863 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
80864
80865 /*
80866 * This may seem redundant, but it's a way of annotating false positives vs.
80867 @@ -97,7 +105,7 @@ struct vm_area_struct;
80868 */
80869 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
80870
80871 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
80872 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
80873 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
80874
80875 /* This equals 0, but use constants in case they ever change */
80876 @@ -155,6 +163,8 @@ struct vm_area_struct;
80877 /* 4GB DMA on some platforms */
80878 #define GFP_DMA32 __GFP_DMA32
80879
80880 +#define GFP_USERCOPY __GFP_USERCOPY
80881 +
80882 /* Convert GFP flags to their corresponding migrate type */
80883 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
80884 {
80885 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
80886 new file mode 100644
80887 index 0000000..edb2cb6
80888 --- /dev/null
80889 +++ b/include/linux/gracl.h
80890 @@ -0,0 +1,340 @@
80891 +#ifndef GR_ACL_H
80892 +#define GR_ACL_H
80893 +
80894 +#include <linux/grdefs.h>
80895 +#include <linux/resource.h>
80896 +#include <linux/capability.h>
80897 +#include <linux/dcache.h>
80898 +#include <asm/resource.h>
80899 +
80900 +/* Major status information */
80901 +
80902 +#define GR_VERSION "grsecurity 3.0"
80903 +#define GRSECURITY_VERSION 0x3000
80904 +
80905 +enum {
80906 + GR_SHUTDOWN = 0,
80907 + GR_ENABLE = 1,
80908 + GR_SPROLE = 2,
80909 + GR_OLDRELOAD = 3,
80910 + GR_SEGVMOD = 4,
80911 + GR_STATUS = 5,
80912 + GR_UNSPROLE = 6,
80913 + GR_PASSSET = 7,
80914 + GR_SPROLEPAM = 8,
80915 + GR_RELOAD = 9,
80916 +};
80917 +
80918 +/* Password setup definitions
80919 + * kernel/grhash.c */
80920 +enum {
80921 + GR_PW_LEN = 128,
80922 + GR_SALT_LEN = 16,
80923 + GR_SHA_LEN = 32,
80924 +};
80925 +
80926 +enum {
80927 + GR_SPROLE_LEN = 64,
80928 +};
80929 +
80930 +enum {
80931 + GR_NO_GLOB = 0,
80932 + GR_REG_GLOB,
80933 + GR_CREATE_GLOB
80934 +};
80935 +
80936 +#define GR_NLIMITS 32
80937 +
80938 +/* Begin Data Structures */
80939 +
80940 +struct sprole_pw {
80941 + unsigned char *rolename;
80942 + unsigned char salt[GR_SALT_LEN];
80943 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
80944 +};
80945 +
80946 +struct name_entry {
80947 + __u32 key;
80948 + ino_t inode;
80949 + dev_t device;
80950 + char *name;
80951 + __u16 len;
80952 + __u8 deleted;
80953 + struct name_entry *prev;
80954 + struct name_entry *next;
80955 +};
80956 +
80957 +struct inodev_entry {
80958 + struct name_entry *nentry;
80959 + struct inodev_entry *prev;
80960 + struct inodev_entry *next;
80961 +};
80962 +
80963 +struct acl_role_db {
80964 + struct acl_role_label **r_hash;
80965 + __u32 r_size;
80966 +};
80967 +
80968 +struct inodev_db {
80969 + struct inodev_entry **i_hash;
80970 + __u32 i_size;
80971 +};
80972 +
80973 +struct name_db {
80974 + struct name_entry **n_hash;
80975 + __u32 n_size;
80976 +};
80977 +
80978 +struct crash_uid {
80979 + uid_t uid;
80980 + unsigned long expires;
80981 +};
80982 +
80983 +struct gr_hash_struct {
80984 + void **table;
80985 + void **nametable;
80986 + void *first;
80987 + __u32 table_size;
80988 + __u32 used_size;
80989 + int type;
80990 +};
80991 +
80992 +/* Userspace Grsecurity ACL data structures */
80993 +
80994 +struct acl_subject_label {
80995 + char *filename;
80996 + ino_t inode;
80997 + dev_t device;
80998 + __u32 mode;
80999 + kernel_cap_t cap_mask;
81000 + kernel_cap_t cap_lower;
81001 + kernel_cap_t cap_invert_audit;
81002 +
81003 + struct rlimit res[GR_NLIMITS];
81004 + __u32 resmask;
81005 +
81006 + __u8 user_trans_type;
81007 + __u8 group_trans_type;
81008 + uid_t *user_transitions;
81009 + gid_t *group_transitions;
81010 + __u16 user_trans_num;
81011 + __u16 group_trans_num;
81012 +
81013 + __u32 sock_families[2];
81014 + __u32 ip_proto[8];
81015 + __u32 ip_type;
81016 + struct acl_ip_label **ips;
81017 + __u32 ip_num;
81018 + __u32 inaddr_any_override;
81019 +
81020 + __u32 crashes;
81021 + unsigned long expires;
81022 +
81023 + struct acl_subject_label *parent_subject;
81024 + struct gr_hash_struct *hash;
81025 + struct acl_subject_label *prev;
81026 + struct acl_subject_label *next;
81027 +
81028 + struct acl_object_label **obj_hash;
81029 + __u32 obj_hash_size;
81030 + __u16 pax_flags;
81031 +};
81032 +
81033 +struct role_allowed_ip {
81034 + __u32 addr;
81035 + __u32 netmask;
81036 +
81037 + struct role_allowed_ip *prev;
81038 + struct role_allowed_ip *next;
81039 +};
81040 +
81041 +struct role_transition {
81042 + char *rolename;
81043 +
81044 + struct role_transition *prev;
81045 + struct role_transition *next;
81046 +};
81047 +
81048 +struct acl_role_label {
81049 + char *rolename;
81050 + uid_t uidgid;
81051 + __u16 roletype;
81052 +
81053 + __u16 auth_attempts;
81054 + unsigned long expires;
81055 +
81056 + struct acl_subject_label *root_label;
81057 + struct gr_hash_struct *hash;
81058 +
81059 + struct acl_role_label *prev;
81060 + struct acl_role_label *next;
81061 +
81062 + struct role_transition *transitions;
81063 + struct role_allowed_ip *allowed_ips;
81064 + uid_t *domain_children;
81065 + __u16 domain_child_num;
81066 +
81067 + umode_t umask;
81068 +
81069 + struct acl_subject_label **subj_hash;
81070 + __u32 subj_hash_size;
81071 +};
81072 +
81073 +struct user_acl_role_db {
81074 + struct acl_role_label **r_table;
81075 + __u32 num_pointers; /* Number of allocations to track */
81076 + __u32 num_roles; /* Number of roles */
81077 + __u32 num_domain_children; /* Number of domain children */
81078 + __u32 num_subjects; /* Number of subjects */
81079 + __u32 num_objects; /* Number of objects */
81080 +};
81081 +
81082 +struct acl_object_label {
81083 + char *filename;
81084 + ino_t inode;
81085 + dev_t device;
81086 + __u32 mode;
81087 +
81088 + struct acl_subject_label *nested;
81089 + struct acl_object_label *globbed;
81090 +
81091 + /* next two structures not used */
81092 +
81093 + struct acl_object_label *prev;
81094 + struct acl_object_label *next;
81095 +};
81096 +
81097 +struct acl_ip_label {
81098 + char *iface;
81099 + __u32 addr;
81100 + __u32 netmask;
81101 + __u16 low, high;
81102 + __u8 mode;
81103 + __u32 type;
81104 + __u32 proto[8];
81105 +
81106 + /* next two structures not used */
81107 +
81108 + struct acl_ip_label *prev;
81109 + struct acl_ip_label *next;
81110 +};
81111 +
81112 +struct gr_arg {
81113 + struct user_acl_role_db role_db;
81114 + unsigned char pw[GR_PW_LEN];
81115 + unsigned char salt[GR_SALT_LEN];
81116 + unsigned char sum[GR_SHA_LEN];
81117 + unsigned char sp_role[GR_SPROLE_LEN];
81118 + struct sprole_pw *sprole_pws;
81119 + dev_t segv_device;
81120 + ino_t segv_inode;
81121 + uid_t segv_uid;
81122 + __u16 num_sprole_pws;
81123 + __u16 mode;
81124 +};
81125 +
81126 +struct gr_arg_wrapper {
81127 + struct gr_arg *arg;
81128 + __u32 version;
81129 + __u32 size;
81130 +};
81131 +
81132 +struct subject_map {
81133 + struct acl_subject_label *user;
81134 + struct acl_subject_label *kernel;
81135 + struct subject_map *prev;
81136 + struct subject_map *next;
81137 +};
81138 +
81139 +struct acl_subj_map_db {
81140 + struct subject_map **s_hash;
81141 + __u32 s_size;
81142 +};
81143 +
81144 +struct gr_policy_state {
81145 + struct sprole_pw **acl_special_roles;
81146 + __u16 num_sprole_pws;
81147 + struct acl_role_label *kernel_role;
81148 + struct acl_role_label *role_list;
81149 + struct acl_role_label *default_role;
81150 + struct acl_role_db acl_role_set;
81151 + struct acl_subj_map_db subj_map_set;
81152 + struct name_db name_set;
81153 + struct inodev_db inodev_set;
81154 +};
81155 +
81156 +struct gr_alloc_state {
81157 + unsigned long alloc_stack_next;
81158 + unsigned long alloc_stack_size;
81159 + void **alloc_stack;
81160 +};
81161 +
81162 +struct gr_reload_state {
81163 + struct gr_policy_state oldpolicy;
81164 + struct gr_alloc_state oldalloc;
81165 + struct gr_policy_state newpolicy;
81166 + struct gr_alloc_state newalloc;
81167 + struct gr_policy_state *oldpolicy_ptr;
81168 + struct gr_alloc_state *oldalloc_ptr;
81169 + unsigned char oldmode;
81170 +};
81171 +
81172 +/* End Data Structures Section */
81173 +
81174 +/* Hash functions generated by empirical testing by Brad Spengler
81175 + Makes good use of the low bits of the inode. Generally 0-1 times
81176 + in loop for successful match. 0-3 for unsuccessful match.
81177 + Shift/add algorithm with modulus of table size and an XOR*/
81178 +
81179 +static __inline__ unsigned int
81180 +gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
81181 +{
81182 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
81183 +}
81184 +
81185 + static __inline__ unsigned int
81186 +gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
81187 +{
81188 + return ((const unsigned long)userp % sz);
81189 +}
81190 +
81191 +static __inline__ unsigned int
81192 +gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
81193 +{
81194 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
81195 +}
81196 +
81197 +static __inline__ unsigned int
81198 +gr_nhash(const char *name, const __u16 len, const unsigned int sz)
81199 +{
81200 + return full_name_hash((const unsigned char *)name, len) % sz;
81201 +}
81202 +
81203 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
81204 + subj = NULL; \
81205 + iter = 0; \
81206 + while (iter < role->subj_hash_size) { \
81207 + if (subj == NULL) \
81208 + subj = role->subj_hash[iter]; \
81209 + if (subj == NULL) { \
81210 + iter++; \
81211 + continue; \
81212 + }
81213 +
81214 +#define FOR_EACH_SUBJECT_END(subj,iter) \
81215 + subj = subj->next; \
81216 + if (subj == NULL) \
81217 + iter++; \
81218 + }
81219 +
81220 +
81221 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
81222 + subj = role->hash->first; \
81223 + while (subj != NULL) {
81224 +
81225 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
81226 + subj = subj->next; \
81227 + }
81228 +
81229 +#endif
81230 +
81231 diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
81232 new file mode 100644
81233 index 0000000..33ebd1f
81234 --- /dev/null
81235 +++ b/include/linux/gracl_compat.h
81236 @@ -0,0 +1,156 @@
81237 +#ifndef GR_ACL_COMPAT_H
81238 +#define GR_ACL_COMPAT_H
81239 +
81240 +#include <linux/resource.h>
81241 +#include <asm/resource.h>
81242 +
81243 +struct sprole_pw_compat {
81244 + compat_uptr_t rolename;
81245 + unsigned char salt[GR_SALT_LEN];
81246 + unsigned char sum[GR_SHA_LEN];
81247 +};
81248 +
81249 +struct gr_hash_struct_compat {
81250 + compat_uptr_t table;
81251 + compat_uptr_t nametable;
81252 + compat_uptr_t first;
81253 + __u32 table_size;
81254 + __u32 used_size;
81255 + int type;
81256 +};
81257 +
81258 +struct acl_subject_label_compat {
81259 + compat_uptr_t filename;
81260 + compat_ino_t inode;
81261 + __u32 device;
81262 + __u32 mode;
81263 + kernel_cap_t cap_mask;
81264 + kernel_cap_t cap_lower;
81265 + kernel_cap_t cap_invert_audit;
81266 +
81267 + struct compat_rlimit res[GR_NLIMITS];
81268 + __u32 resmask;
81269 +
81270 + __u8 user_trans_type;
81271 + __u8 group_trans_type;
81272 + compat_uptr_t user_transitions;
81273 + compat_uptr_t group_transitions;
81274 + __u16 user_trans_num;
81275 + __u16 group_trans_num;
81276 +
81277 + __u32 sock_families[2];
81278 + __u32 ip_proto[8];
81279 + __u32 ip_type;
81280 + compat_uptr_t ips;
81281 + __u32 ip_num;
81282 + __u32 inaddr_any_override;
81283 +
81284 + __u32 crashes;
81285 + compat_ulong_t expires;
81286 +
81287 + compat_uptr_t parent_subject;
81288 + compat_uptr_t hash;
81289 + compat_uptr_t prev;
81290 + compat_uptr_t next;
81291 +
81292 + compat_uptr_t obj_hash;
81293 + __u32 obj_hash_size;
81294 + __u16 pax_flags;
81295 +};
81296 +
81297 +struct role_allowed_ip_compat {
81298 + __u32 addr;
81299 + __u32 netmask;
81300 +
81301 + compat_uptr_t prev;
81302 + compat_uptr_t next;
81303 +};
81304 +
81305 +struct role_transition_compat {
81306 + compat_uptr_t rolename;
81307 +
81308 + compat_uptr_t prev;
81309 + compat_uptr_t next;
81310 +};
81311 +
81312 +struct acl_role_label_compat {
81313 + compat_uptr_t rolename;
81314 + uid_t uidgid;
81315 + __u16 roletype;
81316 +
81317 + __u16 auth_attempts;
81318 + compat_ulong_t expires;
81319 +
81320 + compat_uptr_t root_label;
81321 + compat_uptr_t hash;
81322 +
81323 + compat_uptr_t prev;
81324 + compat_uptr_t next;
81325 +
81326 + compat_uptr_t transitions;
81327 + compat_uptr_t allowed_ips;
81328 + compat_uptr_t domain_children;
81329 + __u16 domain_child_num;
81330 +
81331 + umode_t umask;
81332 +
81333 + compat_uptr_t subj_hash;
81334 + __u32 subj_hash_size;
81335 +};
81336 +
81337 +struct user_acl_role_db_compat {
81338 + compat_uptr_t r_table;
81339 + __u32 num_pointers;
81340 + __u32 num_roles;
81341 + __u32 num_domain_children;
81342 + __u32 num_subjects;
81343 + __u32 num_objects;
81344 +};
81345 +
81346 +struct acl_object_label_compat {
81347 + compat_uptr_t filename;
81348 + compat_ino_t inode;
81349 + __u32 device;
81350 + __u32 mode;
81351 +
81352 + compat_uptr_t nested;
81353 + compat_uptr_t globbed;
81354 +
81355 + compat_uptr_t prev;
81356 + compat_uptr_t next;
81357 +};
81358 +
81359 +struct acl_ip_label_compat {
81360 + compat_uptr_t iface;
81361 + __u32 addr;
81362 + __u32 netmask;
81363 + __u16 low, high;
81364 + __u8 mode;
81365 + __u32 type;
81366 + __u32 proto[8];
81367 +
81368 + compat_uptr_t prev;
81369 + compat_uptr_t next;
81370 +};
81371 +
81372 +struct gr_arg_compat {
81373 + struct user_acl_role_db_compat role_db;
81374 + unsigned char pw[GR_PW_LEN];
81375 + unsigned char salt[GR_SALT_LEN];
81376 + unsigned char sum[GR_SHA_LEN];
81377 + unsigned char sp_role[GR_SPROLE_LEN];
81378 + compat_uptr_t sprole_pws;
81379 + __u32 segv_device;
81380 + compat_ino_t segv_inode;
81381 + uid_t segv_uid;
81382 + __u16 num_sprole_pws;
81383 + __u16 mode;
81384 +};
81385 +
81386 +struct gr_arg_wrapper_compat {
81387 + compat_uptr_t arg;
81388 + __u32 version;
81389 + __u32 size;
81390 +};
81391 +
81392 +#endif
81393 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
81394 new file mode 100644
81395 index 0000000..323ecf2
81396 --- /dev/null
81397 +++ b/include/linux/gralloc.h
81398 @@ -0,0 +1,9 @@
81399 +#ifndef __GRALLOC_H
81400 +#define __GRALLOC_H
81401 +
81402 +void acl_free_all(void);
81403 +int acl_alloc_stack_init(unsigned long size);
81404 +void *acl_alloc(unsigned long len);
81405 +void *acl_alloc_num(unsigned long num, unsigned long len);
81406 +
81407 +#endif
81408 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
81409 new file mode 100644
81410 index 0000000..be66033
81411 --- /dev/null
81412 +++ b/include/linux/grdefs.h
81413 @@ -0,0 +1,140 @@
81414 +#ifndef GRDEFS_H
81415 +#define GRDEFS_H
81416 +
81417 +/* Begin grsecurity status declarations */
81418 +
81419 +enum {
81420 + GR_READY = 0x01,
81421 + GR_STATUS_INIT = 0x00 // disabled state
81422 +};
81423 +
81424 +/* Begin ACL declarations */
81425 +
81426 +/* Role flags */
81427 +
81428 +enum {
81429 + GR_ROLE_USER = 0x0001,
81430 + GR_ROLE_GROUP = 0x0002,
81431 + GR_ROLE_DEFAULT = 0x0004,
81432 + GR_ROLE_SPECIAL = 0x0008,
81433 + GR_ROLE_AUTH = 0x0010,
81434 + GR_ROLE_NOPW = 0x0020,
81435 + GR_ROLE_GOD = 0x0040,
81436 + GR_ROLE_LEARN = 0x0080,
81437 + GR_ROLE_TPE = 0x0100,
81438 + GR_ROLE_DOMAIN = 0x0200,
81439 + GR_ROLE_PAM = 0x0400,
81440 + GR_ROLE_PERSIST = 0x0800
81441 +};
81442 +
81443 +/* ACL Subject and Object mode flags */
81444 +enum {
81445 + GR_DELETED = 0x80000000
81446 +};
81447 +
81448 +/* ACL Object-only mode flags */
81449 +enum {
81450 + GR_READ = 0x00000001,
81451 + GR_APPEND = 0x00000002,
81452 + GR_WRITE = 0x00000004,
81453 + GR_EXEC = 0x00000008,
81454 + GR_FIND = 0x00000010,
81455 + GR_INHERIT = 0x00000020,
81456 + GR_SETID = 0x00000040,
81457 + GR_CREATE = 0x00000080,
81458 + GR_DELETE = 0x00000100,
81459 + GR_LINK = 0x00000200,
81460 + GR_AUDIT_READ = 0x00000400,
81461 + GR_AUDIT_APPEND = 0x00000800,
81462 + GR_AUDIT_WRITE = 0x00001000,
81463 + GR_AUDIT_EXEC = 0x00002000,
81464 + GR_AUDIT_FIND = 0x00004000,
81465 + GR_AUDIT_INHERIT= 0x00008000,
81466 + GR_AUDIT_SETID = 0x00010000,
81467 + GR_AUDIT_CREATE = 0x00020000,
81468 + GR_AUDIT_DELETE = 0x00040000,
81469 + GR_AUDIT_LINK = 0x00080000,
81470 + GR_PTRACERD = 0x00100000,
81471 + GR_NOPTRACE = 0x00200000,
81472 + GR_SUPPRESS = 0x00400000,
81473 + GR_NOLEARN = 0x00800000,
81474 + GR_INIT_TRANSFER= 0x01000000
81475 +};
81476 +
81477 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
81478 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
81479 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
81480 +
81481 +/* ACL subject-only mode flags */
81482 +enum {
81483 + GR_KILL = 0x00000001,
81484 + GR_VIEW = 0x00000002,
81485 + GR_PROTECTED = 0x00000004,
81486 + GR_LEARN = 0x00000008,
81487 + GR_OVERRIDE = 0x00000010,
81488 + /* just a placeholder, this mode is only used in userspace */
81489 + GR_DUMMY = 0x00000020,
81490 + GR_PROTSHM = 0x00000040,
81491 + GR_KILLPROC = 0x00000080,
81492 + GR_KILLIPPROC = 0x00000100,
81493 + /* just a placeholder, this mode is only used in userspace */
81494 + GR_NOTROJAN = 0x00000200,
81495 + GR_PROTPROCFD = 0x00000400,
81496 + GR_PROCACCT = 0x00000800,
81497 + GR_RELAXPTRACE = 0x00001000,
81498 + //GR_NESTED = 0x00002000,
81499 + GR_INHERITLEARN = 0x00004000,
81500 + GR_PROCFIND = 0x00008000,
81501 + GR_POVERRIDE = 0x00010000,
81502 + GR_KERNELAUTH = 0x00020000,
81503 + GR_ATSECURE = 0x00040000,
81504 + GR_SHMEXEC = 0x00080000
81505 +};
81506 +
81507 +enum {
81508 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
81509 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
81510 + GR_PAX_ENABLE_MPROTECT = 0x0004,
81511 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
81512 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
81513 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
81514 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
81515 + GR_PAX_DISABLE_MPROTECT = 0x0400,
81516 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
81517 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
81518 +};
81519 +
81520 +enum {
81521 + GR_ID_USER = 0x01,
81522 + GR_ID_GROUP = 0x02,
81523 +};
81524 +
81525 +enum {
81526 + GR_ID_ALLOW = 0x01,
81527 + GR_ID_DENY = 0x02,
81528 +};
81529 +
81530 +#define GR_CRASH_RES 31
81531 +#define GR_UIDTABLE_MAX 500
81532 +
81533 +/* begin resource learning section */
81534 +enum {
81535 + GR_RLIM_CPU_BUMP = 60,
81536 + GR_RLIM_FSIZE_BUMP = 50000,
81537 + GR_RLIM_DATA_BUMP = 10000,
81538 + GR_RLIM_STACK_BUMP = 1000,
81539 + GR_RLIM_CORE_BUMP = 10000,
81540 + GR_RLIM_RSS_BUMP = 500000,
81541 + GR_RLIM_NPROC_BUMP = 1,
81542 + GR_RLIM_NOFILE_BUMP = 5,
81543 + GR_RLIM_MEMLOCK_BUMP = 50000,
81544 + GR_RLIM_AS_BUMP = 500000,
81545 + GR_RLIM_LOCKS_BUMP = 2,
81546 + GR_RLIM_SIGPENDING_BUMP = 5,
81547 + GR_RLIM_MSGQUEUE_BUMP = 10000,
81548 + GR_RLIM_NICE_BUMP = 1,
81549 + GR_RLIM_RTPRIO_BUMP = 1,
81550 + GR_RLIM_RTTIME_BUMP = 1000000
81551 +};
81552 +
81553 +#endif
81554 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
81555 new file mode 100644
81556 index 0000000..d25522e
81557 --- /dev/null
81558 +++ b/include/linux/grinternal.h
81559 @@ -0,0 +1,229 @@
81560 +#ifndef __GRINTERNAL_H
81561 +#define __GRINTERNAL_H
81562 +
81563 +#ifdef CONFIG_GRKERNSEC
81564 +
81565 +#include <linux/fs.h>
81566 +#include <linux/mnt_namespace.h>
81567 +#include <linux/nsproxy.h>
81568 +#include <linux/gracl.h>
81569 +#include <linux/grdefs.h>
81570 +#include <linux/grmsg.h>
81571 +
81572 +void gr_add_learn_entry(const char *fmt, ...)
81573 + __attribute__ ((format (printf, 1, 2)));
81574 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
81575 + const struct vfsmount *mnt);
81576 +__u32 gr_check_create(const struct dentry *new_dentry,
81577 + const struct dentry *parent,
81578 + const struct vfsmount *mnt, const __u32 mode);
81579 +int gr_check_protected_task(const struct task_struct *task);
81580 +__u32 to_gr_audit(const __u32 reqmode);
81581 +int gr_set_acls(const int type);
81582 +int gr_acl_is_enabled(void);
81583 +char gr_roletype_to_char(void);
81584 +
81585 +void gr_handle_alertkill(struct task_struct *task);
81586 +char *gr_to_filename(const struct dentry *dentry,
81587 + const struct vfsmount *mnt);
81588 +char *gr_to_filename1(const struct dentry *dentry,
81589 + const struct vfsmount *mnt);
81590 +char *gr_to_filename2(const struct dentry *dentry,
81591 + const struct vfsmount *mnt);
81592 +char *gr_to_filename3(const struct dentry *dentry,
81593 + const struct vfsmount *mnt);
81594 +
81595 +extern int grsec_enable_ptrace_readexec;
81596 +extern int grsec_enable_harden_ptrace;
81597 +extern int grsec_enable_link;
81598 +extern int grsec_enable_fifo;
81599 +extern int grsec_enable_execve;
81600 +extern int grsec_enable_shm;
81601 +extern int grsec_enable_execlog;
81602 +extern int grsec_enable_signal;
81603 +extern int grsec_enable_audit_ptrace;
81604 +extern int grsec_enable_forkfail;
81605 +extern int grsec_enable_time;
81606 +extern int grsec_enable_rofs;
81607 +extern int grsec_deny_new_usb;
81608 +extern int grsec_enable_chroot_shmat;
81609 +extern int grsec_enable_chroot_mount;
81610 +extern int grsec_enable_chroot_double;
81611 +extern int grsec_enable_chroot_pivot;
81612 +extern int grsec_enable_chroot_chdir;
81613 +extern int grsec_enable_chroot_chmod;
81614 +extern int grsec_enable_chroot_mknod;
81615 +extern int grsec_enable_chroot_fchdir;
81616 +extern int grsec_enable_chroot_nice;
81617 +extern int grsec_enable_chroot_execlog;
81618 +extern int grsec_enable_chroot_caps;
81619 +extern int grsec_enable_chroot_sysctl;
81620 +extern int grsec_enable_chroot_unix;
81621 +extern int grsec_enable_symlinkown;
81622 +extern kgid_t grsec_symlinkown_gid;
81623 +extern int grsec_enable_tpe;
81624 +extern kgid_t grsec_tpe_gid;
81625 +extern int grsec_enable_tpe_all;
81626 +extern int grsec_enable_tpe_invert;
81627 +extern int grsec_enable_socket_all;
81628 +extern kgid_t grsec_socket_all_gid;
81629 +extern int grsec_enable_socket_client;
81630 +extern kgid_t grsec_socket_client_gid;
81631 +extern int grsec_enable_socket_server;
81632 +extern kgid_t grsec_socket_server_gid;
81633 +extern kgid_t grsec_audit_gid;
81634 +extern int grsec_enable_group;
81635 +extern int grsec_enable_log_rwxmaps;
81636 +extern int grsec_enable_mount;
81637 +extern int grsec_enable_chdir;
81638 +extern int grsec_resource_logging;
81639 +extern int grsec_enable_blackhole;
81640 +extern int grsec_lastack_retries;
81641 +extern int grsec_enable_brute;
81642 +extern int grsec_enable_harden_ipc;
81643 +extern int grsec_lock;
81644 +
81645 +extern spinlock_t grsec_alert_lock;
81646 +extern unsigned long grsec_alert_wtime;
81647 +extern unsigned long grsec_alert_fyet;
81648 +
81649 +extern spinlock_t grsec_audit_lock;
81650 +
81651 +extern rwlock_t grsec_exec_file_lock;
81652 +
81653 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
81654 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
81655 + (tsk)->exec_file->f_path.mnt) : "/")
81656 +
81657 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
81658 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
81659 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81660 +
81661 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
81662 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
81663 + (tsk)->exec_file->f_path.mnt) : "/")
81664 +
81665 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
81666 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
81667 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81668 +
81669 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
81670 +
81671 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
81672 +
81673 +static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
81674 +{
81675 + if (file1 && file2) {
81676 + const struct inode *inode1 = file1->f_path.dentry->d_inode;
81677 + const struct inode *inode2 = file2->f_path.dentry->d_inode;
81678 + if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
81679 + return true;
81680 + }
81681 +
81682 + return false;
81683 +}
81684 +
81685 +#define GR_CHROOT_CAPS {{ \
81686 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
81687 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
81688 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
81689 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
81690 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
81691 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
81692 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
81693 +
81694 +#define security_learn(normal_msg,args...) \
81695 +({ \
81696 + read_lock(&grsec_exec_file_lock); \
81697 + gr_add_learn_entry(normal_msg "\n", ## args); \
81698 + read_unlock(&grsec_exec_file_lock); \
81699 +})
81700 +
81701 +enum {
81702 + GR_DO_AUDIT,
81703 + GR_DONT_AUDIT,
81704 + /* used for non-audit messages that we shouldn't kill the task on */
81705 + GR_DONT_AUDIT_GOOD
81706 +};
81707 +
81708 +enum {
81709 + GR_TTYSNIFF,
81710 + GR_RBAC,
81711 + GR_RBAC_STR,
81712 + GR_STR_RBAC,
81713 + GR_RBAC_MODE2,
81714 + GR_RBAC_MODE3,
81715 + GR_FILENAME,
81716 + GR_SYSCTL_HIDDEN,
81717 + GR_NOARGS,
81718 + GR_ONE_INT,
81719 + GR_ONE_INT_TWO_STR,
81720 + GR_ONE_STR,
81721 + GR_STR_INT,
81722 + GR_TWO_STR_INT,
81723 + GR_TWO_INT,
81724 + GR_TWO_U64,
81725 + GR_THREE_INT,
81726 + GR_FIVE_INT_TWO_STR,
81727 + GR_TWO_STR,
81728 + GR_THREE_STR,
81729 + GR_FOUR_STR,
81730 + GR_STR_FILENAME,
81731 + GR_FILENAME_STR,
81732 + GR_FILENAME_TWO_INT,
81733 + GR_FILENAME_TWO_INT_STR,
81734 + GR_TEXTREL,
81735 + GR_PTRACE,
81736 + GR_RESOURCE,
81737 + GR_CAP,
81738 + GR_SIG,
81739 + GR_SIG2,
81740 + GR_CRASH1,
81741 + GR_CRASH2,
81742 + GR_PSACCT,
81743 + GR_RWXMAP,
81744 + GR_RWXMAPVMA
81745 +};
81746 +
81747 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
81748 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
81749 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
81750 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
81751 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
81752 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
81753 +#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)
81754 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
81755 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
81756 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
81757 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
81758 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
81759 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
81760 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
81761 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
81762 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
81763 +#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)
81764 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
81765 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
81766 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
81767 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
81768 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
81769 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
81770 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
81771 +#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)
81772 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
81773 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
81774 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
81775 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
81776 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
81777 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
81778 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
81779 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
81780 +#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)
81781 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
81782 +#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
81783 +
81784 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
81785 +
81786 +#endif
81787 +
81788 +#endif
81789 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
81790 new file mode 100644
81791 index 0000000..b02ba9d
81792 --- /dev/null
81793 +++ b/include/linux/grmsg.h
81794 @@ -0,0 +1,117 @@
81795 +#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"
81796 +#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"
81797 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
81798 +#define GR_STOPMOD_MSG "denied modification of module state by "
81799 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
81800 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
81801 +#define GR_IOPERM_MSG "denied use of ioperm() by "
81802 +#define GR_IOPL_MSG "denied use of iopl() by "
81803 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
81804 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
81805 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
81806 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
81807 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
81808 +#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"
81809 +#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"
81810 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
81811 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
81812 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
81813 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
81814 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
81815 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
81816 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
81817 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
81818 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
81819 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
81820 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
81821 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
81822 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
81823 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
81824 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
81825 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
81826 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
81827 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
81828 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
81829 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
81830 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
81831 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
81832 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
81833 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
81834 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
81835 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
81836 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
81837 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
81838 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
81839 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
81840 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
81841 +#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
81842 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
81843 +#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
81844 +#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
81845 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
81846 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
81847 +#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"
81848 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
81849 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
81850 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
81851 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
81852 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
81853 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
81854 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
81855 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
81856 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
81857 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
81858 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
81859 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
81860 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
81861 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
81862 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
81863 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
81864 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
81865 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
81866 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
81867 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
81868 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
81869 +#define GR_NICE_CHROOT_MSG "denied priority change by "
81870 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
81871 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
81872 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
81873 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
81874 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
81875 +#define GR_TIME_MSG "time set by "
81876 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
81877 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
81878 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
81879 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
81880 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
81881 +#define GR_BIND_MSG "denied bind() by "
81882 +#define GR_CONNECT_MSG "denied connect() by "
81883 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
81884 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
81885 +#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"
81886 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
81887 +#define GR_CAP_ACL_MSG "use of %s denied for "
81888 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
81889 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
81890 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
81891 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
81892 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
81893 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
81894 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
81895 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
81896 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
81897 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
81898 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
81899 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
81900 +#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
81901 +#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
81902 +#define GR_VM86_MSG "denied use of vm86 by "
81903 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
81904 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
81905 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
81906 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
81907 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
81908 +#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 "
81909 +#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 "
81910 +#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
81911 +#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
81912 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
81913 new file mode 100644
81914 index 0000000..c3b0738
81915 --- /dev/null
81916 +++ b/include/linux/grsecurity.h
81917 @@ -0,0 +1,244 @@
81918 +#ifndef GR_SECURITY_H
81919 +#define GR_SECURITY_H
81920 +#include <linux/fs.h>
81921 +#include <linux/fs_struct.h>
81922 +#include <linux/binfmts.h>
81923 +#include <linux/gracl.h>
81924 +
81925 +/* notify of brain-dead configs */
81926 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81927 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
81928 +#endif
81929 +#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81930 +#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
81931 +#endif
81932 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
81933 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
81934 +#endif
81935 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
81936 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
81937 +#endif
81938 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
81939 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
81940 +#endif
81941 +
81942 +int gr_handle_new_usb(void);
81943 +
81944 +void gr_handle_brute_attach(int dumpable);
81945 +void gr_handle_brute_check(void);
81946 +void gr_handle_kernel_exploit(void);
81947 +
81948 +char gr_roletype_to_char(void);
81949 +
81950 +int gr_proc_is_restricted(void);
81951 +
81952 +int gr_acl_enable_at_secure(void);
81953 +
81954 +int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
81955 +int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
81956 +
81957 +int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
81958 +
81959 +void gr_del_task_from_ip_table(struct task_struct *p);
81960 +
81961 +int gr_pid_is_chrooted(struct task_struct *p);
81962 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
81963 +int gr_handle_chroot_nice(void);
81964 +int gr_handle_chroot_sysctl(const int op);
81965 +int gr_handle_chroot_setpriority(struct task_struct *p,
81966 + const int niceval);
81967 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
81968 +int gr_chroot_fhandle(void);
81969 +int gr_handle_chroot_chroot(const struct dentry *dentry,
81970 + const struct vfsmount *mnt);
81971 +void gr_handle_chroot_chdir(const struct path *path);
81972 +int gr_handle_chroot_chmod(const struct dentry *dentry,
81973 + const struct vfsmount *mnt, const int mode);
81974 +int gr_handle_chroot_mknod(const struct dentry *dentry,
81975 + const struct vfsmount *mnt, const int mode);
81976 +int gr_handle_chroot_mount(const struct dentry *dentry,
81977 + const struct vfsmount *mnt,
81978 + const char *dev_name);
81979 +int gr_handle_chroot_pivot(void);
81980 +int gr_handle_chroot_unix(const pid_t pid);
81981 +
81982 +int gr_handle_rawio(const struct inode *inode);
81983 +
81984 +void gr_handle_ioperm(void);
81985 +void gr_handle_iopl(void);
81986 +void gr_handle_msr_write(void);
81987 +
81988 +umode_t gr_acl_umask(void);
81989 +
81990 +int gr_tpe_allow(const struct file *file);
81991 +
81992 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
81993 +void gr_clear_chroot_entries(struct task_struct *task);
81994 +
81995 +void gr_log_forkfail(const int retval);
81996 +void gr_log_timechange(void);
81997 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
81998 +void gr_log_chdir(const struct dentry *dentry,
81999 + const struct vfsmount *mnt);
82000 +void gr_log_chroot_exec(const struct dentry *dentry,
82001 + const struct vfsmount *mnt);
82002 +void gr_log_remount(const char *devname, const int retval);
82003 +void gr_log_unmount(const char *devname, const int retval);
82004 +void gr_log_mount(const char *from, struct path *to, const int retval);
82005 +void gr_log_textrel(struct vm_area_struct *vma);
82006 +void gr_log_ptgnustack(struct file *file);
82007 +void gr_log_rwxmmap(struct file *file);
82008 +void gr_log_rwxmprotect(struct vm_area_struct *vma);
82009 +
82010 +int gr_handle_follow_link(const struct inode *parent,
82011 + const struct inode *inode,
82012 + const struct dentry *dentry,
82013 + const struct vfsmount *mnt);
82014 +int gr_handle_fifo(const struct dentry *dentry,
82015 + const struct vfsmount *mnt,
82016 + const struct dentry *dir, const int flag,
82017 + const int acc_mode);
82018 +int gr_handle_hardlink(const struct dentry *dentry,
82019 + const struct vfsmount *mnt,
82020 + struct inode *inode,
82021 + const int mode, const struct filename *to);
82022 +
82023 +int gr_is_capable(const int cap);
82024 +int gr_is_capable_nolog(const int cap);
82025 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
82026 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
82027 +
82028 +void gr_copy_label(struct task_struct *tsk);
82029 +void gr_handle_crash(struct task_struct *task, const int sig);
82030 +int gr_handle_signal(const struct task_struct *p, const int sig);
82031 +int gr_check_crash_uid(const kuid_t uid);
82032 +int gr_check_protected_task(const struct task_struct *task);
82033 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
82034 +int gr_acl_handle_mmap(const struct file *file,
82035 + const unsigned long prot);
82036 +int gr_acl_handle_mprotect(const struct file *file,
82037 + const unsigned long prot);
82038 +int gr_check_hidden_task(const struct task_struct *tsk);
82039 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
82040 + const struct vfsmount *mnt);
82041 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
82042 + const struct vfsmount *mnt);
82043 +__u32 gr_acl_handle_access(const struct dentry *dentry,
82044 + const struct vfsmount *mnt, const int fmode);
82045 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
82046 + const struct vfsmount *mnt, umode_t *mode);
82047 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
82048 + const struct vfsmount *mnt);
82049 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
82050 + const struct vfsmount *mnt);
82051 +__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
82052 + const struct vfsmount *mnt);
82053 +int gr_handle_ptrace(struct task_struct *task, const long request);
82054 +int gr_handle_proc_ptrace(struct task_struct *task);
82055 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
82056 + const struct vfsmount *mnt);
82057 +int gr_check_crash_exec(const struct file *filp);
82058 +int gr_acl_is_enabled(void);
82059 +void gr_set_role_label(struct task_struct *task, const kuid_t uid,
82060 + const kgid_t gid);
82061 +int gr_set_proc_label(const struct dentry *dentry,
82062 + const struct vfsmount *mnt,
82063 + const int unsafe_flags);
82064 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
82065 + const struct vfsmount *mnt);
82066 +__u32 gr_acl_handle_open(const struct dentry *dentry,
82067 + const struct vfsmount *mnt, int acc_mode);
82068 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
82069 + const struct dentry *p_dentry,
82070 + const struct vfsmount *p_mnt,
82071 + int open_flags, int acc_mode, const int imode);
82072 +void gr_handle_create(const struct dentry *dentry,
82073 + const struct vfsmount *mnt);
82074 +void gr_handle_proc_create(const struct dentry *dentry,
82075 + const struct inode *inode);
82076 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
82077 + const struct dentry *parent_dentry,
82078 + const struct vfsmount *parent_mnt,
82079 + const int mode);
82080 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
82081 + const struct dentry *parent_dentry,
82082 + const struct vfsmount *parent_mnt);
82083 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
82084 + const struct vfsmount *mnt);
82085 +void gr_handle_delete(const ino_t ino, const dev_t dev);
82086 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
82087 + const struct vfsmount *mnt);
82088 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
82089 + const struct dentry *parent_dentry,
82090 + const struct vfsmount *parent_mnt,
82091 + const struct filename *from);
82092 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
82093 + const struct dentry *parent_dentry,
82094 + const struct vfsmount *parent_mnt,
82095 + const struct dentry *old_dentry,
82096 + const struct vfsmount *old_mnt, const struct filename *to);
82097 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
82098 +int gr_acl_handle_rename(struct dentry *new_dentry,
82099 + struct dentry *parent_dentry,
82100 + const struct vfsmount *parent_mnt,
82101 + struct dentry *old_dentry,
82102 + struct inode *old_parent_inode,
82103 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
82104 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
82105 + struct dentry *old_dentry,
82106 + struct dentry *new_dentry,
82107 + struct vfsmount *mnt, const __u8 replace, unsigned int flags);
82108 +__u32 gr_check_link(const struct dentry *new_dentry,
82109 + const struct dentry *parent_dentry,
82110 + const struct vfsmount *parent_mnt,
82111 + const struct dentry *old_dentry,
82112 + const struct vfsmount *old_mnt);
82113 +int gr_acl_handle_filldir(const struct file *file, const char *name,
82114 + const unsigned int namelen, const ino_t ino);
82115 +
82116 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
82117 + const struct vfsmount *mnt);
82118 +void gr_acl_handle_exit(void);
82119 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
82120 +int gr_acl_handle_procpidmem(const struct task_struct *task);
82121 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
82122 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
82123 +void gr_audit_ptrace(struct task_struct *task);
82124 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
82125 +void gr_put_exec_file(struct task_struct *task);
82126 +
82127 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
82128 +
82129 +#ifdef CONFIG_GRKERNSEC_RESLOG
82130 +extern void gr_log_resource(const struct task_struct *task, const int res,
82131 + const unsigned long wanted, const int gt);
82132 +#else
82133 +static inline void gr_log_resource(const struct task_struct *task, const int res,
82134 + const unsigned long wanted, const int gt)
82135 +{
82136 +}
82137 +#endif
82138 +
82139 +#ifdef CONFIG_GRKERNSEC
82140 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
82141 +void gr_handle_vm86(void);
82142 +void gr_handle_mem_readwrite(u64 from, u64 to);
82143 +
82144 +void gr_log_badprocpid(const char *entry);
82145 +
82146 +extern int grsec_enable_dmesg;
82147 +extern int grsec_disable_privio;
82148 +
82149 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
82150 +extern kgid_t grsec_proc_gid;
82151 +#endif
82152 +
82153 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
82154 +extern int grsec_enable_chroot_findtask;
82155 +#endif
82156 +#ifdef CONFIG_GRKERNSEC_SETXID
82157 +extern int grsec_enable_setxid;
82158 +#endif
82159 +#endif
82160 +
82161 +#endif
82162 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
82163 new file mode 100644
82164 index 0000000..e7ffaaf
82165 --- /dev/null
82166 +++ b/include/linux/grsock.h
82167 @@ -0,0 +1,19 @@
82168 +#ifndef __GRSOCK_H
82169 +#define __GRSOCK_H
82170 +
82171 +extern void gr_attach_curr_ip(const struct sock *sk);
82172 +extern int gr_handle_sock_all(const int family, const int type,
82173 + const int protocol);
82174 +extern int gr_handle_sock_server(const struct sockaddr *sck);
82175 +extern int gr_handle_sock_server_other(const struct sock *sck);
82176 +extern int gr_handle_sock_client(const struct sockaddr *sck);
82177 +extern int gr_search_connect(struct socket * sock,
82178 + struct sockaddr_in * addr);
82179 +extern int gr_search_bind(struct socket * sock,
82180 + struct sockaddr_in * addr);
82181 +extern int gr_search_listen(struct socket * sock);
82182 +extern int gr_search_accept(struct socket * sock);
82183 +extern int gr_search_socket(const int domain, const int type,
82184 + const int protocol);
82185 +
82186 +#endif
82187 diff --git a/include/linux/hash.h b/include/linux/hash.h
82188 index d0494c3..69b7715 100644
82189 --- a/include/linux/hash.h
82190 +++ b/include/linux/hash.h
82191 @@ -87,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
82192 struct fast_hash_ops {
82193 u32 (*hash)(const void *data, u32 len, u32 seed);
82194 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
82195 -};
82196 +} __no_const;
82197
82198 /**
82199 * arch_fast_hash - Caclulates a hash over a given buffer that can have
82200 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
82201 index 9286a46..373f27f 100644
82202 --- a/include/linux/highmem.h
82203 +++ b/include/linux/highmem.h
82204 @@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
82205 kunmap_atomic(kaddr);
82206 }
82207
82208 +static inline void sanitize_highpage(struct page *page)
82209 +{
82210 + void *kaddr;
82211 + unsigned long flags;
82212 +
82213 + local_irq_save(flags);
82214 + kaddr = kmap_atomic(page);
82215 + clear_page(kaddr);
82216 + kunmap_atomic(kaddr);
82217 + local_irq_restore(flags);
82218 +}
82219 +
82220 static inline void zero_user_segments(struct page *page,
82221 unsigned start1, unsigned end1,
82222 unsigned start2, unsigned end2)
82223 diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
82224 index 1c7b89a..7dda400 100644
82225 --- a/include/linux/hwmon-sysfs.h
82226 +++ b/include/linux/hwmon-sysfs.h
82227 @@ -25,7 +25,8 @@
82228 struct sensor_device_attribute{
82229 struct device_attribute dev_attr;
82230 int index;
82231 -};
82232 +} __do_const;
82233 +typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
82234 #define to_sensor_dev_attr(_dev_attr) \
82235 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
82236
82237 @@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
82238 struct device_attribute dev_attr;
82239 u8 index;
82240 u8 nr;
82241 -};
82242 +} __do_const;
82243 +typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
82244 #define to_sensor_dev_attr_2(_dev_attr) \
82245 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
82246
82247 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
82248 index b556e0a..c10a515 100644
82249 --- a/include/linux/i2c.h
82250 +++ b/include/linux/i2c.h
82251 @@ -378,6 +378,7 @@ struct i2c_algorithm {
82252 /* To determine what the adapter supports */
82253 u32 (*functionality) (struct i2c_adapter *);
82254 };
82255 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
82256
82257 /**
82258 * struct i2c_bus_recovery_info - I2C bus recovery information
82259 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
82260 index d23c3c2..eb63c81 100644
82261 --- a/include/linux/i2o.h
82262 +++ b/include/linux/i2o.h
82263 @@ -565,7 +565,7 @@ struct i2o_controller {
82264 struct i2o_device *exec; /* Executive */
82265 #if BITS_PER_LONG == 64
82266 spinlock_t context_list_lock; /* lock for context_list */
82267 - atomic_t context_list_counter; /* needed for unique contexts */
82268 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
82269 struct list_head context_list; /* list of context id's
82270 and pointers */
82271 #endif
82272 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
82273 index aff7ad8..3942bbd 100644
82274 --- a/include/linux/if_pppox.h
82275 +++ b/include/linux/if_pppox.h
82276 @@ -76,7 +76,7 @@ struct pppox_proto {
82277 int (*ioctl)(struct socket *sock, unsigned int cmd,
82278 unsigned long arg);
82279 struct module *owner;
82280 -};
82281 +} __do_const;
82282
82283 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
82284 extern void unregister_pppox_proto(int proto_num);
82285 diff --git a/include/linux/init.h b/include/linux/init.h
82286 index 2df8e8d..3e1280d 100644
82287 --- a/include/linux/init.h
82288 +++ b/include/linux/init.h
82289 @@ -37,9 +37,17 @@
82290 * section.
82291 */
82292
82293 +#define add_init_latent_entropy __latent_entropy
82294 +
82295 +#ifdef CONFIG_MEMORY_HOTPLUG
82296 +#define add_meminit_latent_entropy
82297 +#else
82298 +#define add_meminit_latent_entropy __latent_entropy
82299 +#endif
82300 +
82301 /* These are for everybody (although not all archs will actually
82302 discard it in modules) */
82303 -#define __init __section(.init.text) __cold notrace
82304 +#define __init __section(.init.text) __cold notrace add_init_latent_entropy
82305 #define __initdata __section(.init.data)
82306 #define __initconst __constsection(.init.rodata)
82307 #define __exitdata __section(.exit.data)
82308 @@ -100,7 +108,7 @@
82309 #define __cpuexitconst
82310
82311 /* Used for MEMORY_HOTPLUG */
82312 -#define __meminit __section(.meminit.text) __cold notrace
82313 +#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
82314 #define __meminitdata __section(.meminit.data)
82315 #define __meminitconst __constsection(.meminit.rodata)
82316 #define __memexit __section(.memexit.text) __exitused __cold notrace
82317 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
82318 index 77fc43f..73caf92 100644
82319 --- a/include/linux/init_task.h
82320 +++ b/include/linux/init_task.h
82321 @@ -158,6 +158,12 @@ extern struct task_group root_task_group;
82322
82323 #define INIT_TASK_COMM "swapper"
82324
82325 +#ifdef CONFIG_X86
82326 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
82327 +#else
82328 +#define INIT_TASK_THREAD_INFO
82329 +#endif
82330 +
82331 #ifdef CONFIG_RT_MUTEXES
82332 # define INIT_RT_MUTEXES(tsk) \
82333 .pi_waiters = RB_ROOT, \
82334 @@ -205,6 +211,7 @@ extern struct task_group root_task_group;
82335 RCU_POINTER_INITIALIZER(cred, &init_cred), \
82336 .comm = INIT_TASK_COMM, \
82337 .thread = INIT_THREAD, \
82338 + INIT_TASK_THREAD_INFO \
82339 .fs = &init_fs, \
82340 .files = &init_files, \
82341 .signal = &init_signals, \
82342 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
82343 index 69517a2..6b12d37 100644
82344 --- a/include/linux/interrupt.h
82345 +++ b/include/linux/interrupt.h
82346 @@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
82347
82348 struct softirq_action
82349 {
82350 - void (*action)(struct softirq_action *);
82351 -};
82352 + void (*action)(void);
82353 +} __no_const;
82354
82355 asmlinkage void do_softirq(void);
82356 asmlinkage void __do_softirq(void);
82357 @@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
82358 }
82359 #endif
82360
82361 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
82362 +extern void open_softirq(int nr, void (*action)(void));
82363 extern void softirq_init(void);
82364 extern void __raise_softirq_irqoff(unsigned int nr);
82365
82366 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
82367 index e6a7c9f..5804745 100644
82368 --- a/include/linux/iommu.h
82369 +++ b/include/linux/iommu.h
82370 @@ -133,7 +133,7 @@ struct iommu_ops {
82371 u32 (*domain_get_windows)(struct iommu_domain *domain);
82372
82373 unsigned long pgsize_bitmap;
82374 -};
82375 +} __do_const;
82376
82377 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
82378 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
82379 diff --git a/include/linux/ioport.h b/include/linux/ioport.h
82380 index 2c525022..345b106 100644
82381 --- a/include/linux/ioport.h
82382 +++ b/include/linux/ioport.h
82383 @@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
82384 int adjust_resource(struct resource *res, resource_size_t start,
82385 resource_size_t size);
82386 resource_size_t resource_alignment(struct resource *res);
82387 -static inline resource_size_t resource_size(const struct resource *res)
82388 +static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
82389 {
82390 return res->end - res->start + 1;
82391 }
82392 diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
82393 index 35e7eca..6afb7ad 100644
82394 --- a/include/linux/ipc_namespace.h
82395 +++ b/include/linux/ipc_namespace.h
82396 @@ -69,7 +69,7 @@ struct ipc_namespace {
82397 struct user_namespace *user_ns;
82398
82399 unsigned int proc_inum;
82400 -};
82401 +} __randomize_layout;
82402
82403 extern struct ipc_namespace init_ipc_ns;
82404 extern atomic_t nr_ipc_ns;
82405 diff --git a/include/linux/irq.h b/include/linux/irq.h
82406 index 03f48d9..e86af0c 100644
82407 --- a/include/linux/irq.h
82408 +++ b/include/linux/irq.h
82409 @@ -352,7 +352,8 @@ struct irq_chip {
82410 void (*irq_release_resources)(struct irq_data *data);
82411
82412 unsigned long flags;
82413 -};
82414 +} __do_const;
82415 +typedef struct irq_chip __no_const irq_chip_no_const;
82416
82417 /*
82418 * irq_chip specific flags
82419 diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
82420 index 13eed92..3261c86 100644
82421 --- a/include/linux/irqchip/arm-gic.h
82422 +++ b/include/linux/irqchip/arm-gic.h
82423 @@ -91,9 +91,11 @@
82424
82425 #ifndef __ASSEMBLY__
82426
82427 +#include <linux/irq.h>
82428 +
82429 struct device_node;
82430
82431 -extern struct irq_chip gic_arch_extn;
82432 +extern irq_chip_no_const gic_arch_extn;
82433
82434 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
82435 u32 offset, struct device_node *);
82436 diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
82437 index c367cbd..c9b79e6 100644
82438 --- a/include/linux/jiffies.h
82439 +++ b/include/linux/jiffies.h
82440 @@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
82441 /*
82442 * Convert various time units to each other:
82443 */
82444 -extern unsigned int jiffies_to_msecs(const unsigned long j);
82445 -extern unsigned int jiffies_to_usecs(const unsigned long j);
82446 +extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
82447 +extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
82448
82449 -static inline u64 jiffies_to_nsecs(const unsigned long j)
82450 +static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
82451 {
82452 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
82453 }
82454
82455 -extern unsigned long msecs_to_jiffies(const unsigned int m);
82456 -extern unsigned long usecs_to_jiffies(const unsigned int u);
82457 +extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
82458 +extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
82459 extern unsigned long timespec_to_jiffies(const struct timespec *value);
82460 extern void jiffies_to_timespec(const unsigned long jiffies,
82461 - struct timespec *value);
82462 -extern unsigned long timeval_to_jiffies(const struct timeval *value);
82463 + struct timespec *value) __intentional_overflow(-1);
82464 +extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
82465 extern void jiffies_to_timeval(const unsigned long jiffies,
82466 struct timeval *value);
82467
82468 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
82469 index 6883e19..e854fcb 100644
82470 --- a/include/linux/kallsyms.h
82471 +++ b/include/linux/kallsyms.h
82472 @@ -15,7 +15,8 @@
82473
82474 struct module;
82475
82476 -#ifdef CONFIG_KALLSYMS
82477 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
82478 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
82479 /* Lookup the address for a symbol. Returns 0 if not found. */
82480 unsigned long kallsyms_lookup_name(const char *name);
82481
82482 @@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
82483 /* Stupid that this does nothing, but I didn't create this mess. */
82484 #define __print_symbol(fmt, addr)
82485 #endif /*CONFIG_KALLSYMS*/
82486 +#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
82487 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
82488 +extern unsigned long kallsyms_lookup_name(const char *name);
82489 +extern void __print_symbol(const char *fmt, unsigned long address);
82490 +extern int sprint_backtrace(char *buffer, unsigned long address);
82491 +extern int sprint_symbol(char *buffer, unsigned long address);
82492 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
82493 +const char *kallsyms_lookup(unsigned long addr,
82494 + unsigned long *symbolsize,
82495 + unsigned long *offset,
82496 + char **modname, char *namebuf);
82497 +extern int kallsyms_lookup_size_offset(unsigned long addr,
82498 + unsigned long *symbolsize,
82499 + unsigned long *offset);
82500 +#endif
82501
82502 /* This macro allows us to keep printk typechecking */
82503 static __printf(1, 2)
82504 diff --git a/include/linux/key-type.h b/include/linux/key-type.h
82505 index ff9f1d3..6712be5 100644
82506 --- a/include/linux/key-type.h
82507 +++ b/include/linux/key-type.h
82508 @@ -152,7 +152,7 @@ struct key_type {
82509 /* internal fields */
82510 struct list_head link; /* link in types list */
82511 struct lock_class_key lock_class; /* key->sem lock class */
82512 -};
82513 +} __do_const;
82514
82515 extern struct key_type key_type_keyring;
82516
82517 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
82518 index e465bb1..19f605f 100644
82519 --- a/include/linux/kgdb.h
82520 +++ b/include/linux/kgdb.h
82521 @@ -52,7 +52,7 @@ extern int kgdb_connected;
82522 extern int kgdb_io_module_registered;
82523
82524 extern atomic_t kgdb_setting_breakpoint;
82525 -extern atomic_t kgdb_cpu_doing_single_step;
82526 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
82527
82528 extern struct task_struct *kgdb_usethread;
82529 extern struct task_struct *kgdb_contthread;
82530 @@ -254,7 +254,7 @@ struct kgdb_arch {
82531 void (*correct_hw_break)(void);
82532
82533 void (*enable_nmi)(bool on);
82534 -};
82535 +} __do_const;
82536
82537 /**
82538 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
82539 @@ -279,7 +279,7 @@ struct kgdb_io {
82540 void (*pre_exception) (void);
82541 void (*post_exception) (void);
82542 int is_console;
82543 -};
82544 +} __do_const;
82545
82546 extern struct kgdb_arch arch_kgdb_ops;
82547
82548 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
82549 index 0555cc6..40116ce 100644
82550 --- a/include/linux/kmod.h
82551 +++ b/include/linux/kmod.h
82552 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
82553 * usually useless though. */
82554 extern __printf(2, 3)
82555 int __request_module(bool wait, const char *name, ...);
82556 +extern __printf(3, 4)
82557 +int ___request_module(bool wait, char *param_name, const char *name, ...);
82558 #define request_module(mod...) __request_module(true, mod)
82559 #define request_module_nowait(mod...) __request_module(false, mod)
82560 #define try_then_request_module(x, mod...) \
82561 @@ -57,6 +59,9 @@ struct subprocess_info {
82562 struct work_struct work;
82563 struct completion *complete;
82564 char *path;
82565 +#ifdef CONFIG_GRKERNSEC
82566 + char *origpath;
82567 +#endif
82568 char **argv;
82569 char **envp;
82570 int wait;
82571 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
82572 index 2d61b90..a1d0a13 100644
82573 --- a/include/linux/kobject.h
82574 +++ b/include/linux/kobject.h
82575 @@ -118,7 +118,7 @@ struct kobj_type {
82576 struct attribute **default_attrs;
82577 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
82578 const void *(*namespace)(struct kobject *kobj);
82579 -};
82580 +} __do_const;
82581
82582 struct kobj_uevent_env {
82583 char *argv[3];
82584 @@ -142,6 +142,7 @@ struct kobj_attribute {
82585 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
82586 const char *buf, size_t count);
82587 };
82588 +typedef struct kobj_attribute __no_const kobj_attribute_no_const;
82589
82590 extern const struct sysfs_ops kobj_sysfs_ops;
82591
82592 @@ -169,7 +170,7 @@ struct kset {
82593 spinlock_t list_lock;
82594 struct kobject kobj;
82595 const struct kset_uevent_ops *uevent_ops;
82596 -};
82597 +} __randomize_layout;
82598
82599 extern void kset_init(struct kset *kset);
82600 extern int __must_check kset_register(struct kset *kset);
82601 diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
82602 index df32d25..fb52e27 100644
82603 --- a/include/linux/kobject_ns.h
82604 +++ b/include/linux/kobject_ns.h
82605 @@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
82606 const void *(*netlink_ns)(struct sock *sk);
82607 const void *(*initial_ns)(void);
82608 void (*drop_ns)(void *);
82609 -};
82610 +} __do_const;
82611
82612 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
82613 int kobj_ns_type_registered(enum kobj_ns_type type);
82614 diff --git a/include/linux/kref.h b/include/linux/kref.h
82615 index 484604d..0f6c5b6 100644
82616 --- a/include/linux/kref.h
82617 +++ b/include/linux/kref.h
82618 @@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
82619 static inline int kref_sub(struct kref *kref, unsigned int count,
82620 void (*release)(struct kref *kref))
82621 {
82622 - WARN_ON(release == NULL);
82623 + BUG_ON(release == NULL);
82624
82625 if (atomic_sub_and_test((int) count, &kref->refcount)) {
82626 release(kref);
82627 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
82628 index a6059bd..8126d5c 100644
82629 --- a/include/linux/kvm_host.h
82630 +++ b/include/linux/kvm_host.h
82631 @@ -460,7 +460,7 @@ static inline void kvm_irqfd_exit(void)
82632 {
82633 }
82634 #endif
82635 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82636 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82637 struct module *module);
82638 void kvm_exit(void);
82639
82640 @@ -629,7 +629,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
82641 struct kvm_guest_debug *dbg);
82642 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
82643
82644 -int kvm_arch_init(void *opaque);
82645 +int kvm_arch_init(const void *opaque);
82646 void kvm_arch_exit(void);
82647
82648 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
82649 diff --git a/include/linux/libata.h b/include/linux/libata.h
82650 index bd5fefe..2a8a8d2 100644
82651 --- a/include/linux/libata.h
82652 +++ b/include/linux/libata.h
82653 @@ -976,7 +976,7 @@ struct ata_port_operations {
82654 * fields must be pointers.
82655 */
82656 const struct ata_port_operations *inherits;
82657 -};
82658 +} __do_const;
82659
82660 struct ata_port_info {
82661 unsigned long flags;
82662 diff --git a/include/linux/linkage.h b/include/linux/linkage.h
82663 index a6a42dd..6c5ebce 100644
82664 --- a/include/linux/linkage.h
82665 +++ b/include/linux/linkage.h
82666 @@ -36,6 +36,7 @@
82667 #endif
82668
82669 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
82670 +#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
82671 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
82672
82673 /*
82674 diff --git a/include/linux/list.h b/include/linux/list.h
82675 index f33f831..1ffe5e2 100644
82676 --- a/include/linux/list.h
82677 +++ b/include/linux/list.h
82678 @@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
82679 extern void list_del(struct list_head *entry);
82680 #endif
82681
82682 +extern void __pax_list_add(struct list_head *new,
82683 + struct list_head *prev,
82684 + struct list_head *next);
82685 +static inline void pax_list_add(struct list_head *new, struct list_head *head)
82686 +{
82687 + __pax_list_add(new, head, head->next);
82688 +}
82689 +static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
82690 +{
82691 + __pax_list_add(new, head->prev, head);
82692 +}
82693 +extern void pax_list_del(struct list_head *entry);
82694 +
82695 /**
82696 * list_replace - replace old entry by new one
82697 * @old : the element to be replaced
82698 @@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
82699 INIT_LIST_HEAD(entry);
82700 }
82701
82702 +extern void pax_list_del_init(struct list_head *entry);
82703 +
82704 /**
82705 * list_move - delete from one list and add as another's head
82706 * @list: the entry to move
82707 diff --git a/include/linux/lockref.h b/include/linux/lockref.h
82708 index 4bfde0e..d6e2e09 100644
82709 --- a/include/linux/lockref.h
82710 +++ b/include/linux/lockref.h
82711 @@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
82712 return ((int)l->count < 0);
82713 }
82714
82715 +static inline unsigned int __lockref_read(struct lockref *lockref)
82716 +{
82717 + return lockref->count;
82718 +}
82719 +
82720 +static inline void __lockref_set(struct lockref *lockref, unsigned int count)
82721 +{
82722 + lockref->count = count;
82723 +}
82724 +
82725 +static inline void __lockref_inc(struct lockref *lockref)
82726 +{
82727 +
82728 +#ifdef CONFIG_PAX_REFCOUNT
82729 + atomic_inc((atomic_t *)&lockref->count);
82730 +#else
82731 + lockref->count++;
82732 +#endif
82733 +
82734 +}
82735 +
82736 +static inline void __lockref_dec(struct lockref *lockref)
82737 +{
82738 +
82739 +#ifdef CONFIG_PAX_REFCOUNT
82740 + atomic_dec((atomic_t *)&lockref->count);
82741 +#else
82742 + lockref->count--;
82743 +#endif
82744 +
82745 +}
82746 +
82747 #endif /* __LINUX_LOCKREF_H */
82748 diff --git a/include/linux/math64.h b/include/linux/math64.h
82749 index c45c089..298841c 100644
82750 --- a/include/linux/math64.h
82751 +++ b/include/linux/math64.h
82752 @@ -15,7 +15,7 @@
82753 * This is commonly provided by 32bit archs to provide an optimized 64bit
82754 * divide.
82755 */
82756 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82757 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82758 {
82759 *remainder = dividend % divisor;
82760 return dividend / divisor;
82761 @@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
82762 /**
82763 * div64_u64 - unsigned 64bit divide with 64bit divisor
82764 */
82765 -static inline u64 div64_u64(u64 dividend, u64 divisor)
82766 +static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
82767 {
82768 return dividend / divisor;
82769 }
82770 @@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
82771 #define div64_ul(x, y) div_u64((x), (y))
82772
82773 #ifndef div_u64_rem
82774 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82775 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82776 {
82777 *remainder = do_div(dividend, divisor);
82778 return dividend;
82779 @@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
82780 #endif
82781
82782 #ifndef div64_u64
82783 -extern u64 div64_u64(u64 dividend, u64 divisor);
82784 +extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
82785 #endif
82786
82787 #ifndef div64_s64
82788 @@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
82789 * divide.
82790 */
82791 #ifndef div_u64
82792 -static inline u64 div_u64(u64 dividend, u32 divisor)
82793 +static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
82794 {
82795 u32 remainder;
82796 return div_u64_rem(dividend, divisor, &remainder);
82797 diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
82798 index 3d385c8..deacb6a 100644
82799 --- a/include/linux/mempolicy.h
82800 +++ b/include/linux/mempolicy.h
82801 @@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
82802 }
82803
82804 #define vma_policy(vma) ((vma)->vm_policy)
82805 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82806 +{
82807 + vma->vm_policy = pol;
82808 +}
82809
82810 static inline void mpol_get(struct mempolicy *pol)
82811 {
82812 @@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
82813 }
82814
82815 #define vma_policy(vma) NULL
82816 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82817 +{
82818 +}
82819
82820 static inline int
82821 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
82822 diff --git a/include/linux/mm.h b/include/linux/mm.h
82823 index b464611..77cbfc1 100644
82824 --- a/include/linux/mm.h
82825 +++ b/include/linux/mm.h
82826 @@ -128,6 +128,11 @@ extern unsigned int kobjsize(const void *objp);
82827 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
82828 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
82829 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
82830 +
82831 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
82832 +#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
82833 +#endif
82834 +
82835 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
82836
82837 #ifdef CONFIG_MEM_SOFT_DIRTY
82838 @@ -238,8 +243,8 @@ struct vm_operations_struct {
82839 /* called by access_process_vm when get_user_pages() fails, typically
82840 * for use by special VMAs that can switch between memory and hardware
82841 */
82842 - int (*access)(struct vm_area_struct *vma, unsigned long addr,
82843 - void *buf, int len, int write);
82844 + ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
82845 + void *buf, size_t len, int write);
82846
82847 /* Called by the /proc/PID/maps code to ask the vma whether it
82848 * has a special name. Returning non-NULL will also cause this
82849 @@ -275,6 +280,7 @@ struct vm_operations_struct {
82850 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
82851 unsigned long size, pgoff_t pgoff);
82852 };
82853 +typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
82854
82855 struct mmu_gather;
82856 struct inode;
82857 @@ -1165,8 +1171,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
82858 unsigned long *pfn);
82859 int follow_phys(struct vm_area_struct *vma, unsigned long address,
82860 unsigned int flags, unsigned long *prot, resource_size_t *phys);
82861 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82862 - void *buf, int len, int write);
82863 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82864 + void *buf, size_t len, int write);
82865
82866 static inline void unmap_shared_mapping_range(struct address_space *mapping,
82867 loff_t const holebegin, loff_t const holelen)
82868 @@ -1206,9 +1212,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
82869 }
82870 #endif
82871
82872 -extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
82873 -extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
82874 - void *buf, int len, int write);
82875 +extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
82876 +extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
82877 + void *buf, size_t len, int write);
82878
82879 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
82880 unsigned long start, unsigned long nr_pages,
82881 @@ -1240,34 +1246,6 @@ int set_page_dirty_lock(struct page *page);
82882 int clear_page_dirty_for_io(struct page *page);
82883 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
82884
82885 -/* Is the vma a continuation of the stack vma above it? */
82886 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
82887 -{
82888 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
82889 -}
82890 -
82891 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
82892 - unsigned long addr)
82893 -{
82894 - return (vma->vm_flags & VM_GROWSDOWN) &&
82895 - (vma->vm_start == addr) &&
82896 - !vma_growsdown(vma->vm_prev, addr);
82897 -}
82898 -
82899 -/* Is the vma a continuation of the stack vma below it? */
82900 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
82901 -{
82902 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
82903 -}
82904 -
82905 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
82906 - unsigned long addr)
82907 -{
82908 - return (vma->vm_flags & VM_GROWSUP) &&
82909 - (vma->vm_end == addr) &&
82910 - !vma_growsup(vma->vm_next, addr);
82911 -}
82912 -
82913 extern struct task_struct *task_of_stack(struct task_struct *task,
82914 struct vm_area_struct *vma, bool in_group);
82915
82916 @@ -1385,8 +1363,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
82917 {
82918 return 0;
82919 }
82920 +
82921 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
82922 + unsigned long address)
82923 +{
82924 + return 0;
82925 +}
82926 #else
82927 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82928 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82929 #endif
82930
82931 #ifdef __PAGETABLE_PMD_FOLDED
82932 @@ -1395,8 +1380,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
82933 {
82934 return 0;
82935 }
82936 +
82937 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
82938 + unsigned long address)
82939 +{
82940 + return 0;
82941 +}
82942 #else
82943 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
82944 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
82945 #endif
82946
82947 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
82948 @@ -1414,11 +1406,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
82949 NULL: pud_offset(pgd, address);
82950 }
82951
82952 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
82953 +{
82954 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
82955 + NULL: pud_offset(pgd, address);
82956 +}
82957 +
82958 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
82959 {
82960 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
82961 NULL: pmd_offset(pud, address);
82962 }
82963 +
82964 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
82965 +{
82966 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
82967 + NULL: pmd_offset(pud, address);
82968 +}
82969 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
82970
82971 #if USE_SPLIT_PTE_PTLOCKS
82972 @@ -1801,12 +1805,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
82973 bool *need_rmap_locks);
82974 extern void exit_mmap(struct mm_struct *);
82975
82976 +#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
82977 +extern void gr_learn_resource(const struct task_struct *task, const int res,
82978 + const unsigned long wanted, const int gt);
82979 +#else
82980 +static inline void gr_learn_resource(const struct task_struct *task, const int res,
82981 + const unsigned long wanted, const int gt)
82982 +{
82983 +}
82984 +#endif
82985 +
82986 static inline int check_data_rlimit(unsigned long rlim,
82987 unsigned long new,
82988 unsigned long start,
82989 unsigned long end_data,
82990 unsigned long start_data)
82991 {
82992 + gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
82993 if (rlim < RLIM_INFINITY) {
82994 if (((new - start) + (end_data - start_data)) > rlim)
82995 return -ENOSPC;
82996 @@ -1831,7 +1846,7 @@ extern int install_special_mapping(struct mm_struct *mm,
82997 unsigned long addr, unsigned long len,
82998 unsigned long flags, struct page **pages);
82999
83000 -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
83001 +extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
83002
83003 extern unsigned long mmap_region(struct file *file, unsigned long addr,
83004 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
83005 @@ -1839,6 +1854,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
83006 unsigned long len, unsigned long prot, unsigned long flags,
83007 unsigned long pgoff, unsigned long *populate);
83008 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
83009 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
83010
83011 #ifdef CONFIG_MMU
83012 extern int __mm_populate(unsigned long addr, unsigned long len,
83013 @@ -1867,10 +1883,11 @@ struct vm_unmapped_area_info {
83014 unsigned long high_limit;
83015 unsigned long align_mask;
83016 unsigned long align_offset;
83017 + unsigned long threadstack_offset;
83018 };
83019
83020 -extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
83021 -extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83022 +extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
83023 +extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
83024
83025 /*
83026 * Search for an unmapped address range.
83027 @@ -1882,7 +1899,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83028 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
83029 */
83030 static inline unsigned long
83031 -vm_unmapped_area(struct vm_unmapped_area_info *info)
83032 +vm_unmapped_area(const struct vm_unmapped_area_info *info)
83033 {
83034 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
83035 return unmapped_area(info);
83036 @@ -1944,6 +1961,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
83037 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
83038 struct vm_area_struct **pprev);
83039
83040 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
83041 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
83042 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
83043 +
83044 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
83045 NULL if none. Assume start_addr < end_addr. */
83046 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
83047 @@ -1973,10 +1994,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
83048 }
83049
83050 #ifdef CONFIG_MMU
83051 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
83052 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
83053 void vma_set_page_prot(struct vm_area_struct *vma);
83054 #else
83055 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
83056 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
83057 {
83058 return __pgprot(0);
83059 }
83060 @@ -2038,6 +2059,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
83061 static inline void vm_stat_account(struct mm_struct *mm,
83062 unsigned long flags, struct file *file, long pages)
83063 {
83064 +
83065 +#ifdef CONFIG_PAX_RANDMMAP
83066 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
83067 +#endif
83068 +
83069 mm->total_vm += pages;
83070 }
83071 #endif /* CONFIG_PROC_FS */
83072 @@ -2126,7 +2152,7 @@ extern int unpoison_memory(unsigned long pfn);
83073 extern int sysctl_memory_failure_early_kill;
83074 extern int sysctl_memory_failure_recovery;
83075 extern void shake_page(struct page *p, int access);
83076 -extern atomic_long_t num_poisoned_pages;
83077 +extern atomic_long_unchecked_t num_poisoned_pages;
83078 extern int soft_offline_page(struct page *page, int flags);
83079
83080 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
83081 @@ -2161,5 +2187,11 @@ void __init setup_nr_node_ids(void);
83082 static inline void setup_nr_node_ids(void) {}
83083 #endif
83084
83085 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
83086 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
83087 +#else
83088 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
83089 +#endif
83090 +
83091 #endif /* __KERNEL__ */
83092 #endif /* _LINUX_MM_H */
83093 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
83094 index 6e0b286..90d9c0d 100644
83095 --- a/include/linux/mm_types.h
83096 +++ b/include/linux/mm_types.h
83097 @@ -308,7 +308,9 @@ struct vm_area_struct {
83098 #ifdef CONFIG_NUMA
83099 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
83100 #endif
83101 -};
83102 +
83103 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
83104 +} __randomize_layout;
83105
83106 struct core_thread {
83107 struct task_struct *task;
83108 @@ -454,7 +456,25 @@ struct mm_struct {
83109 bool tlb_flush_pending;
83110 #endif
83111 struct uprobes_state uprobes_state;
83112 -};
83113 +
83114 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
83115 + unsigned long pax_flags;
83116 +#endif
83117 +
83118 +#ifdef CONFIG_PAX_DLRESOLVE
83119 + unsigned long call_dl_resolve;
83120 +#endif
83121 +
83122 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
83123 + unsigned long call_syscall;
83124 +#endif
83125 +
83126 +#ifdef CONFIG_PAX_ASLR
83127 + unsigned long delta_mmap; /* randomized offset */
83128 + unsigned long delta_stack; /* randomized offset */
83129 +#endif
83130 +
83131 +} __randomize_layout;
83132
83133 static inline void mm_init_cpumask(struct mm_struct *mm)
83134 {
83135 diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
83136 index c5d5278..f0b68c8 100644
83137 --- a/include/linux/mmiotrace.h
83138 +++ b/include/linux/mmiotrace.h
83139 @@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
83140 /* Called from ioremap.c */
83141 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
83142 void __iomem *addr);
83143 -extern void mmiotrace_iounmap(volatile void __iomem *addr);
83144 +extern void mmiotrace_iounmap(const volatile void __iomem *addr);
83145
83146 /* For anyone to insert markers. Remember trailing newline. */
83147 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
83148 @@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
83149 {
83150 }
83151
83152 -static inline void mmiotrace_iounmap(volatile void __iomem *addr)
83153 +static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
83154 {
83155 }
83156
83157 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
83158 index ffe66e3..b310722 100644
83159 --- a/include/linux/mmzone.h
83160 +++ b/include/linux/mmzone.h
83161 @@ -527,7 +527,7 @@ struct zone {
83162
83163 ZONE_PADDING(_pad3_)
83164 /* Zone statistics */
83165 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83166 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83167 } ____cacheline_internodealigned_in_smp;
83168
83169 enum zone_flags {
83170 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
83171 index 44eeef0..a92d3f9 100644
83172 --- a/include/linux/mod_devicetable.h
83173 +++ b/include/linux/mod_devicetable.h
83174 @@ -139,7 +139,7 @@ struct usb_device_id {
83175 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
83176 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
83177
83178 -#define HID_ANY_ID (~0)
83179 +#define HID_ANY_ID (~0U)
83180 #define HID_BUS_ANY 0xffff
83181 #define HID_GROUP_ANY 0x0000
83182
83183 @@ -475,7 +475,7 @@ struct dmi_system_id {
83184 const char *ident;
83185 struct dmi_strmatch matches[4];
83186 void *driver_data;
83187 -};
83188 +} __do_const;
83189 /*
83190 * struct dmi_device_id appears during expansion of
83191 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
83192 diff --git a/include/linux/module.h b/include/linux/module.h
83193 index 71f282a..b2387e2 100644
83194 --- a/include/linux/module.h
83195 +++ b/include/linux/module.h
83196 @@ -17,9 +17,11 @@
83197 #include <linux/moduleparam.h>
83198 #include <linux/jump_label.h>
83199 #include <linux/export.h>
83200 +#include <linux/fs.h>
83201
83202 #include <linux/percpu.h>
83203 #include <asm/module.h>
83204 +#include <asm/pgtable.h>
83205
83206 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
83207 #define MODULE_SIG_STRING "~Module signature appended~\n"
83208 @@ -42,7 +44,7 @@ struct module_kobject {
83209 struct kobject *drivers_dir;
83210 struct module_param_attrs *mp;
83211 struct completion *kobj_completion;
83212 -};
83213 +} __randomize_layout;
83214
83215 struct module_attribute {
83216 struct attribute attr;
83217 @@ -54,12 +56,13 @@ struct module_attribute {
83218 int (*test)(struct module *);
83219 void (*free)(struct module *);
83220 };
83221 +typedef struct module_attribute __no_const module_attribute_no_const;
83222
83223 struct module_version_attribute {
83224 struct module_attribute mattr;
83225 const char *module_name;
83226 const char *version;
83227 -} __attribute__ ((__aligned__(sizeof(void *))));
83228 +} __do_const __attribute__ ((__aligned__(sizeof(void *))));
83229
83230 extern ssize_t __modver_version_show(struct module_attribute *,
83231 struct module_kobject *, char *);
83232 @@ -235,7 +238,7 @@ struct module {
83233
83234 /* Sysfs stuff. */
83235 struct module_kobject mkobj;
83236 - struct module_attribute *modinfo_attrs;
83237 + module_attribute_no_const *modinfo_attrs;
83238 const char *version;
83239 const char *srcversion;
83240 struct kobject *holders_dir;
83241 @@ -284,19 +287,16 @@ struct module {
83242 int (*init)(void);
83243
83244 /* If this is non-NULL, vfree after init() returns */
83245 - void *module_init;
83246 + void *module_init_rx, *module_init_rw;
83247
83248 /* Here is the actual code + data, vfree'd on unload. */
83249 - void *module_core;
83250 + void *module_core_rx, *module_core_rw;
83251
83252 /* Here are the sizes of the init and core sections */
83253 - unsigned int init_size, core_size;
83254 + unsigned int init_size_rw, core_size_rw;
83255
83256 /* The size of the executable code in each section. */
83257 - unsigned int init_text_size, core_text_size;
83258 -
83259 - /* Size of RO sections of the module (text+rodata) */
83260 - unsigned int init_ro_size, core_ro_size;
83261 + unsigned int init_size_rx, core_size_rx;
83262
83263 /* Arch-specific module values */
83264 struct mod_arch_specific arch;
83265 @@ -352,6 +352,10 @@ struct module {
83266 #ifdef CONFIG_EVENT_TRACING
83267 struct ftrace_event_call **trace_events;
83268 unsigned int num_trace_events;
83269 + struct file_operations trace_id;
83270 + struct file_operations trace_enable;
83271 + struct file_operations trace_format;
83272 + struct file_operations trace_filter;
83273 #endif
83274 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
83275 unsigned int num_ftrace_callsites;
83276 @@ -375,7 +379,7 @@ struct module {
83277 ctor_fn_t *ctors;
83278 unsigned int num_ctors;
83279 #endif
83280 -};
83281 +} __randomize_layout;
83282 #ifndef MODULE_ARCH_INIT
83283 #define MODULE_ARCH_INIT {}
83284 #endif
83285 @@ -396,18 +400,48 @@ bool is_module_address(unsigned long addr);
83286 bool is_module_percpu_address(unsigned long addr);
83287 bool is_module_text_address(unsigned long addr);
83288
83289 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
83290 +{
83291 +
83292 +#ifdef CONFIG_PAX_KERNEXEC
83293 + if (ktla_ktva(addr) >= (unsigned long)start &&
83294 + ktla_ktva(addr) < (unsigned long)start + size)
83295 + return 1;
83296 +#endif
83297 +
83298 + return ((void *)addr >= start && (void *)addr < start + size);
83299 +}
83300 +
83301 +static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
83302 +{
83303 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
83304 +}
83305 +
83306 +static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
83307 +{
83308 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
83309 +}
83310 +
83311 +static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
83312 +{
83313 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
83314 +}
83315 +
83316 +static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
83317 +{
83318 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
83319 +}
83320 +
83321 static inline bool within_module_core(unsigned long addr,
83322 const struct module *mod)
83323 {
83324 - return (unsigned long)mod->module_core <= addr &&
83325 - addr < (unsigned long)mod->module_core + mod->core_size;
83326 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
83327 }
83328
83329 static inline bool within_module_init(unsigned long addr,
83330 const struct module *mod)
83331 {
83332 - return (unsigned long)mod->module_init <= addr &&
83333 - addr < (unsigned long)mod->module_init + mod->init_size;
83334 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
83335 }
83336
83337 static inline bool within_module(unsigned long addr, const struct module *mod)
83338 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
83339 index 7eeb9bb..68f37e0 100644
83340 --- a/include/linux/moduleloader.h
83341 +++ b/include/linux/moduleloader.h
83342 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
83343 sections. Returns NULL on failure. */
83344 void *module_alloc(unsigned long size);
83345
83346 +#ifdef CONFIG_PAX_KERNEXEC
83347 +void *module_alloc_exec(unsigned long size);
83348 +#else
83349 +#define module_alloc_exec(x) module_alloc(x)
83350 +#endif
83351 +
83352 /* Free memory returned from module_alloc. */
83353 void module_free(struct module *mod, void *module_region);
83354
83355 +#ifdef CONFIG_PAX_KERNEXEC
83356 +void module_free_exec(struct module *mod, void *module_region);
83357 +#else
83358 +#define module_free_exec(x, y) module_free((x), (y))
83359 +#endif
83360 +
83361 /*
83362 * Apply the given relocation to the (simplified) ELF. Return -error
83363 * or 0.
83364 @@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
83365 unsigned int relsec,
83366 struct module *me)
83367 {
83368 +#ifdef CONFIG_MODULES
83369 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83370 module_name(me));
83371 +#endif
83372 return -ENOEXEC;
83373 }
83374 #endif
83375 @@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
83376 unsigned int relsec,
83377 struct module *me)
83378 {
83379 +#ifdef CONFIG_MODULES
83380 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83381 module_name(me));
83382 +#endif
83383 return -ENOEXEC;
83384 }
83385 #endif
83386 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
83387 index 1c9effa..1160bdd 100644
83388 --- a/include/linux/moduleparam.h
83389 +++ b/include/linux/moduleparam.h
83390 @@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
83391 * @len is usually just sizeof(string).
83392 */
83393 #define module_param_string(name, string, len, perm) \
83394 - static const struct kparam_string __param_string_##name \
83395 + static const struct kparam_string __param_string_##name __used \
83396 = { len, string }; \
83397 __module_param_call(MODULE_PARAM_PREFIX, name, \
83398 &param_ops_string, \
83399 @@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
83400 */
83401 #define module_param_array_named(name, array, type, nump, perm) \
83402 param_check_##type(name, &(array)[0]); \
83403 - static const struct kparam_array __param_arr_##name \
83404 + static const struct kparam_array __param_arr_##name __used \
83405 = { .max = ARRAY_SIZE(array), .num = nump, \
83406 .ops = &param_ops_##type, \
83407 .elemsize = sizeof(array[0]), .elem = array }; \
83408 diff --git a/include/linux/mount.h b/include/linux/mount.h
83409 index c2c561d..a5f2a8c 100644
83410 --- a/include/linux/mount.h
83411 +++ b/include/linux/mount.h
83412 @@ -66,7 +66,7 @@ struct vfsmount {
83413 struct dentry *mnt_root; /* root of the mounted tree */
83414 struct super_block *mnt_sb; /* pointer to superblock */
83415 int mnt_flags;
83416 -};
83417 +} __randomize_layout;
83418
83419 struct file; /* forward dec */
83420 struct path;
83421 diff --git a/include/linux/namei.h b/include/linux/namei.h
83422 index 492de72..1bddcd4 100644
83423 --- a/include/linux/namei.h
83424 +++ b/include/linux/namei.h
83425 @@ -19,7 +19,7 @@ struct nameidata {
83426 unsigned seq, m_seq;
83427 int last_type;
83428 unsigned depth;
83429 - char *saved_names[MAX_NESTED_LINKS + 1];
83430 + const char *saved_names[MAX_NESTED_LINKS + 1];
83431 };
83432
83433 /*
83434 @@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
83435
83436 extern void nd_jump_link(struct nameidata *nd, struct path *path);
83437
83438 -static inline void nd_set_link(struct nameidata *nd, char *path)
83439 +static inline void nd_set_link(struct nameidata *nd, const char *path)
83440 {
83441 nd->saved_names[nd->depth] = path;
83442 }
83443
83444 -static inline char *nd_get_link(struct nameidata *nd)
83445 +static inline const char *nd_get_link(const struct nameidata *nd)
83446 {
83447 return nd->saved_names[nd->depth];
83448 }
83449 diff --git a/include/linux/net.h b/include/linux/net.h
83450 index 17d8339..81656c0 100644
83451 --- a/include/linux/net.h
83452 +++ b/include/linux/net.h
83453 @@ -192,7 +192,7 @@ struct net_proto_family {
83454 int (*create)(struct net *net, struct socket *sock,
83455 int protocol, int kern);
83456 struct module *owner;
83457 -};
83458 +} __do_const;
83459
83460 struct iovec;
83461 struct kvec;
83462 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
83463 index 74fd5d3..86a1e4f 100644
83464 --- a/include/linux/netdevice.h
83465 +++ b/include/linux/netdevice.h
83466 @@ -1156,6 +1156,7 @@ struct net_device_ops {
83467 bool (*ndo_gso_check) (struct sk_buff *skb,
83468 struct net_device *dev);
83469 };
83470 +typedef struct net_device_ops __no_const net_device_ops_no_const;
83471
83472 /**
83473 * enum net_device_priv_flags - &struct net_device priv_flags
83474 @@ -1498,10 +1499,10 @@ struct net_device {
83475
83476 struct net_device_stats stats;
83477
83478 - atomic_long_t rx_dropped;
83479 - atomic_long_t tx_dropped;
83480 + atomic_long_unchecked_t rx_dropped;
83481 + atomic_long_unchecked_t tx_dropped;
83482
83483 - atomic_t carrier_changes;
83484 + atomic_unchecked_t carrier_changes;
83485
83486 #ifdef CONFIG_WIRELESS_EXT
83487 const struct iw_handler_def * wireless_handlers;
83488 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
83489 index 2517ece..0bbfcfb 100644
83490 --- a/include/linux/netfilter.h
83491 +++ b/include/linux/netfilter.h
83492 @@ -85,7 +85,7 @@ struct nf_sockopt_ops {
83493 #endif
83494 /* Use the module struct to lock set/get code in place */
83495 struct module *owner;
83496 -};
83497 +} __do_const;
83498
83499 /* Function to register/unregister hook points. */
83500 int nf_register_hook(struct nf_hook_ops *reg);
83501 diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
83502 index e955d47..04a5338 100644
83503 --- a/include/linux/netfilter/nfnetlink.h
83504 +++ b/include/linux/netfilter/nfnetlink.h
83505 @@ -19,7 +19,7 @@ struct nfnl_callback {
83506 const struct nlattr * const cda[]);
83507 const struct nla_policy *policy; /* netlink attribute policy */
83508 const u_int16_t attr_count; /* number of nlattr's */
83509 -};
83510 +} __do_const;
83511
83512 struct nfnetlink_subsystem {
83513 const char *name;
83514 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
83515 new file mode 100644
83516 index 0000000..33f4af8
83517 --- /dev/null
83518 +++ b/include/linux/netfilter/xt_gradm.h
83519 @@ -0,0 +1,9 @@
83520 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
83521 +#define _LINUX_NETFILTER_XT_GRADM_H 1
83522 +
83523 +struct xt_gradm_mtinfo {
83524 + __u16 flags;
83525 + __u16 invflags;
83526 +};
83527 +
83528 +#endif
83529 diff --git a/include/linux/nls.h b/include/linux/nls.h
83530 index 520681b..2b7fabb 100644
83531 --- a/include/linux/nls.h
83532 +++ b/include/linux/nls.h
83533 @@ -31,7 +31,7 @@ struct nls_table {
83534 const unsigned char *charset2upper;
83535 struct module *owner;
83536 struct nls_table *next;
83537 -};
83538 +} __do_const;
83539
83540 /* this value hold the maximum octet of charset */
83541 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
83542 @@ -46,7 +46,7 @@ enum utf16_endian {
83543 /* nls_base.c */
83544 extern int __register_nls(struct nls_table *, struct module *);
83545 extern int unregister_nls(struct nls_table *);
83546 -extern struct nls_table *load_nls(char *);
83547 +extern struct nls_table *load_nls(const char *);
83548 extern void unload_nls(struct nls_table *);
83549 extern struct nls_table *load_nls_default(void);
83550 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
83551 diff --git a/include/linux/notifier.h b/include/linux/notifier.h
83552 index d14a4c3..a078786 100644
83553 --- a/include/linux/notifier.h
83554 +++ b/include/linux/notifier.h
83555 @@ -54,7 +54,8 @@ struct notifier_block {
83556 notifier_fn_t notifier_call;
83557 struct notifier_block __rcu *next;
83558 int priority;
83559 -};
83560 +} __do_const;
83561 +typedef struct notifier_block __no_const notifier_block_no_const;
83562
83563 struct atomic_notifier_head {
83564 spinlock_t lock;
83565 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
83566 index b2a0f15..4d7da32 100644
83567 --- a/include/linux/oprofile.h
83568 +++ b/include/linux/oprofile.h
83569 @@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
83570 int oprofilefs_create_ro_ulong(struct dentry * root,
83571 char const * name, ulong * val);
83572
83573 -/** Create a file for read-only access to an atomic_t. */
83574 +/** Create a file for read-only access to an atomic_unchecked_t. */
83575 int oprofilefs_create_ro_atomic(struct dentry * root,
83576 - char const * name, atomic_t * val);
83577 + char const * name, atomic_unchecked_t * val);
83578
83579 /** create a directory */
83580 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
83581 diff --git a/include/linux/padata.h b/include/linux/padata.h
83582 index 4386946..f50c615 100644
83583 --- a/include/linux/padata.h
83584 +++ b/include/linux/padata.h
83585 @@ -129,7 +129,7 @@ struct parallel_data {
83586 struct padata_serial_queue __percpu *squeue;
83587 atomic_t reorder_objects;
83588 atomic_t refcnt;
83589 - atomic_t seq_nr;
83590 + atomic_unchecked_t seq_nr;
83591 struct padata_cpumask cpumask;
83592 spinlock_t lock ____cacheline_aligned;
83593 unsigned int processed;
83594 diff --git a/include/linux/path.h b/include/linux/path.h
83595 index d137218..be0c176 100644
83596 --- a/include/linux/path.h
83597 +++ b/include/linux/path.h
83598 @@ -1,13 +1,15 @@
83599 #ifndef _LINUX_PATH_H
83600 #define _LINUX_PATH_H
83601
83602 +#include <linux/compiler.h>
83603 +
83604 struct dentry;
83605 struct vfsmount;
83606
83607 struct path {
83608 struct vfsmount *mnt;
83609 struct dentry *dentry;
83610 -};
83611 +} __randomize_layout;
83612
83613 extern void path_get(const struct path *);
83614 extern void path_put(const struct path *);
83615 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
83616 index 2706ee9..e691f7c 100644
83617 --- a/include/linux/pci_hotplug.h
83618 +++ b/include/linux/pci_hotplug.h
83619 @@ -71,7 +71,8 @@ struct hotplug_slot_ops {
83620 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
83621 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
83622 int (*reset_slot) (struct hotplug_slot *slot, int probe);
83623 -};
83624 +} __do_const;
83625 +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
83626
83627 /**
83628 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
83629 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
83630 index 893a0d0..d5f996e 100644
83631 --- a/include/linux/perf_event.h
83632 +++ b/include/linux/perf_event.h
83633 @@ -341,8 +341,8 @@ struct perf_event {
83634
83635 enum perf_event_active_state state;
83636 unsigned int attach_state;
83637 - local64_t count;
83638 - atomic64_t child_count;
83639 + local64_t count; /* PaX: fix it one day */
83640 + atomic64_unchecked_t child_count;
83641
83642 /*
83643 * These are the total time in nanoseconds that the event
83644 @@ -393,8 +393,8 @@ struct perf_event {
83645 * These accumulate total time (in nanoseconds) that children
83646 * events have been enabled and running, respectively.
83647 */
83648 - atomic64_t child_total_time_enabled;
83649 - atomic64_t child_total_time_running;
83650 + atomic64_unchecked_t child_total_time_enabled;
83651 + atomic64_unchecked_t child_total_time_running;
83652
83653 /*
83654 * Protect attach/detach and child_list:
83655 @@ -734,7 +734,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
83656 entry->ip[entry->nr++] = ip;
83657 }
83658
83659 -extern int sysctl_perf_event_paranoid;
83660 +extern int sysctl_perf_event_legitimately_concerned;
83661 extern int sysctl_perf_event_mlock;
83662 extern int sysctl_perf_event_sample_rate;
83663 extern int sysctl_perf_cpu_time_max_percent;
83664 @@ -749,19 +749,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
83665 loff_t *ppos);
83666
83667
83668 +static inline bool perf_paranoid_any(void)
83669 +{
83670 + return sysctl_perf_event_legitimately_concerned > 2;
83671 +}
83672 +
83673 static inline bool perf_paranoid_tracepoint_raw(void)
83674 {
83675 - return sysctl_perf_event_paranoid > -1;
83676 + return sysctl_perf_event_legitimately_concerned > -1;
83677 }
83678
83679 static inline bool perf_paranoid_cpu(void)
83680 {
83681 - return sysctl_perf_event_paranoid > 0;
83682 + return sysctl_perf_event_legitimately_concerned > 0;
83683 }
83684
83685 static inline bool perf_paranoid_kernel(void)
83686 {
83687 - return sysctl_perf_event_paranoid > 1;
83688 + return sysctl_perf_event_legitimately_concerned > 1;
83689 }
83690
83691 extern void perf_event_init(void);
83692 @@ -892,7 +897,7 @@ struct perf_pmu_events_attr {
83693 struct device_attribute attr;
83694 u64 id;
83695 const char *event_str;
83696 -};
83697 +} __do_const;
83698
83699 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
83700 static struct perf_pmu_events_attr _var = { \
83701 diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
83702 index 1997ffc..4f1f44d 100644
83703 --- a/include/linux/pid_namespace.h
83704 +++ b/include/linux/pid_namespace.h
83705 @@ -44,7 +44,7 @@ struct pid_namespace {
83706 int hide_pid;
83707 int reboot; /* group exit code if this pidns was rebooted */
83708 unsigned int proc_inum;
83709 -};
83710 +} __randomize_layout;
83711
83712 extern struct pid_namespace init_pid_ns;
83713
83714 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
83715 index eb8b8ac..62649e1 100644
83716 --- a/include/linux/pipe_fs_i.h
83717 +++ b/include/linux/pipe_fs_i.h
83718 @@ -47,10 +47,10 @@ struct pipe_inode_info {
83719 struct mutex mutex;
83720 wait_queue_head_t wait;
83721 unsigned int nrbufs, curbuf, buffers;
83722 - unsigned int readers;
83723 - unsigned int writers;
83724 - unsigned int files;
83725 - unsigned int waiting_writers;
83726 + atomic_t readers;
83727 + atomic_t writers;
83728 + atomic_t files;
83729 + atomic_t waiting_writers;
83730 unsigned int r_counter;
83731 unsigned int w_counter;
83732 struct page *tmp_page;
83733 diff --git a/include/linux/pm.h b/include/linux/pm.h
83734 index 383fd68..7a11504 100644
83735 --- a/include/linux/pm.h
83736 +++ b/include/linux/pm.h
83737 @@ -621,6 +621,7 @@ struct dev_pm_domain {
83738 struct dev_pm_ops ops;
83739 void (*detach)(struct device *dev, bool power_off);
83740 };
83741 +typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
83742
83743 /*
83744 * The PM_EVENT_ messages are also used by drivers implementing the legacy
83745 diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
83746 index 2e0e06d..824cc9b 100644
83747 --- a/include/linux/pm_domain.h
83748 +++ b/include/linux/pm_domain.h
83749 @@ -36,11 +36,11 @@ struct gpd_dev_ops {
83750 int (*save_state)(struct device *dev);
83751 int (*restore_state)(struct device *dev);
83752 bool (*active_wakeup)(struct device *dev);
83753 -};
83754 +} __no_const;
83755
83756 struct gpd_cpuidle_data {
83757 unsigned int saved_exit_latency;
83758 - struct cpuidle_state *idle_state;
83759 + cpuidle_state_no_const *idle_state;
83760 };
83761
83762 struct generic_pm_domain {
83763 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
83764 index 367f49b..d2f5a14 100644
83765 --- a/include/linux/pm_runtime.h
83766 +++ b/include/linux/pm_runtime.h
83767 @@ -125,7 +125,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
83768
83769 static inline void pm_runtime_mark_last_busy(struct device *dev)
83770 {
83771 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
83772 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
83773 }
83774
83775 #else /* !CONFIG_PM_RUNTIME */
83776 diff --git a/include/linux/pnp.h b/include/linux/pnp.h
83777 index 195aafc..49a7bc2 100644
83778 --- a/include/linux/pnp.h
83779 +++ b/include/linux/pnp.h
83780 @@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
83781 struct pnp_fixup {
83782 char id[7];
83783 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
83784 -};
83785 +} __do_const;
83786
83787 /* config parameters */
83788 #define PNP_CONFIG_NORMAL 0x0001
83789 diff --git a/include/linux/poison.h b/include/linux/poison.h
83790 index 2110a81..13a11bb 100644
83791 --- a/include/linux/poison.h
83792 +++ b/include/linux/poison.h
83793 @@ -19,8 +19,8 @@
83794 * under normal circumstances, used to verify that nobody uses
83795 * non-initialized list entries.
83796 */
83797 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
83798 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
83799 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
83800 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
83801
83802 /********** include/linux/timer.h **********/
83803 /*
83804 diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
83805 index d8b187c3..9a9257a 100644
83806 --- a/include/linux/power/smartreflex.h
83807 +++ b/include/linux/power/smartreflex.h
83808 @@ -238,7 +238,7 @@ struct omap_sr_class_data {
83809 int (*notify)(struct omap_sr *sr, u32 status);
83810 u8 notify_flags;
83811 u8 class_type;
83812 -};
83813 +} __do_const;
83814
83815 /**
83816 * struct omap_sr_nvalue_table - Smartreflex n-target value info
83817 diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
83818 index 4ea1d37..80f4b33 100644
83819 --- a/include/linux/ppp-comp.h
83820 +++ b/include/linux/ppp-comp.h
83821 @@ -84,7 +84,7 @@ struct compressor {
83822 struct module *owner;
83823 /* Extra skb space needed by the compressor algorithm */
83824 unsigned int comp_extra;
83825 -};
83826 +} __do_const;
83827
83828 /*
83829 * The return value from decompress routine is the length of the
83830 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
83831 index de83b4e..c4b997d 100644
83832 --- a/include/linux/preempt.h
83833 +++ b/include/linux/preempt.h
83834 @@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
83835 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
83836 #endif
83837
83838 +#define raw_preempt_count_add(val) __preempt_count_add(val)
83839 +#define raw_preempt_count_sub(val) __preempt_count_sub(val)
83840 +
83841 #define __preempt_count_inc() __preempt_count_add(1)
83842 #define __preempt_count_dec() __preempt_count_sub(1)
83843
83844 #define preempt_count_inc() preempt_count_add(1)
83845 +#define raw_preempt_count_inc() raw_preempt_count_add(1)
83846 #define preempt_count_dec() preempt_count_sub(1)
83847 +#define raw_preempt_count_dec() raw_preempt_count_sub(1)
83848
83849 #ifdef CONFIG_PREEMPT_COUNT
83850
83851 @@ -41,6 +46,12 @@ do { \
83852 barrier(); \
83853 } while (0)
83854
83855 +#define raw_preempt_disable() \
83856 +do { \
83857 + raw_preempt_count_inc(); \
83858 + barrier(); \
83859 +} while (0)
83860 +
83861 #define sched_preempt_enable_no_resched() \
83862 do { \
83863 barrier(); \
83864 @@ -49,6 +60,12 @@ do { \
83865
83866 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
83867
83868 +#define raw_preempt_enable_no_resched() \
83869 +do { \
83870 + barrier(); \
83871 + raw_preempt_count_dec(); \
83872 +} while (0)
83873 +
83874 #ifdef CONFIG_PREEMPT
83875 #define preempt_enable() \
83876 do { \
83877 @@ -113,8 +130,10 @@ do { \
83878 * region.
83879 */
83880 #define preempt_disable() barrier()
83881 +#define raw_preempt_disable() barrier()
83882 #define sched_preempt_enable_no_resched() barrier()
83883 #define preempt_enable_no_resched() barrier()
83884 +#define raw_preempt_enable_no_resched() barrier()
83885 #define preempt_enable() barrier()
83886 #define preempt_check_resched() do { } while (0)
83887
83888 @@ -128,11 +147,13 @@ do { \
83889 /*
83890 * Modules have no business playing preemption tricks.
83891 */
83892 +#ifndef CONFIG_PAX_KERNEXEC
83893 #undef sched_preempt_enable_no_resched
83894 #undef preempt_enable_no_resched
83895 #undef preempt_enable_no_resched_notrace
83896 #undef preempt_check_resched
83897 #endif
83898 +#endif
83899
83900 #define preempt_set_need_resched() \
83901 do { \
83902 diff --git a/include/linux/printk.h b/include/linux/printk.h
83903 index d78125f..7f36596 100644
83904 --- a/include/linux/printk.h
83905 +++ b/include/linux/printk.h
83906 @@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold
83907 void early_printk(const char *s, ...) { }
83908 #endif
83909
83910 +extern int kptr_restrict;
83911 +
83912 #ifdef CONFIG_PRINTK
83913 asmlinkage __printf(5, 0)
83914 int vprintk_emit(int facility, int level,
83915 @@ -158,7 +160,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
83916
83917 extern int printk_delay_msec;
83918 extern int dmesg_restrict;
83919 -extern int kptr_restrict;
83920
83921 extern void wake_up_klogd(void);
83922
83923 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
83924 index b97bf2e..f14c92d4 100644
83925 --- a/include/linux/proc_fs.h
83926 +++ b/include/linux/proc_fs.h
83927 @@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
83928 extern struct proc_dir_entry *proc_symlink(const char *,
83929 struct proc_dir_entry *, const char *);
83930 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
83931 +extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
83932 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
83933 struct proc_dir_entry *, void *);
83934 +extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
83935 + struct proc_dir_entry *, void *);
83936 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
83937 struct proc_dir_entry *);
83938
83939 @@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
83940 return proc_create_data(name, mode, parent, proc_fops, NULL);
83941 }
83942
83943 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
83944 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
83945 +{
83946 +#ifdef CONFIG_GRKERNSEC_PROC_USER
83947 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
83948 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
83949 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
83950 +#else
83951 + return proc_create_data(name, mode, parent, proc_fops, NULL);
83952 +#endif
83953 +}
83954 +
83955 +
83956 extern void proc_set_size(struct proc_dir_entry *, loff_t);
83957 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
83958 extern void *PDE_DATA(const struct inode *);
83959 @@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
83960 struct proc_dir_entry *parent,const char *dest) { return NULL;}
83961 static inline struct proc_dir_entry *proc_mkdir(const char *name,
83962 struct proc_dir_entry *parent) {return NULL;}
83963 +static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
83964 + struct proc_dir_entry *parent) { return NULL; }
83965 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
83966 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83967 +static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
83968 + umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83969 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
83970 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
83971 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
83972 @@ -79,7 +99,7 @@ struct net;
83973 static inline struct proc_dir_entry *proc_net_mkdir(
83974 struct net *net, const char *name, struct proc_dir_entry *parent)
83975 {
83976 - return proc_mkdir_data(name, 0, parent, net);
83977 + return proc_mkdir_data_restrict(name, 0, parent, net);
83978 }
83979
83980 #endif /* _LINUX_PROC_FS_H */
83981 diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
83982 index 34a1e10..70f6bde 100644
83983 --- a/include/linux/proc_ns.h
83984 +++ b/include/linux/proc_ns.h
83985 @@ -14,7 +14,7 @@ struct proc_ns_operations {
83986 void (*put)(void *ns);
83987 int (*install)(struct nsproxy *nsproxy, void *ns);
83988 unsigned int (*inum)(void *ns);
83989 -};
83990 +} __do_const __randomize_layout;
83991
83992 struct proc_ns {
83993 void *ns;
83994 diff --git a/include/linux/quota.h b/include/linux/quota.h
83995 index 80d345a..9e89a9a 100644
83996 --- a/include/linux/quota.h
83997 +++ b/include/linux/quota.h
83998 @@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
83999
84000 extern bool qid_eq(struct kqid left, struct kqid right);
84001 extern bool qid_lt(struct kqid left, struct kqid right);
84002 -extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
84003 +extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
84004 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
84005 extern bool qid_valid(struct kqid qid);
84006
84007 diff --git a/include/linux/random.h b/include/linux/random.h
84008 index b05856e..0a9f14e 100644
84009 --- a/include/linux/random.h
84010 +++ b/include/linux/random.h
84011 @@ -9,9 +9,19 @@
84012 #include <uapi/linux/random.h>
84013
84014 extern void add_device_randomness(const void *, unsigned int);
84015 +
84016 +static inline void add_latent_entropy(void)
84017 +{
84018 +
84019 +#ifdef LATENT_ENTROPY_PLUGIN
84020 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
84021 +#endif
84022 +
84023 +}
84024 +
84025 extern void add_input_randomness(unsigned int type, unsigned int code,
84026 - unsigned int value);
84027 -extern void add_interrupt_randomness(int irq, int irq_flags);
84028 + unsigned int value) __latent_entropy;
84029 +extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
84030
84031 extern void get_random_bytes(void *buf, int nbytes);
84032 extern void get_random_bytes_arch(void *buf, int nbytes);
84033 @@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
84034 extern const struct file_operations random_fops, urandom_fops;
84035 #endif
84036
84037 -unsigned int get_random_int(void);
84038 +unsigned int __intentional_overflow(-1) get_random_int(void);
84039 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
84040
84041 -u32 prandom_u32(void);
84042 +u32 prandom_u32(void) __intentional_overflow(-1);
84043 void prandom_bytes(void *buf, size_t nbytes);
84044 void prandom_seed(u32 seed);
84045 void prandom_reseed_late(void);
84046 @@ -37,6 +47,11 @@ struct rnd_state {
84047 u32 prandom_u32_state(struct rnd_state *state);
84048 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84049
84050 +static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
84051 +{
84052 + return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
84053 +}
84054 +
84055 /**
84056 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
84057 * @ep_ro: right open interval endpoint
84058 @@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84059 *
84060 * Returns: pseudo-random number in interval [0, ep_ro)
84061 */
84062 -static inline u32 prandom_u32_max(u32 ep_ro)
84063 +static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
84064 {
84065 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
84066 }
84067 diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
84068 index 378c5ee..aa84a47 100644
84069 --- a/include/linux/rbtree_augmented.h
84070 +++ b/include/linux/rbtree_augmented.h
84071 @@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
84072 old->rbaugmented = rbcompute(old); \
84073 } \
84074 rbstatic const struct rb_augment_callbacks rbname = { \
84075 - rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
84076 + .propagate = rbname ## _propagate, \
84077 + .copy = rbname ## _copy, \
84078 + .rotate = rbname ## _rotate \
84079 };
84080
84081
84082 diff --git a/include/linux/rculist.h b/include/linux/rculist.h
84083 index 372ad5e..d4373f8 100644
84084 --- a/include/linux/rculist.h
84085 +++ b/include/linux/rculist.h
84086 @@ -29,8 +29,8 @@
84087 */
84088 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
84089 {
84090 - ACCESS_ONCE(list->next) = list;
84091 - ACCESS_ONCE(list->prev) = list;
84092 + ACCESS_ONCE_RW(list->next) = list;
84093 + ACCESS_ONCE_RW(list->prev) = list;
84094 }
84095
84096 /*
84097 @@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
84098 struct list_head *prev, struct list_head *next);
84099 #endif
84100
84101 +void __pax_list_add_rcu(struct list_head *new,
84102 + struct list_head *prev, struct list_head *next);
84103 +
84104 /**
84105 * list_add_rcu - add a new entry to rcu-protected list
84106 * @new: new entry to be added
84107 @@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
84108 __list_add_rcu(new, head, head->next);
84109 }
84110
84111 +static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
84112 +{
84113 + __pax_list_add_rcu(new, head, head->next);
84114 +}
84115 +
84116 /**
84117 * list_add_tail_rcu - add a new entry to rcu-protected list
84118 * @new: new entry to be added
84119 @@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
84120 __list_add_rcu(new, head->prev, head);
84121 }
84122
84123 +static inline void pax_list_add_tail_rcu(struct list_head *new,
84124 + struct list_head *head)
84125 +{
84126 + __pax_list_add_rcu(new, head->prev, head);
84127 +}
84128 +
84129 /**
84130 * list_del_rcu - deletes entry from list without re-initialization
84131 * @entry: the element to delete from the list.
84132 @@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
84133 entry->prev = LIST_POISON2;
84134 }
84135
84136 +extern void pax_list_del_rcu(struct list_head *entry);
84137 +
84138 /**
84139 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
84140 * @n: the element to delete from the hash list.
84141 diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
84142 index 53ff1a7..c40f0ab 100644
84143 --- a/include/linux/rcupdate.h
84144 +++ b/include/linux/rcupdate.h
84145 @@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
84146 #define rcu_note_voluntary_context_switch(t) \
84147 do { \
84148 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
84149 - ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
84150 + ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
84151 } while (0)
84152 #else /* #ifdef CONFIG_TASKS_RCU */
84153 #define TASKS_RCU(x) do { } while (0)
84154 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
84155 index 67fc8fc..a90f7d8 100644
84156 --- a/include/linux/reboot.h
84157 +++ b/include/linux/reboot.h
84158 @@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
84159 */
84160
84161 extern void migrate_to_reboot_cpu(void);
84162 -extern void machine_restart(char *cmd);
84163 -extern void machine_halt(void);
84164 -extern void machine_power_off(void);
84165 +extern void machine_restart(char *cmd) __noreturn;
84166 +extern void machine_halt(void) __noreturn;
84167 +extern void machine_power_off(void) __noreturn;
84168
84169 extern void machine_shutdown(void);
84170 struct pt_regs;
84171 @@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
84172 */
84173
84174 extern void kernel_restart_prepare(char *cmd);
84175 -extern void kernel_restart(char *cmd);
84176 -extern void kernel_halt(void);
84177 -extern void kernel_power_off(void);
84178 +extern void kernel_restart(char *cmd) __noreturn;
84179 +extern void kernel_halt(void) __noreturn;
84180 +extern void kernel_power_off(void) __noreturn;
84181
84182 extern int C_A_D; /* for sysctl */
84183 void ctrl_alt_del(void);
84184 @@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
84185 * Emergency restart, callable from an interrupt handler.
84186 */
84187
84188 -extern void emergency_restart(void);
84189 +extern void emergency_restart(void) __noreturn;
84190 #include <asm/emergency-restart.h>
84191
84192 #endif /* _LINUX_REBOOT_H */
84193 diff --git a/include/linux/regset.h b/include/linux/regset.h
84194 index 8e0c9fe..ac4d221 100644
84195 --- a/include/linux/regset.h
84196 +++ b/include/linux/regset.h
84197 @@ -161,7 +161,8 @@ struct user_regset {
84198 unsigned int align;
84199 unsigned int bias;
84200 unsigned int core_note_type;
84201 -};
84202 +} __do_const;
84203 +typedef struct user_regset __no_const user_regset_no_const;
84204
84205 /**
84206 * struct user_regset_view - available regsets
84207 diff --git a/include/linux/relay.h b/include/linux/relay.h
84208 index d7c8359..818daf5 100644
84209 --- a/include/linux/relay.h
84210 +++ b/include/linux/relay.h
84211 @@ -157,7 +157,7 @@ struct rchan_callbacks
84212 * The callback should return 0 if successful, negative if not.
84213 */
84214 int (*remove_buf_file)(struct dentry *dentry);
84215 -};
84216 +} __no_const;
84217
84218 /*
84219 * CONFIG_RELAY kernel API, kernel/relay.c
84220 diff --git a/include/linux/rio.h b/include/linux/rio.h
84221 index 6bda06f..bf39a9b 100644
84222 --- a/include/linux/rio.h
84223 +++ b/include/linux/rio.h
84224 @@ -358,7 +358,7 @@ struct rio_ops {
84225 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
84226 u64 rstart, u32 size, u32 flags);
84227 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
84228 -};
84229 +} __no_const;
84230
84231 #define RIO_RESOURCE_MEM 0x00000100
84232 #define RIO_RESOURCE_DOORBELL 0x00000200
84233 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
84234 index c0c2bce..4813524 100644
84235 --- a/include/linux/rmap.h
84236 +++ b/include/linux/rmap.h
84237 @@ -144,8 +144,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
84238 void anon_vma_init(void); /* create anon_vma_cachep */
84239 int anon_vma_prepare(struct vm_area_struct *);
84240 void unlink_anon_vmas(struct vm_area_struct *);
84241 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
84242 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
84243 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
84244 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
84245
84246 static inline void anon_vma_merge(struct vm_area_struct *vma,
84247 struct vm_area_struct *next)
84248 diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
84249 index ed8f9e7..999bc96 100644
84250 --- a/include/linux/scatterlist.h
84251 +++ b/include/linux/scatterlist.h
84252 @@ -1,6 +1,7 @@
84253 #ifndef _LINUX_SCATTERLIST_H
84254 #define _LINUX_SCATTERLIST_H
84255
84256 +#include <linux/sched.h>
84257 #include <linux/string.h>
84258 #include <linux/bug.h>
84259 #include <linux/mm.h>
84260 @@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
84261 #ifdef CONFIG_DEBUG_SG
84262 BUG_ON(!virt_addr_valid(buf));
84263 #endif
84264 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84265 + if (object_starts_on_stack(buf)) {
84266 + void *adjbuf = buf - current->stack + current->lowmem_stack;
84267 + sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
84268 + } else
84269 +#endif
84270 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
84271 }
84272
84273 diff --git a/include/linux/sched.h b/include/linux/sched.h
84274 index 5e344bb..0743255 100644
84275 --- a/include/linux/sched.h
84276 +++ b/include/linux/sched.h
84277 @@ -133,6 +133,7 @@ struct fs_struct;
84278 struct perf_event_context;
84279 struct blk_plug;
84280 struct filename;
84281 +struct linux_binprm;
84282
84283 #define VMACACHE_BITS 2
84284 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
84285 @@ -376,7 +377,7 @@ extern char __sched_text_start[], __sched_text_end[];
84286 extern int in_sched_functions(unsigned long addr);
84287
84288 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
84289 -extern signed long schedule_timeout(signed long timeout);
84290 +extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
84291 extern signed long schedule_timeout_interruptible(signed long timeout);
84292 extern signed long schedule_timeout_killable(signed long timeout);
84293 extern signed long schedule_timeout_uninterruptible(signed long timeout);
84294 @@ -387,6 +388,19 @@ struct nsproxy;
84295 struct user_namespace;
84296
84297 #ifdef CONFIG_MMU
84298 +
84299 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
84300 +extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
84301 +#else
84302 +static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
84303 +{
84304 + return 0;
84305 +}
84306 +#endif
84307 +
84308 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
84309 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
84310 +
84311 extern void arch_pick_mmap_layout(struct mm_struct *mm);
84312 extern unsigned long
84313 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
84314 @@ -685,6 +699,17 @@ struct signal_struct {
84315 #ifdef CONFIG_TASKSTATS
84316 struct taskstats *stats;
84317 #endif
84318 +
84319 +#ifdef CONFIG_GRKERNSEC
84320 + u32 curr_ip;
84321 + u32 saved_ip;
84322 + u32 gr_saddr;
84323 + u32 gr_daddr;
84324 + u16 gr_sport;
84325 + u16 gr_dport;
84326 + u8 used_accept:1;
84327 +#endif
84328 +
84329 #ifdef CONFIG_AUDIT
84330 unsigned audit_tty;
84331 unsigned audit_tty_log_passwd;
84332 @@ -711,7 +736,7 @@ struct signal_struct {
84333 struct mutex cred_guard_mutex; /* guard against foreign influences on
84334 * credential calculations
84335 * (notably. ptrace) */
84336 -};
84337 +} __randomize_layout;
84338
84339 /*
84340 * Bits in flags field of signal_struct.
84341 @@ -764,6 +789,14 @@ struct user_struct {
84342 struct key *session_keyring; /* UID's default session keyring */
84343 #endif
84344
84345 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
84346 + unsigned char kernel_banned;
84347 +#endif
84348 +#ifdef CONFIG_GRKERNSEC_BRUTE
84349 + unsigned char suid_banned;
84350 + unsigned long suid_ban_expires;
84351 +#endif
84352 +
84353 /* Hash table maintenance information */
84354 struct hlist_node uidhash_node;
84355 kuid_t uid;
84356 @@ -771,7 +804,7 @@ struct user_struct {
84357 #ifdef CONFIG_PERF_EVENTS
84358 atomic_long_t locked_vm;
84359 #endif
84360 -};
84361 +} __randomize_layout;
84362
84363 extern int uids_sysfs_init(void);
84364
84365 @@ -1235,6 +1268,9 @@ enum perf_event_task_context {
84366 struct task_struct {
84367 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
84368 void *stack;
84369 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84370 + void *lowmem_stack;
84371 +#endif
84372 atomic_t usage;
84373 unsigned int flags; /* per process flags, defined below */
84374 unsigned int ptrace;
84375 @@ -1362,8 +1398,8 @@ struct task_struct {
84376 struct list_head thread_node;
84377
84378 struct completion *vfork_done; /* for vfork() */
84379 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
84380 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84381 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
84382 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84383
84384 cputime_t utime, stime, utimescaled, stimescaled;
84385 cputime_t gtime;
84386 @@ -1388,11 +1424,6 @@ struct task_struct {
84387 struct task_cputime cputime_expires;
84388 struct list_head cpu_timers[3];
84389
84390 -/* process credentials */
84391 - const struct cred __rcu *real_cred; /* objective and real subjective task
84392 - * credentials (COW) */
84393 - const struct cred __rcu *cred; /* effective (overridable) subjective task
84394 - * credentials (COW) */
84395 char comm[TASK_COMM_LEN]; /* executable name excluding path
84396 - access with [gs]et_task_comm (which lock
84397 it with task_lock())
84398 @@ -1410,6 +1441,10 @@ struct task_struct {
84399 #endif
84400 /* CPU-specific state of this task */
84401 struct thread_struct thread;
84402 +/* thread_info moved to task_struct */
84403 +#ifdef CONFIG_X86
84404 + struct thread_info tinfo;
84405 +#endif
84406 /* filesystem information */
84407 struct fs_struct *fs;
84408 /* open file information */
84409 @@ -1484,6 +1519,10 @@ struct task_struct {
84410 gfp_t lockdep_reclaim_gfp;
84411 #endif
84412
84413 +/* process credentials */
84414 + const struct cred __rcu *real_cred; /* objective and real subjective task
84415 + * credentials (COW) */
84416 +
84417 /* journalling filesystem info */
84418 void *journal_info;
84419
84420 @@ -1522,6 +1561,10 @@ struct task_struct {
84421 /* cg_list protected by css_set_lock and tsk->alloc_lock */
84422 struct list_head cg_list;
84423 #endif
84424 +
84425 + const struct cred __rcu *cred; /* effective (overridable) subjective task
84426 + * credentials (COW) */
84427 +
84428 #ifdef CONFIG_FUTEX
84429 struct robust_list_head __user *robust_list;
84430 #ifdef CONFIG_COMPAT
84431 @@ -1635,7 +1678,7 @@ struct task_struct {
84432 * Number of functions that haven't been traced
84433 * because of depth overrun.
84434 */
84435 - atomic_t trace_overrun;
84436 + atomic_unchecked_t trace_overrun;
84437 /* Pause for the tracing */
84438 atomic_t tracing_graph_pause;
84439 #endif
84440 @@ -1661,7 +1704,78 @@ struct task_struct {
84441 unsigned int sequential_io;
84442 unsigned int sequential_io_avg;
84443 #endif
84444 -};
84445 +
84446 +#ifdef CONFIG_GRKERNSEC
84447 + /* grsecurity */
84448 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84449 + u64 exec_id;
84450 +#endif
84451 +#ifdef CONFIG_GRKERNSEC_SETXID
84452 + const struct cred *delayed_cred;
84453 +#endif
84454 + struct dentry *gr_chroot_dentry;
84455 + struct acl_subject_label *acl;
84456 + struct acl_subject_label *tmpacl;
84457 + struct acl_role_label *role;
84458 + struct file *exec_file;
84459 + unsigned long brute_expires;
84460 + u16 acl_role_id;
84461 + u8 inherited;
84462 + /* is this the task that authenticated to the special role */
84463 + u8 acl_sp_role;
84464 + u8 is_writable;
84465 + u8 brute;
84466 + u8 gr_is_chrooted;
84467 +#endif
84468 +
84469 +} __randomize_layout;
84470 +
84471 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
84472 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
84473 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
84474 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
84475 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
84476 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
84477 +
84478 +#ifdef CONFIG_PAX_SOFTMODE
84479 +extern int pax_softmode;
84480 +#endif
84481 +
84482 +extern int pax_check_flags(unsigned long *);
84483 +#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
84484 +
84485 +/* if tsk != current then task_lock must be held on it */
84486 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84487 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
84488 +{
84489 + if (likely(tsk->mm))
84490 + return tsk->mm->pax_flags;
84491 + else
84492 + return 0UL;
84493 +}
84494 +
84495 +/* if tsk != current then task_lock must be held on it */
84496 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
84497 +{
84498 + if (likely(tsk->mm)) {
84499 + tsk->mm->pax_flags = flags;
84500 + return 0;
84501 + }
84502 + return -EINVAL;
84503 +}
84504 +#endif
84505 +
84506 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84507 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
84508 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
84509 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
84510 +#endif
84511 +
84512 +struct path;
84513 +extern char *pax_get_path(const struct path *path, char *buf, int buflen);
84514 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
84515 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
84516 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
84517
84518 /* Future-safe accessor for struct task_struct's cpus_allowed. */
84519 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
84520 @@ -1743,7 +1857,7 @@ struct pid_namespace;
84521 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
84522 struct pid_namespace *ns);
84523
84524 -static inline pid_t task_pid_nr(struct task_struct *tsk)
84525 +static inline pid_t task_pid_nr(const struct task_struct *tsk)
84526 {
84527 return tsk->pid;
84528 }
84529 @@ -2106,6 +2220,25 @@ extern u64 sched_clock_cpu(int cpu);
84530
84531 extern void sched_clock_init(void);
84532
84533 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84534 +static inline void populate_stack(void)
84535 +{
84536 + struct task_struct *curtask = current;
84537 + int c;
84538 + int *ptr = curtask->stack;
84539 + int *end = curtask->stack + THREAD_SIZE;
84540 +
84541 + while (ptr < end) {
84542 + c = *(volatile int *)ptr;
84543 + ptr += PAGE_SIZE/sizeof(int);
84544 + }
84545 +}
84546 +#else
84547 +static inline void populate_stack(void)
84548 +{
84549 +}
84550 +#endif
84551 +
84552 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
84553 static inline void sched_clock_tick(void)
84554 {
84555 @@ -2239,7 +2372,9 @@ void yield(void);
84556 extern struct exec_domain default_exec_domain;
84557
84558 union thread_union {
84559 +#ifndef CONFIG_X86
84560 struct thread_info thread_info;
84561 +#endif
84562 unsigned long stack[THREAD_SIZE/sizeof(long)];
84563 };
84564
84565 @@ -2272,6 +2407,7 @@ extern struct pid_namespace init_pid_ns;
84566 */
84567
84568 extern struct task_struct *find_task_by_vpid(pid_t nr);
84569 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
84570 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
84571 struct pid_namespace *ns);
84572
84573 @@ -2436,7 +2572,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
84574 extern void exit_itimers(struct signal_struct *);
84575 extern void flush_itimer_signals(void);
84576
84577 -extern void do_group_exit(int);
84578 +extern __noreturn void do_group_exit(int);
84579
84580 extern int do_execve(struct filename *,
84581 const char __user * const __user *,
84582 @@ -2653,9 +2789,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
84583 #define task_stack_end_corrupted(task) \
84584 (*(end_of_stack(task)) != STACK_END_MAGIC)
84585
84586 -static inline int object_is_on_stack(void *obj)
84587 +static inline int object_starts_on_stack(const void *obj)
84588 {
84589 - void *stack = task_stack_page(current);
84590 + const void *stack = task_stack_page(current);
84591
84592 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
84593 }
84594 diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
84595 index 596a0e0..bea77ec 100644
84596 --- a/include/linux/sched/sysctl.h
84597 +++ b/include/linux/sched/sysctl.h
84598 @@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
84599 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
84600
84601 extern int sysctl_max_map_count;
84602 +extern unsigned long sysctl_heap_stack_gap;
84603
84604 extern unsigned int sysctl_sched_latency;
84605 extern unsigned int sysctl_sched_min_granularity;
84606 diff --git a/include/linux/security.h b/include/linux/security.h
84607 index ba96471..74fb3f6 100644
84608 --- a/include/linux/security.h
84609 +++ b/include/linux/security.h
84610 @@ -27,6 +27,7 @@
84611 #include <linux/slab.h>
84612 #include <linux/err.h>
84613 #include <linux/string.h>
84614 +#include <linux/grsecurity.h>
84615
84616 struct linux_binprm;
84617 struct cred;
84618 @@ -116,8 +117,6 @@ struct seq_file;
84619
84620 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
84621
84622 -void reset_security_ops(void);
84623 -
84624 #ifdef CONFIG_MMU
84625 extern unsigned long mmap_min_addr;
84626 extern unsigned long dac_mmap_min_addr;
84627 @@ -1729,7 +1728,7 @@ struct security_operations {
84628 struct audit_context *actx);
84629 void (*audit_rule_free) (void *lsmrule);
84630 #endif /* CONFIG_AUDIT */
84631 -};
84632 +} __randomize_layout;
84633
84634 /* prototypes */
84635 extern int security_init(void);
84636 diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
84637 index dc368b8..e895209 100644
84638 --- a/include/linux/semaphore.h
84639 +++ b/include/linux/semaphore.h
84640 @@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
84641 }
84642
84643 extern void down(struct semaphore *sem);
84644 -extern int __must_check down_interruptible(struct semaphore *sem);
84645 +extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
84646 extern int __must_check down_killable(struct semaphore *sem);
84647 extern int __must_check down_trylock(struct semaphore *sem);
84648 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
84649 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
84650 index 52e0097..383f21d 100644
84651 --- a/include/linux/seq_file.h
84652 +++ b/include/linux/seq_file.h
84653 @@ -27,6 +27,9 @@ struct seq_file {
84654 struct mutex lock;
84655 const struct seq_operations *op;
84656 int poll_event;
84657 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84658 + u64 exec_id;
84659 +#endif
84660 #ifdef CONFIG_USER_NS
84661 struct user_namespace *user_ns;
84662 #endif
84663 @@ -39,6 +42,7 @@ struct seq_operations {
84664 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
84665 int (*show) (struct seq_file *m, void *v);
84666 };
84667 +typedef struct seq_operations __no_const seq_operations_no_const;
84668
84669 #define SEQ_SKIP 1
84670
84671 @@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
84672
84673 char *mangle_path(char *s, const char *p, const char *esc);
84674 int seq_open(struct file *, const struct seq_operations *);
84675 +int seq_open_restrict(struct file *, const struct seq_operations *);
84676 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
84677 loff_t seq_lseek(struct file *, loff_t, int);
84678 int seq_release(struct inode *, struct file *);
84679 @@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
84680 }
84681
84682 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
84683 +int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
84684 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
84685 int single_release(struct inode *, struct file *);
84686 void *__seq_open_private(struct file *, const struct seq_operations *, int);
84687 diff --git a/include/linux/shm.h b/include/linux/shm.h
84688 index 6fb8016..ab4465e 100644
84689 --- a/include/linux/shm.h
84690 +++ b/include/linux/shm.h
84691 @@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
84692 /* The task created the shm object. NULL if the task is dead. */
84693 struct task_struct *shm_creator;
84694 struct list_head shm_clist; /* list by creator */
84695 +#ifdef CONFIG_GRKERNSEC
84696 + u64 shm_createtime;
84697 + pid_t shm_lapid;
84698 +#endif
84699 };
84700
84701 /* shm_mode upper byte flags */
84702 diff --git a/include/linux/signal.h b/include/linux/signal.h
84703 index ab1e039..ad4229e 100644
84704 --- a/include/linux/signal.h
84705 +++ b/include/linux/signal.h
84706 @@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
84707 * know it'll be handled, so that they don't get converted to
84708 * SIGKILL or just silently dropped.
84709 */
84710 - kernel_sigaction(sig, (__force __sighandler_t)2);
84711 + kernel_sigaction(sig, (__force_user __sighandler_t)2);
84712 }
84713
84714 static inline void disallow_signal(int sig)
84715 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
84716 index 6c8b6f6..5a0f4bd 100644
84717 --- a/include/linux/skbuff.h
84718 +++ b/include/linux/skbuff.h
84719 @@ -773,7 +773,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
84720 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
84721 int node);
84722 struct sk_buff *build_skb(void *data, unsigned int frag_size);
84723 -static inline struct sk_buff *alloc_skb(unsigned int size,
84724 +static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
84725 gfp_t priority)
84726 {
84727 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
84728 @@ -1962,7 +1962,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
84729 return skb->inner_transport_header - skb->inner_network_header;
84730 }
84731
84732 -static inline int skb_network_offset(const struct sk_buff *skb)
84733 +static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
84734 {
84735 return skb_network_header(skb) - skb->data;
84736 }
84737 @@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
84738 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
84739 */
84740 #ifndef NET_SKB_PAD
84741 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
84742 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
84743 #endif
84744
84745 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
84746 @@ -2629,7 +2629,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
84747 int *err);
84748 unsigned int datagram_poll(struct file *file, struct socket *sock,
84749 struct poll_table_struct *wait);
84750 -int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84751 +int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84752 struct iovec *to, int size);
84753 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
84754 struct iovec *iov);
84755 @@ -3091,6 +3091,9 @@ static inline void nf_reset(struct sk_buff *skb)
84756 nf_bridge_put(skb->nf_bridge);
84757 skb->nf_bridge = NULL;
84758 #endif
84759 +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
84760 + skb->nf_trace = 0;
84761 +#endif
84762 }
84763
84764 static inline void nf_reset_trace(struct sk_buff *skb)
84765 diff --git a/include/linux/slab.h b/include/linux/slab.h
84766 index c265bec..4867d28 100644
84767 --- a/include/linux/slab.h
84768 +++ b/include/linux/slab.h
84769 @@ -14,15 +14,29 @@
84770 #include <linux/gfp.h>
84771 #include <linux/types.h>
84772 #include <linux/workqueue.h>
84773 -
84774 +#include <linux/err.h>
84775
84776 /*
84777 * Flags to pass to kmem_cache_create().
84778 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
84779 */
84780 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
84781 +
84782 +#ifdef CONFIG_PAX_USERCOPY_SLABS
84783 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
84784 +#else
84785 +#define SLAB_USERCOPY 0x00000000UL
84786 +#endif
84787 +
84788 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
84789 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
84790 +
84791 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
84792 +#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
84793 +#else
84794 +#define SLAB_NO_SANITIZE 0x00000000UL
84795 +#endif
84796 +
84797 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
84798 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
84799 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
84800 @@ -98,10 +112,13 @@
84801 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
84802 * Both make kfree a no-op.
84803 */
84804 -#define ZERO_SIZE_PTR ((void *)16)
84805 +#define ZERO_SIZE_PTR \
84806 +({ \
84807 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
84808 + (void *)(-MAX_ERRNO-1L); \
84809 +})
84810
84811 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
84812 - (unsigned long)ZERO_SIZE_PTR)
84813 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
84814
84815 #include <linux/kmemleak.h>
84816
84817 @@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
84818 void kfree(const void *);
84819 void kzfree(const void *);
84820 size_t ksize(const void *);
84821 +const char *check_heap_object(const void *ptr, unsigned long n);
84822 +bool is_usercopy_object(const void *ptr);
84823
84824 /*
84825 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
84826 @@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
84827 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84828 #endif
84829
84830 +#ifdef CONFIG_PAX_USERCOPY_SLABS
84831 +extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
84832 +#endif
84833 +
84834 /*
84835 * Figure out which kmalloc slab an allocation of a certain size
84836 * belongs to.
84837 @@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84838 * 2 = 120 .. 192 bytes
84839 * n = 2^(n-1) .. 2^n -1
84840 */
84841 -static __always_inline int kmalloc_index(size_t size)
84842 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
84843 {
84844 if (!size)
84845 return 0;
84846 @@ -287,11 +310,11 @@ static __always_inline int kmalloc_index(size_t size)
84847 }
84848 #endif /* !CONFIG_SLOB */
84849
84850 -void *__kmalloc(size_t size, gfp_t flags);
84851 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
84852 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
84853
84854 #ifdef CONFIG_NUMA
84855 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
84856 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
84857 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
84858 #else
84859 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
84860 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
84861 index b869d16..1453c73 100644
84862 --- a/include/linux/slab_def.h
84863 +++ b/include/linux/slab_def.h
84864 @@ -40,7 +40,7 @@ struct kmem_cache {
84865 /* 4) cache creation/removal */
84866 const char *name;
84867 struct list_head list;
84868 - int refcount;
84869 + atomic_t refcount;
84870 int object_size;
84871 int align;
84872
84873 @@ -56,10 +56,14 @@ struct kmem_cache {
84874 unsigned long node_allocs;
84875 unsigned long node_frees;
84876 unsigned long node_overflow;
84877 - atomic_t allochit;
84878 - atomic_t allocmiss;
84879 - atomic_t freehit;
84880 - atomic_t freemiss;
84881 + atomic_unchecked_t allochit;
84882 + atomic_unchecked_t allocmiss;
84883 + atomic_unchecked_t freehit;
84884 + atomic_unchecked_t freemiss;
84885 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
84886 + atomic_unchecked_t sanitized;
84887 + atomic_unchecked_t not_sanitized;
84888 +#endif
84889
84890 /*
84891 * If debugging is enabled, then the allocator can add additional
84892 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
84893 index d82abd4..408c3a0 100644
84894 --- a/include/linux/slub_def.h
84895 +++ b/include/linux/slub_def.h
84896 @@ -74,7 +74,7 @@ struct kmem_cache {
84897 struct kmem_cache_order_objects max;
84898 struct kmem_cache_order_objects min;
84899 gfp_t allocflags; /* gfp flags to use on each alloc */
84900 - int refcount; /* Refcount for slab cache destroy */
84901 + atomic_t refcount; /* Refcount for slab cache destroy */
84902 void (*ctor)(void *);
84903 int inuse; /* Offset to metadata */
84904 int align; /* Alignment */
84905 diff --git a/include/linux/smp.h b/include/linux/smp.h
84906 index 93dff5f..933c561 100644
84907 --- a/include/linux/smp.h
84908 +++ b/include/linux/smp.h
84909 @@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
84910 #endif
84911
84912 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
84913 +#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
84914 #define put_cpu() preempt_enable()
84915 +#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
84916
84917 /*
84918 * Callback to arch code if there's nosmp or maxcpus=0 on the
84919 diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
84920 index 46cca4c..3323536 100644
84921 --- a/include/linux/sock_diag.h
84922 +++ b/include/linux/sock_diag.h
84923 @@ -11,7 +11,7 @@ struct sock;
84924 struct sock_diag_handler {
84925 __u8 family;
84926 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
84927 -};
84928 +} __do_const;
84929
84930 int sock_diag_register(const struct sock_diag_handler *h);
84931 void sock_diag_unregister(const struct sock_diag_handler *h);
84932 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
84933 index 680f9a3..f13aeb0 100644
84934 --- a/include/linux/sonet.h
84935 +++ b/include/linux/sonet.h
84936 @@ -7,7 +7,7 @@
84937 #include <uapi/linux/sonet.h>
84938
84939 struct k_sonet_stats {
84940 -#define __HANDLE_ITEM(i) atomic_t i
84941 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
84942 __SONET_ITEMS
84943 #undef __HANDLE_ITEM
84944 };
84945 diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
84946 index 07d8e53..dc934c9 100644
84947 --- a/include/linux/sunrpc/addr.h
84948 +++ b/include/linux/sunrpc/addr.h
84949 @@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
84950 {
84951 switch (sap->sa_family) {
84952 case AF_INET:
84953 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
84954 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
84955 case AF_INET6:
84956 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
84957 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
84958 }
84959 return 0;
84960 }
84961 @@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
84962 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
84963 const struct sockaddr *src)
84964 {
84965 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
84966 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
84967 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
84968
84969 dsin->sin_family = ssin->sin_family;
84970 @@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
84971 if (sa->sa_family != AF_INET6)
84972 return 0;
84973
84974 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
84975 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
84976 }
84977
84978 #endif /* _LINUX_SUNRPC_ADDR_H */
84979 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
84980 index 70736b9..37f33db 100644
84981 --- a/include/linux/sunrpc/clnt.h
84982 +++ b/include/linux/sunrpc/clnt.h
84983 @@ -97,7 +97,7 @@ struct rpc_procinfo {
84984 unsigned int p_timer; /* Which RTT timer to use */
84985 u32 p_statidx; /* Which procedure to account */
84986 const char * p_name; /* name of procedure */
84987 -};
84988 +} __do_const;
84989
84990 #ifdef __KERNEL__
84991
84992 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
84993 index 2167846..0648fc3 100644
84994 --- a/include/linux/sunrpc/svc.h
84995 +++ b/include/linux/sunrpc/svc.h
84996 @@ -416,7 +416,7 @@ struct svc_procedure {
84997 unsigned int pc_count; /* call count */
84998 unsigned int pc_cachetype; /* cache info (NFS) */
84999 unsigned int pc_xdrressize; /* maximum size of XDR reply */
85000 -};
85001 +} __do_const;
85002
85003 /*
85004 * Function prototypes.
85005 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
85006 index 975da75..318c083 100644
85007 --- a/include/linux/sunrpc/svc_rdma.h
85008 +++ b/include/linux/sunrpc/svc_rdma.h
85009 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
85010 extern unsigned int svcrdma_max_requests;
85011 extern unsigned int svcrdma_max_req_size;
85012
85013 -extern atomic_t rdma_stat_recv;
85014 -extern atomic_t rdma_stat_read;
85015 -extern atomic_t rdma_stat_write;
85016 -extern atomic_t rdma_stat_sq_starve;
85017 -extern atomic_t rdma_stat_rq_starve;
85018 -extern atomic_t rdma_stat_rq_poll;
85019 -extern atomic_t rdma_stat_rq_prod;
85020 -extern atomic_t rdma_stat_sq_poll;
85021 -extern atomic_t rdma_stat_sq_prod;
85022 +extern atomic_unchecked_t rdma_stat_recv;
85023 +extern atomic_unchecked_t rdma_stat_read;
85024 +extern atomic_unchecked_t rdma_stat_write;
85025 +extern atomic_unchecked_t rdma_stat_sq_starve;
85026 +extern atomic_unchecked_t rdma_stat_rq_starve;
85027 +extern atomic_unchecked_t rdma_stat_rq_poll;
85028 +extern atomic_unchecked_t rdma_stat_rq_prod;
85029 +extern atomic_unchecked_t rdma_stat_sq_poll;
85030 +extern atomic_unchecked_t rdma_stat_sq_prod;
85031
85032 #define RPCRDMA_VERSION 1
85033
85034 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
85035 index 8d71d65..f79586e 100644
85036 --- a/include/linux/sunrpc/svcauth.h
85037 +++ b/include/linux/sunrpc/svcauth.h
85038 @@ -120,7 +120,7 @@ struct auth_ops {
85039 int (*release)(struct svc_rqst *rq);
85040 void (*domain_release)(struct auth_domain *);
85041 int (*set_client)(struct svc_rqst *rq);
85042 -};
85043 +} __do_const;
85044
85045 #define SVC_GARBAGE 1
85046 #define SVC_SYSERR 2
85047 diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
85048 index e7a018e..49f8b17 100644
85049 --- a/include/linux/swiotlb.h
85050 +++ b/include/linux/swiotlb.h
85051 @@ -60,7 +60,8 @@ extern void
85052
85053 extern void
85054 swiotlb_free_coherent(struct device *hwdev, size_t size,
85055 - void *vaddr, dma_addr_t dma_handle);
85056 + void *vaddr, dma_addr_t dma_handle,
85057 + struct dma_attrs *attrs);
85058
85059 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
85060 unsigned long offset, size_t size,
85061 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
85062 index bda9b81..629e06e 100644
85063 --- a/include/linux/syscalls.h
85064 +++ b/include/linux/syscalls.h
85065 @@ -99,10 +99,16 @@ union bpf_attr;
85066 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
85067
85068 #define __SC_DECL(t, a) t a
85069 +#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))
85070 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
85071 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
85072 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
85073 -#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
85074 +#define __SC_LONG(t, a) __typeof( \
85075 + __builtin_choose_expr( \
85076 + sizeof(t) > sizeof(int), \
85077 + (t) 0, \
85078 + __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
85079 + )) a
85080 #define __SC_CAST(t, a) (t) a
85081 #define __SC_ARGS(t, a) a
85082 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
85083 @@ -384,11 +390,11 @@ asmlinkage long sys_sync(void);
85084 asmlinkage long sys_fsync(unsigned int fd);
85085 asmlinkage long sys_fdatasync(unsigned int fd);
85086 asmlinkage long sys_bdflush(int func, long data);
85087 -asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
85088 - char __user *type, unsigned long flags,
85089 +asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
85090 + const char __user *type, unsigned long flags,
85091 void __user *data);
85092 -asmlinkage long sys_umount(char __user *name, int flags);
85093 -asmlinkage long sys_oldumount(char __user *name);
85094 +asmlinkage long sys_umount(const char __user *name, int flags);
85095 +asmlinkage long sys_oldumount(const char __user *name);
85096 asmlinkage long sys_truncate(const char __user *path, long length);
85097 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
85098 asmlinkage long sys_stat(const char __user *filename,
85099 @@ -600,7 +606,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
85100 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
85101 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
85102 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
85103 - struct sockaddr __user *, int);
85104 + struct sockaddr __user *, int) __intentional_overflow(0);
85105 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
85106 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
85107 unsigned int vlen, unsigned flags);
85108 diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
85109 index 27b3b0b..e093dd9 100644
85110 --- a/include/linux/syscore_ops.h
85111 +++ b/include/linux/syscore_ops.h
85112 @@ -16,7 +16,7 @@ struct syscore_ops {
85113 int (*suspend)(void);
85114 void (*resume)(void);
85115 void (*shutdown)(void);
85116 -};
85117 +} __do_const;
85118
85119 extern void register_syscore_ops(struct syscore_ops *ops);
85120 extern void unregister_syscore_ops(struct syscore_ops *ops);
85121 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
85122 index b7361f8..341a15a 100644
85123 --- a/include/linux/sysctl.h
85124 +++ b/include/linux/sysctl.h
85125 @@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
85126
85127 extern int proc_dostring(struct ctl_table *, int,
85128 void __user *, size_t *, loff_t *);
85129 +extern int proc_dostring_modpriv(struct ctl_table *, int,
85130 + void __user *, size_t *, loff_t *);
85131 extern int proc_dointvec(struct ctl_table *, int,
85132 void __user *, size_t *, loff_t *);
85133 extern int proc_dointvec_minmax(struct ctl_table *, int,
85134 @@ -113,7 +115,8 @@ struct ctl_table
85135 struct ctl_table_poll *poll;
85136 void *extra1;
85137 void *extra2;
85138 -};
85139 +} __do_const __randomize_layout;
85140 +typedef struct ctl_table __no_const ctl_table_no_const;
85141
85142 struct ctl_node {
85143 struct rb_node node;
85144 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
85145 index f97d0db..c1187dc 100644
85146 --- a/include/linux/sysfs.h
85147 +++ b/include/linux/sysfs.h
85148 @@ -34,7 +34,8 @@ struct attribute {
85149 struct lock_class_key *key;
85150 struct lock_class_key skey;
85151 #endif
85152 -};
85153 +} __do_const;
85154 +typedef struct attribute __no_const attribute_no_const;
85155
85156 /**
85157 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
85158 @@ -63,7 +64,8 @@ struct attribute_group {
85159 struct attribute *, int);
85160 struct attribute **attrs;
85161 struct bin_attribute **bin_attrs;
85162 -};
85163 +} __do_const;
85164 +typedef struct attribute_group __no_const attribute_group_no_const;
85165
85166 /**
85167 * Use these macros to make defining attributes easier. See include/linux/device.h
85168 @@ -128,7 +130,8 @@ struct bin_attribute {
85169 char *, loff_t, size_t);
85170 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
85171 struct vm_area_struct *vma);
85172 -};
85173 +} __do_const;
85174 +typedef struct bin_attribute __no_const bin_attribute_no_const;
85175
85176 /**
85177 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
85178 diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
85179 index 387fa7d..3fcde6b 100644
85180 --- a/include/linux/sysrq.h
85181 +++ b/include/linux/sysrq.h
85182 @@ -16,6 +16,7 @@
85183
85184 #include <linux/errno.h>
85185 #include <linux/types.h>
85186 +#include <linux/compiler.h>
85187
85188 /* Possible values of bitmask for enabling sysrq functions */
85189 /* 0x0001 is reserved for enable everything */
85190 @@ -33,7 +34,7 @@ struct sysrq_key_op {
85191 char *help_msg;
85192 char *action_msg;
85193 int enable_mask;
85194 -};
85195 +} __do_const;
85196
85197 #ifdef CONFIG_MAGIC_SYSRQ
85198
85199 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
85200 index ff307b5..f1a4468 100644
85201 --- a/include/linux/thread_info.h
85202 +++ b/include/linux/thread_info.h
85203 @@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
85204 #error "no set_restore_sigmask() provided and default one won't work"
85205 #endif
85206
85207 +extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
85208 +
85209 +static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
85210 +{
85211 + __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
85212 +}
85213 +
85214 #endif /* __KERNEL__ */
85215
85216 #endif /* _LINUX_THREAD_INFO_H */
85217 diff --git a/include/linux/tty.h b/include/linux/tty.h
85218 index 5171ef8..1048d83e 100644
85219 --- a/include/linux/tty.h
85220 +++ b/include/linux/tty.h
85221 @@ -202,7 +202,7 @@ struct tty_port {
85222 const struct tty_port_operations *ops; /* Port operations */
85223 spinlock_t lock; /* Lock protecting tty field */
85224 int blocked_open; /* Waiting to open */
85225 - int count; /* Usage count */
85226 + atomic_t count; /* Usage count */
85227 wait_queue_head_t open_wait; /* Open waiters */
85228 wait_queue_head_t close_wait; /* Close waiters */
85229 wait_queue_head_t delta_msr_wait; /* Modem status change */
85230 @@ -290,7 +290,7 @@ struct tty_struct {
85231 /* If the tty has a pending do_SAK, queue it here - akpm */
85232 struct work_struct SAK_work;
85233 struct tty_port *port;
85234 -};
85235 +} __randomize_layout;
85236
85237 /* Each of a tty's open files has private_data pointing to tty_file_private */
85238 struct tty_file_private {
85239 @@ -555,7 +555,7 @@ extern int tty_port_open(struct tty_port *port,
85240 struct tty_struct *tty, struct file *filp);
85241 static inline int tty_port_users(struct tty_port *port)
85242 {
85243 - return port->count + port->blocked_open;
85244 + return atomic_read(&port->count) + port->blocked_open;
85245 }
85246
85247 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
85248 diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
85249 index 92e337c..f46757b 100644
85250 --- a/include/linux/tty_driver.h
85251 +++ b/include/linux/tty_driver.h
85252 @@ -291,7 +291,7 @@ struct tty_operations {
85253 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
85254 #endif
85255 const struct file_operations *proc_fops;
85256 -};
85257 +} __do_const __randomize_layout;
85258
85259 struct tty_driver {
85260 int magic; /* magic number for this structure */
85261 @@ -325,7 +325,7 @@ struct tty_driver {
85262
85263 const struct tty_operations *ops;
85264 struct list_head tty_drivers;
85265 -};
85266 +} __randomize_layout;
85267
85268 extern struct list_head tty_drivers;
85269
85270 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
85271 index 00c9d68..bc0188b 100644
85272 --- a/include/linux/tty_ldisc.h
85273 +++ b/include/linux/tty_ldisc.h
85274 @@ -215,7 +215,7 @@ struct tty_ldisc_ops {
85275
85276 struct module *owner;
85277
85278 - int refcount;
85279 + atomic_t refcount;
85280 };
85281
85282 struct tty_ldisc {
85283 diff --git a/include/linux/types.h b/include/linux/types.h
85284 index a0bb704..f511c77 100644
85285 --- a/include/linux/types.h
85286 +++ b/include/linux/types.h
85287 @@ -177,10 +177,26 @@ typedef struct {
85288 int counter;
85289 } atomic_t;
85290
85291 +#ifdef CONFIG_PAX_REFCOUNT
85292 +typedef struct {
85293 + int counter;
85294 +} atomic_unchecked_t;
85295 +#else
85296 +typedef atomic_t atomic_unchecked_t;
85297 +#endif
85298 +
85299 #ifdef CONFIG_64BIT
85300 typedef struct {
85301 long counter;
85302 } atomic64_t;
85303 +
85304 +#ifdef CONFIG_PAX_REFCOUNT
85305 +typedef struct {
85306 + long counter;
85307 +} atomic64_unchecked_t;
85308 +#else
85309 +typedef atomic64_t atomic64_unchecked_t;
85310 +#endif
85311 #endif
85312
85313 struct list_head {
85314 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
85315 index ecd3319..8a36ded 100644
85316 --- a/include/linux/uaccess.h
85317 +++ b/include/linux/uaccess.h
85318 @@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
85319 long ret; \
85320 mm_segment_t old_fs = get_fs(); \
85321 \
85322 - set_fs(KERNEL_DS); \
85323 pagefault_disable(); \
85324 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
85325 - pagefault_enable(); \
85326 + set_fs(KERNEL_DS); \
85327 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
85328 set_fs(old_fs); \
85329 + pagefault_enable(); \
85330 ret; \
85331 })
85332
85333 diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
85334 index 2d1f9b6..d7a9fce 100644
85335 --- a/include/linux/uidgid.h
85336 +++ b/include/linux/uidgid.h
85337 @@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
85338
85339 #endif /* CONFIG_USER_NS */
85340
85341 +#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
85342 +#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
85343 +#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
85344 +#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
85345 +
85346 #endif /* _LINUX_UIDGID_H */
85347 diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
85348 index baa8171..9ca98ba 100644
85349 --- a/include/linux/uio_driver.h
85350 +++ b/include/linux/uio_driver.h
85351 @@ -67,7 +67,7 @@ struct uio_device {
85352 struct module *owner;
85353 struct device *dev;
85354 int minor;
85355 - atomic_t event;
85356 + atomic_unchecked_t event;
85357 struct fasync_struct *async_queue;
85358 wait_queue_head_t wait;
85359 struct uio_info *info;
85360 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
85361 index 99c1b4d..562e6f3 100644
85362 --- a/include/linux/unaligned/access_ok.h
85363 +++ b/include/linux/unaligned/access_ok.h
85364 @@ -4,34 +4,34 @@
85365 #include <linux/kernel.h>
85366 #include <asm/byteorder.h>
85367
85368 -static inline u16 get_unaligned_le16(const void *p)
85369 +static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
85370 {
85371 - return le16_to_cpup((__le16 *)p);
85372 + return le16_to_cpup((const __le16 *)p);
85373 }
85374
85375 -static inline u32 get_unaligned_le32(const void *p)
85376 +static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
85377 {
85378 - return le32_to_cpup((__le32 *)p);
85379 + return le32_to_cpup((const __le32 *)p);
85380 }
85381
85382 -static inline u64 get_unaligned_le64(const void *p)
85383 +static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
85384 {
85385 - return le64_to_cpup((__le64 *)p);
85386 + return le64_to_cpup((const __le64 *)p);
85387 }
85388
85389 -static inline u16 get_unaligned_be16(const void *p)
85390 +static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
85391 {
85392 - return be16_to_cpup((__be16 *)p);
85393 + return be16_to_cpup((const __be16 *)p);
85394 }
85395
85396 -static inline u32 get_unaligned_be32(const void *p)
85397 +static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
85398 {
85399 - return be32_to_cpup((__be32 *)p);
85400 + return be32_to_cpup((const __be32 *)p);
85401 }
85402
85403 -static inline u64 get_unaligned_be64(const void *p)
85404 +static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
85405 {
85406 - return be64_to_cpup((__be64 *)p);
85407 + return be64_to_cpup((const __be64 *)p);
85408 }
85409
85410 static inline void put_unaligned_le16(u16 val, void *p)
85411 diff --git a/include/linux/usb.h b/include/linux/usb.h
85412 index 447a7e2..9cea7e9 100644
85413 --- a/include/linux/usb.h
85414 +++ b/include/linux/usb.h
85415 @@ -571,7 +571,7 @@ struct usb_device {
85416 int maxchild;
85417
85418 u32 quirks;
85419 - atomic_t urbnum;
85420 + atomic_unchecked_t urbnum;
85421
85422 unsigned long active_duration;
85423
85424 @@ -1655,7 +1655,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
85425
85426 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
85427 __u8 request, __u8 requesttype, __u16 value, __u16 index,
85428 - void *data, __u16 size, int timeout);
85429 + void *data, __u16 size, int timeout) __intentional_overflow(-1);
85430 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
85431 void *data, int len, int *actual_length, int timeout);
85432 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
85433 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
85434 index d5952bb..9a626d4 100644
85435 --- a/include/linux/usb/renesas_usbhs.h
85436 +++ b/include/linux/usb/renesas_usbhs.h
85437 @@ -39,7 +39,7 @@ enum {
85438 */
85439 struct renesas_usbhs_driver_callback {
85440 int (*notify_hotplug)(struct platform_device *pdev);
85441 -};
85442 +} __no_const;
85443
85444 /*
85445 * callback functions for platform
85446 diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
85447 index e953726..8edb26a 100644
85448 --- a/include/linux/user_namespace.h
85449 +++ b/include/linux/user_namespace.h
85450 @@ -33,7 +33,7 @@ struct user_namespace {
85451 struct key *persistent_keyring_register;
85452 struct rw_semaphore persistent_keyring_register_sem;
85453 #endif
85454 -};
85455 +} __randomize_layout;
85456
85457 extern struct user_namespace init_user_ns;
85458
85459 diff --git a/include/linux/utsname.h b/include/linux/utsname.h
85460 index 239e277..22a5cf5 100644
85461 --- a/include/linux/utsname.h
85462 +++ b/include/linux/utsname.h
85463 @@ -24,7 +24,7 @@ struct uts_namespace {
85464 struct new_utsname name;
85465 struct user_namespace *user_ns;
85466 unsigned int proc_inum;
85467 -};
85468 +} __randomize_layout;
85469 extern struct uts_namespace init_uts_ns;
85470
85471 #ifdef CONFIG_UTS_NS
85472 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
85473 index 6f8fbcf..4efc177 100644
85474 --- a/include/linux/vermagic.h
85475 +++ b/include/linux/vermagic.h
85476 @@ -25,9 +25,42 @@
85477 #define MODULE_ARCH_VERMAGIC ""
85478 #endif
85479
85480 +#ifdef CONFIG_PAX_REFCOUNT
85481 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
85482 +#else
85483 +#define MODULE_PAX_REFCOUNT ""
85484 +#endif
85485 +
85486 +#ifdef CONSTIFY_PLUGIN
85487 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
85488 +#else
85489 +#define MODULE_CONSTIFY_PLUGIN ""
85490 +#endif
85491 +
85492 +#ifdef STACKLEAK_PLUGIN
85493 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
85494 +#else
85495 +#define MODULE_STACKLEAK_PLUGIN ""
85496 +#endif
85497 +
85498 +#ifdef RANDSTRUCT_PLUGIN
85499 +#include <generated/randomize_layout_hash.h>
85500 +#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
85501 +#else
85502 +#define MODULE_RANDSTRUCT_PLUGIN
85503 +#endif
85504 +
85505 +#ifdef CONFIG_GRKERNSEC
85506 +#define MODULE_GRSEC "GRSEC "
85507 +#else
85508 +#define MODULE_GRSEC ""
85509 +#endif
85510 +
85511 #define VERMAGIC_STRING \
85512 UTS_RELEASE " " \
85513 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
85514 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
85515 - MODULE_ARCH_VERMAGIC
85516 + MODULE_ARCH_VERMAGIC \
85517 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
85518 + MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
85519
85520 diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
85521 index b483abd..af305ad 100644
85522 --- a/include/linux/vga_switcheroo.h
85523 +++ b/include/linux/vga_switcheroo.h
85524 @@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
85525
85526 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
85527
85528 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
85529 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
85530 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
85531 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
85532 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
85533 #else
85534
85535 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
85536 @@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
85537
85538 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
85539
85540 -static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85541 +static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85542 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
85543 -static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85544 +static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85545
85546 #endif
85547 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
85548 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
85549 index b87696f..1d11de7 100644
85550 --- a/include/linux/vmalloc.h
85551 +++ b/include/linux/vmalloc.h
85552 @@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
85553 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
85554 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
85555 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
85556 +
85557 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
85558 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
85559 +#endif
85560 +
85561 /* bits [20..32] reserved for arch specific ioremap internals */
85562
85563 /*
85564 @@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
85565 unsigned long flags, pgprot_t prot);
85566 extern void vunmap(const void *addr);
85567
85568 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85569 +extern void unmap_process_stacks(struct task_struct *task);
85570 +#endif
85571 +
85572 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
85573 unsigned long uaddr, void *kaddr,
85574 unsigned long size);
85575 @@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
85576
85577 /* for /dev/kmem */
85578 extern long vread(char *buf, char *addr, unsigned long count);
85579 -extern long vwrite(char *buf, char *addr, unsigned long count);
85580 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
85581
85582 /*
85583 * Internals. Dont't use..
85584 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
85585 index 82e7db7..f8ce3d0 100644
85586 --- a/include/linux/vmstat.h
85587 +++ b/include/linux/vmstat.h
85588 @@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
85589 /*
85590 * Zone based page accounting with per cpu differentials.
85591 */
85592 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85593 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85594
85595 static inline void zone_page_state_add(long x, struct zone *zone,
85596 enum zone_stat_item item)
85597 {
85598 - atomic_long_add(x, &zone->vm_stat[item]);
85599 - atomic_long_add(x, &vm_stat[item]);
85600 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
85601 + atomic_long_add_unchecked(x, &vm_stat[item]);
85602 }
85603
85604 -static inline unsigned long global_page_state(enum zone_stat_item item)
85605 +static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
85606 {
85607 - long x = atomic_long_read(&vm_stat[item]);
85608 + long x = atomic_long_read_unchecked(&vm_stat[item]);
85609 #ifdef CONFIG_SMP
85610 if (x < 0)
85611 x = 0;
85612 @@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
85613 return x;
85614 }
85615
85616 -static inline unsigned long zone_page_state(struct zone *zone,
85617 +static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
85618 enum zone_stat_item item)
85619 {
85620 - long x = atomic_long_read(&zone->vm_stat[item]);
85621 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85622 #ifdef CONFIG_SMP
85623 if (x < 0)
85624 x = 0;
85625 @@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
85626 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
85627 enum zone_stat_item item)
85628 {
85629 - long x = atomic_long_read(&zone->vm_stat[item]);
85630 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85631
85632 #ifdef CONFIG_SMP
85633 int cpu;
85634 @@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
85635
85636 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
85637 {
85638 - atomic_long_inc(&zone->vm_stat[item]);
85639 - atomic_long_inc(&vm_stat[item]);
85640 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
85641 + atomic_long_inc_unchecked(&vm_stat[item]);
85642 }
85643
85644 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
85645 {
85646 - atomic_long_dec(&zone->vm_stat[item]);
85647 - atomic_long_dec(&vm_stat[item]);
85648 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
85649 + atomic_long_dec_unchecked(&vm_stat[item]);
85650 }
85651
85652 static inline void __inc_zone_page_state(struct page *page,
85653 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
85654 index 91b0a68..0e9adf6 100644
85655 --- a/include/linux/xattr.h
85656 +++ b/include/linux/xattr.h
85657 @@ -28,7 +28,7 @@ struct xattr_handler {
85658 size_t size, int handler_flags);
85659 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
85660 size_t size, int flags, int handler_flags);
85661 -};
85662 +} __do_const;
85663
85664 struct xattr {
85665 const char *name;
85666 @@ -37,6 +37,9 @@ struct xattr {
85667 };
85668
85669 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
85670 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
85671 +ssize_t pax_getxattr(struct dentry *, void *, size_t);
85672 +#endif
85673 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
85674 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
85675 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
85676 diff --git a/include/linux/zlib.h b/include/linux/zlib.h
85677 index 92dbbd3..13ab0b3 100644
85678 --- a/include/linux/zlib.h
85679 +++ b/include/linux/zlib.h
85680 @@ -31,6 +31,7 @@
85681 #define _ZLIB_H
85682
85683 #include <linux/zconf.h>
85684 +#include <linux/compiler.h>
85685
85686 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
85687 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
85688 @@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
85689
85690 /* basic functions */
85691
85692 -extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
85693 +extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
85694 /*
85695 Returns the number of bytes that needs to be allocated for a per-
85696 stream workspace with the specified parameters. A pointer to this
85697 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
85698 index eb76cfd..9fd0e7c 100644
85699 --- a/include/media/v4l2-dev.h
85700 +++ b/include/media/v4l2-dev.h
85701 @@ -75,7 +75,7 @@ struct v4l2_file_operations {
85702 int (*mmap) (struct file *, struct vm_area_struct *);
85703 int (*open) (struct file *);
85704 int (*release) (struct file *);
85705 -};
85706 +} __do_const;
85707
85708 /*
85709 * Newer version of video_device, handled by videodev2.c
85710 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
85711 index ffb69da..040393e 100644
85712 --- a/include/media/v4l2-device.h
85713 +++ b/include/media/v4l2-device.h
85714 @@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
85715 this function returns 0. If the name ends with a digit (e.g. cx18),
85716 then the name will be set to cx18-0 since cx180 looks really odd. */
85717 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
85718 - atomic_t *instance);
85719 + atomic_unchecked_t *instance);
85720
85721 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
85722 Since the parent disappears this ensures that v4l2_dev doesn't have an
85723 diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
85724 index 2a25dec..bf6dd8a 100644
85725 --- a/include/net/9p/transport.h
85726 +++ b/include/net/9p/transport.h
85727 @@ -62,7 +62,7 @@ struct p9_trans_module {
85728 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
85729 int (*zc_request)(struct p9_client *, struct p9_req_t *,
85730 char *, char *, int , int, int, int);
85731 -};
85732 +} __do_const;
85733
85734 void v9fs_register_trans(struct p9_trans_module *m);
85735 void v9fs_unregister_trans(struct p9_trans_module *m);
85736 diff --git a/include/net/af_unix.h b/include/net/af_unix.h
85737 index a175ba4..196eb8242 100644
85738 --- a/include/net/af_unix.h
85739 +++ b/include/net/af_unix.h
85740 @@ -36,7 +36,7 @@ struct unix_skb_parms {
85741 u32 secid; /* Security ID */
85742 #endif
85743 u32 consumed;
85744 -};
85745 +} __randomize_layout;
85746
85747 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
85748 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
85749 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
85750 index ead99f0..6263c4b 100644
85751 --- a/include/net/bluetooth/l2cap.h
85752 +++ b/include/net/bluetooth/l2cap.h
85753 @@ -608,7 +608,7 @@ struct l2cap_ops {
85754 unsigned char *kdata,
85755 struct iovec *iov,
85756 int len);
85757 -};
85758 +} __do_const;
85759
85760 struct l2cap_conn {
85761 struct hci_conn *hcon;
85762 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
85763 index f2ae33d..c457cf0 100644
85764 --- a/include/net/caif/cfctrl.h
85765 +++ b/include/net/caif/cfctrl.h
85766 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
85767 void (*radioset_rsp)(void);
85768 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
85769 struct cflayer *client_layer);
85770 -};
85771 +} __no_const;
85772
85773 /* Link Setup Parameters for CAIF-Links. */
85774 struct cfctrl_link_param {
85775 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
85776 struct cfctrl {
85777 struct cfsrvl serv;
85778 struct cfctrl_rsp res;
85779 - atomic_t req_seq_no;
85780 - atomic_t rsp_seq_no;
85781 + atomic_unchecked_t req_seq_no;
85782 + atomic_unchecked_t rsp_seq_no;
85783 struct list_head list;
85784 /* Protects from simultaneous access to first_req list */
85785 spinlock_t info_list_lock;
85786 diff --git a/include/net/flow.h b/include/net/flow.h
85787 index 8109a15..504466d 100644
85788 --- a/include/net/flow.h
85789 +++ b/include/net/flow.h
85790 @@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
85791
85792 void flow_cache_flush(struct net *net);
85793 void flow_cache_flush_deferred(struct net *net);
85794 -extern atomic_t flow_cache_genid;
85795 +extern atomic_unchecked_t flow_cache_genid;
85796
85797 #endif
85798 diff --git a/include/net/genetlink.h b/include/net/genetlink.h
85799 index af10c2c..a431cc5 100644
85800 --- a/include/net/genetlink.h
85801 +++ b/include/net/genetlink.h
85802 @@ -120,7 +120,7 @@ struct genl_ops {
85803 u8 cmd;
85804 u8 internal_flags;
85805 u8 flags;
85806 -};
85807 +} __do_const;
85808
85809 int __genl_register_family(struct genl_family *family);
85810
85811 diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
85812 index 734d9b5..48a9a4b 100644
85813 --- a/include/net/gro_cells.h
85814 +++ b/include/net/gro_cells.h
85815 @@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
85816 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
85817
85818 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
85819 - atomic_long_inc(&dev->rx_dropped);
85820 + atomic_long_inc_unchecked(&dev->rx_dropped);
85821 kfree_skb(skb);
85822 return;
85823 }
85824 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
85825 index 848e85c..051c7de 100644
85826 --- a/include/net/inet_connection_sock.h
85827 +++ b/include/net/inet_connection_sock.h
85828 @@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
85829 int (*bind_conflict)(const struct sock *sk,
85830 const struct inet_bind_bucket *tb, bool relax);
85831 void (*mtu_reduced)(struct sock *sk);
85832 -};
85833 +} __do_const;
85834
85835 /** inet_connection_sock - INET connection oriented sock
85836 *
85837 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
85838 index 80479ab..0c3f647 100644
85839 --- a/include/net/inetpeer.h
85840 +++ b/include/net/inetpeer.h
85841 @@ -47,7 +47,7 @@ struct inet_peer {
85842 */
85843 union {
85844 struct {
85845 - atomic_t rid; /* Frag reception counter */
85846 + atomic_unchecked_t rid; /* Frag reception counter */
85847 };
85848 struct rcu_head rcu;
85849 struct inet_peer *gc_next;
85850 diff --git a/include/net/ip.h b/include/net/ip.h
85851 index 0bb6207..a8878af 100644
85852 --- a/include/net/ip.h
85853 +++ b/include/net/ip.h
85854 @@ -316,7 +316,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
85855 }
85856 }
85857
85858 -u32 ip_idents_reserve(u32 hash, int segs);
85859 +u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
85860 void __ip_select_ident(struct iphdr *iph, int segs);
85861
85862 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
85863 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
85864 index dc9d2a2..d985691 100644
85865 --- a/include/net/ip_fib.h
85866 +++ b/include/net/ip_fib.h
85867 @@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
85868
85869 #define FIB_RES_SADDR(net, res) \
85870 ((FIB_RES_NH(res).nh_saddr_genid == \
85871 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
85872 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
85873 FIB_RES_NH(res).nh_saddr : \
85874 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
85875 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
85876 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
85877 index 615b20b..fd4cbd8 100644
85878 --- a/include/net/ip_vs.h
85879 +++ b/include/net/ip_vs.h
85880 @@ -534,7 +534,7 @@ struct ip_vs_conn {
85881 struct ip_vs_conn *control; /* Master control connection */
85882 atomic_t n_control; /* Number of controlled ones */
85883 struct ip_vs_dest *dest; /* real server */
85884 - atomic_t in_pkts; /* incoming packet counter */
85885 + atomic_unchecked_t in_pkts; /* incoming packet counter */
85886
85887 /* Packet transmitter for different forwarding methods. If it
85888 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
85889 @@ -682,7 +682,7 @@ struct ip_vs_dest {
85890 __be16 port; /* port number of the server */
85891 union nf_inet_addr addr; /* IP address of the server */
85892 volatile unsigned int flags; /* dest status flags */
85893 - atomic_t conn_flags; /* flags to copy to conn */
85894 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
85895 atomic_t weight; /* server weight */
85896
85897 atomic_t refcnt; /* reference counter */
85898 @@ -928,11 +928,11 @@ struct netns_ipvs {
85899 /* ip_vs_lblc */
85900 int sysctl_lblc_expiration;
85901 struct ctl_table_header *lblc_ctl_header;
85902 - struct ctl_table *lblc_ctl_table;
85903 + ctl_table_no_const *lblc_ctl_table;
85904 /* ip_vs_lblcr */
85905 int sysctl_lblcr_expiration;
85906 struct ctl_table_header *lblcr_ctl_header;
85907 - struct ctl_table *lblcr_ctl_table;
85908 + ctl_table_no_const *lblcr_ctl_table;
85909 /* ip_vs_est */
85910 struct list_head est_list; /* estimator list */
85911 spinlock_t est_lock;
85912 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
85913 index 8d4f588..2e37ad2 100644
85914 --- a/include/net/irda/ircomm_tty.h
85915 +++ b/include/net/irda/ircomm_tty.h
85916 @@ -33,6 +33,7 @@
85917 #include <linux/termios.h>
85918 #include <linux/timer.h>
85919 #include <linux/tty.h> /* struct tty_struct */
85920 +#include <asm/local.h>
85921
85922 #include <net/irda/irias_object.h>
85923 #include <net/irda/ircomm_core.h>
85924 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
85925 index 714cc9a..ea05f3e 100644
85926 --- a/include/net/iucv/af_iucv.h
85927 +++ b/include/net/iucv/af_iucv.h
85928 @@ -149,7 +149,7 @@ struct iucv_skb_cb {
85929 struct iucv_sock_list {
85930 struct hlist_head head;
85931 rwlock_t lock;
85932 - atomic_t autobind_name;
85933 + atomic_unchecked_t autobind_name;
85934 };
85935
85936 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
85937 diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
85938 index f3be818..bf46196 100644
85939 --- a/include/net/llc_c_ac.h
85940 +++ b/include/net/llc_c_ac.h
85941 @@ -87,7 +87,7 @@
85942 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
85943 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
85944
85945 -typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85946 +typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85947
85948 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
85949 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
85950 diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
85951 index 3948cf1..83b28c4 100644
85952 --- a/include/net/llc_c_ev.h
85953 +++ b/include/net/llc_c_ev.h
85954 @@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
85955 return (struct llc_conn_state_ev *)skb->cb;
85956 }
85957
85958 -typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85959 -typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85960 +typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85961 +typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85962
85963 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
85964 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
85965 diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
85966 index 0e79cfb..f46db31 100644
85967 --- a/include/net/llc_c_st.h
85968 +++ b/include/net/llc_c_st.h
85969 @@ -37,7 +37,7 @@ struct llc_conn_state_trans {
85970 u8 next_state;
85971 llc_conn_ev_qfyr_t *ev_qualifiers;
85972 llc_conn_action_t *ev_actions;
85973 -};
85974 +} __do_const;
85975
85976 struct llc_conn_state {
85977 u8 current_state;
85978 diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
85979 index a61b98c..aade1eb 100644
85980 --- a/include/net/llc_s_ac.h
85981 +++ b/include/net/llc_s_ac.h
85982 @@ -23,7 +23,7 @@
85983 #define SAP_ACT_TEST_IND 9
85984
85985 /* All action functions must look like this */
85986 -typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
85987 +typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
85988
85989 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
85990 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
85991 diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
85992 index 567c681..cd73ac02 100644
85993 --- a/include/net/llc_s_st.h
85994 +++ b/include/net/llc_s_st.h
85995 @@ -20,7 +20,7 @@ struct llc_sap_state_trans {
85996 llc_sap_ev_t ev;
85997 u8 next_state;
85998 llc_sap_action_t *ev_actions;
85999 -};
86000 +} __do_const;
86001
86002 struct llc_sap_state {
86003 u8 curr_state;
86004 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
86005 index 0ad1f47..aaea45b 100644
86006 --- a/include/net/mac80211.h
86007 +++ b/include/net/mac80211.h
86008 @@ -4648,7 +4648,7 @@ struct rate_control_ops {
86009 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
86010
86011 u32 (*get_expected_throughput)(void *priv_sta);
86012 -};
86013 +} __do_const;
86014
86015 static inline int rate_supported(struct ieee80211_sta *sta,
86016 enum ieee80211_band band,
86017 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
86018 index f60558d..e5ed9bd 100644
86019 --- a/include/net/neighbour.h
86020 +++ b/include/net/neighbour.h
86021 @@ -163,7 +163,7 @@ struct neigh_ops {
86022 void (*error_report)(struct neighbour *, struct sk_buff *);
86023 int (*output)(struct neighbour *, struct sk_buff *);
86024 int (*connected_output)(struct neighbour *, struct sk_buff *);
86025 -};
86026 +} __do_const;
86027
86028 struct pneigh_entry {
86029 struct pneigh_entry *next;
86030 @@ -217,7 +217,7 @@ struct neigh_table {
86031 struct neigh_statistics __percpu *stats;
86032 struct neigh_hash_table __rcu *nht;
86033 struct pneigh_entry **phash_buckets;
86034 -};
86035 +} __randomize_layout;
86036
86037 static inline int neigh_parms_family(struct neigh_parms *p)
86038 {
86039 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
86040 index e0d6466..e2f3003 100644
86041 --- a/include/net/net_namespace.h
86042 +++ b/include/net/net_namespace.h
86043 @@ -129,8 +129,8 @@ struct net {
86044 struct netns_ipvs *ipvs;
86045 #endif
86046 struct sock *diag_nlsk;
86047 - atomic_t fnhe_genid;
86048 -};
86049 + atomic_unchecked_t fnhe_genid;
86050 +} __randomize_layout;
86051
86052 #include <linux/seq_file_net.h>
86053
86054 @@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
86055 #define __net_init __init
86056 #define __net_exit __exit_refok
86057 #define __net_initdata __initdata
86058 +#ifdef CONSTIFY_PLUGIN
86059 #define __net_initconst __initconst
86060 +#else
86061 +#define __net_initconst __initdata
86062 +#endif
86063 #endif
86064
86065 struct pernet_operations {
86066 @@ -296,7 +300,7 @@ struct pernet_operations {
86067 void (*exit_batch)(struct list_head *net_exit_list);
86068 int *id;
86069 size_t size;
86070 -};
86071 +} __do_const;
86072
86073 /*
86074 * Use these carefully. If you implement a network device and it
86075 @@ -344,12 +348,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
86076
86077 static inline int rt_genid_ipv4(struct net *net)
86078 {
86079 - return atomic_read(&net->ipv4.rt_genid);
86080 + return atomic_read_unchecked(&net->ipv4.rt_genid);
86081 }
86082
86083 static inline void rt_genid_bump_ipv4(struct net *net)
86084 {
86085 - atomic_inc(&net->ipv4.rt_genid);
86086 + atomic_inc_unchecked(&net->ipv4.rt_genid);
86087 }
86088
86089 extern void (*__fib6_flush_trees)(struct net *net);
86090 @@ -376,12 +380,12 @@ static inline void rt_genid_bump_all(struct net *net)
86091
86092 static inline int fnhe_genid(struct net *net)
86093 {
86094 - return atomic_read(&net->fnhe_genid);
86095 + return atomic_read_unchecked(&net->fnhe_genid);
86096 }
86097
86098 static inline void fnhe_genid_bump(struct net *net)
86099 {
86100 - atomic_inc(&net->fnhe_genid);
86101 + atomic_inc_unchecked(&net->fnhe_genid);
86102 }
86103
86104 #endif /* __NET_NET_NAMESPACE_H */
86105 diff --git a/include/net/netlink.h b/include/net/netlink.h
86106 index 7b903e1..ad9ca4b 100644
86107 --- a/include/net/netlink.h
86108 +++ b/include/net/netlink.h
86109 @@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
86110 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
86111 {
86112 if (mark)
86113 - skb_trim(skb, (unsigned char *) mark - skb->data);
86114 + skb_trim(skb, (const unsigned char *) mark - skb->data);
86115 }
86116
86117 /**
86118 diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
86119 index 29d6a94..235d3d84 100644
86120 --- a/include/net/netns/conntrack.h
86121 +++ b/include/net/netns/conntrack.h
86122 @@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
86123 struct nf_proto_net {
86124 #ifdef CONFIG_SYSCTL
86125 struct ctl_table_header *ctl_table_header;
86126 - struct ctl_table *ctl_table;
86127 + ctl_table_no_const *ctl_table;
86128 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
86129 struct ctl_table_header *ctl_compat_header;
86130 - struct ctl_table *ctl_compat_table;
86131 + ctl_table_no_const *ctl_compat_table;
86132 #endif
86133 #endif
86134 unsigned int users;
86135 @@ -60,7 +60,7 @@ struct nf_ip_net {
86136 struct nf_icmp_net icmpv6;
86137 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
86138 struct ctl_table_header *ctl_table_header;
86139 - struct ctl_table *ctl_table;
86140 + ctl_table_no_const *ctl_table;
86141 #endif
86142 };
86143
86144 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
86145 index 24945ce..f19e42f 100644
86146 --- a/include/net/netns/ipv4.h
86147 +++ b/include/net/netns/ipv4.h
86148 @@ -83,7 +83,7 @@ struct netns_ipv4 {
86149
86150 struct ping_group_range ping_group_range;
86151
86152 - atomic_t dev_addr_genid;
86153 + atomic_unchecked_t dev_addr_genid;
86154
86155 #ifdef CONFIG_SYSCTL
86156 unsigned long *sysctl_local_reserved_ports;
86157 @@ -97,6 +97,6 @@ struct netns_ipv4 {
86158 struct fib_rules_ops *mr_rules_ops;
86159 #endif
86160 #endif
86161 - atomic_t rt_genid;
86162 + atomic_unchecked_t rt_genid;
86163 };
86164 #endif
86165 diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
86166 index 69ae41f..4f94868 100644
86167 --- a/include/net/netns/ipv6.h
86168 +++ b/include/net/netns/ipv6.h
86169 @@ -75,8 +75,8 @@ struct netns_ipv6 {
86170 struct fib_rules_ops *mr6_rules_ops;
86171 #endif
86172 #endif
86173 - atomic_t dev_addr_genid;
86174 - atomic_t fib6_sernum;
86175 + atomic_unchecked_t dev_addr_genid;
86176 + atomic_unchecked_t fib6_sernum;
86177 };
86178
86179 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
86180 diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
86181 index 9da7982..099321b9 100644
86182 --- a/include/net/netns/xfrm.h
86183 +++ b/include/net/netns/xfrm.h
86184 @@ -78,7 +78,7 @@ struct netns_xfrm {
86185
86186 /* flow cache part */
86187 struct flow_cache flow_cache_global;
86188 - atomic_t flow_cache_genid;
86189 + atomic_unchecked_t flow_cache_genid;
86190 struct list_head flow_cache_gc_list;
86191 spinlock_t flow_cache_gc_lock;
86192 struct work_struct flow_cache_gc_work;
86193 diff --git a/include/net/ping.h b/include/net/ping.h
86194 index 026479b..d9b2829 100644
86195 --- a/include/net/ping.h
86196 +++ b/include/net/ping.h
86197 @@ -54,7 +54,7 @@ struct ping_iter_state {
86198
86199 extern struct proto ping_prot;
86200 #if IS_ENABLED(CONFIG_IPV6)
86201 -extern struct pingv6_ops pingv6_ops;
86202 +extern struct pingv6_ops *pingv6_ops;
86203 #endif
86204
86205 struct pingfakehdr {
86206 diff --git a/include/net/protocol.h b/include/net/protocol.h
86207 index d6fcc1f..ca277058 100644
86208 --- a/include/net/protocol.h
86209 +++ b/include/net/protocol.h
86210 @@ -49,7 +49,7 @@ struct net_protocol {
86211 * socket lookup?
86212 */
86213 icmp_strict_tag_validation:1;
86214 -};
86215 +} __do_const;
86216
86217 #if IS_ENABLED(CONFIG_IPV6)
86218 struct inet6_protocol {
86219 @@ -62,7 +62,7 @@ struct inet6_protocol {
86220 u8 type, u8 code, int offset,
86221 __be32 info);
86222 unsigned int flags; /* INET6_PROTO_xxx */
86223 -};
86224 +} __do_const;
86225
86226 #define INET6_PROTO_NOPOLICY 0x1
86227 #define INET6_PROTO_FINAL 0x2
86228 diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
86229 index e21b9f9..0191ef0 100644
86230 --- a/include/net/rtnetlink.h
86231 +++ b/include/net/rtnetlink.h
86232 @@ -93,7 +93,7 @@ struct rtnl_link_ops {
86233 int (*fill_slave_info)(struct sk_buff *skb,
86234 const struct net_device *dev,
86235 const struct net_device *slave_dev);
86236 -};
86237 +} __do_const;
86238
86239 int __rtnl_link_register(struct rtnl_link_ops *ops);
86240 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
86241 diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
86242 index 4a5b9a3..ca27d73 100644
86243 --- a/include/net/sctp/checksum.h
86244 +++ b/include/net/sctp/checksum.h
86245 @@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
86246 unsigned int offset)
86247 {
86248 struct sctphdr *sh = sctp_hdr(skb);
86249 - __le32 ret, old = sh->checksum;
86250 - const struct skb_checksum_ops ops = {
86251 + __le32 ret, old = sh->checksum;
86252 + static const struct skb_checksum_ops ops = {
86253 .update = sctp_csum_update,
86254 .combine = sctp_csum_combine,
86255 };
86256 diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
86257 index 72a31db..aaa63d9 100644
86258 --- a/include/net/sctp/sm.h
86259 +++ b/include/net/sctp/sm.h
86260 @@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
86261 typedef struct {
86262 sctp_state_fn_t *fn;
86263 const char *name;
86264 -} sctp_sm_table_entry_t;
86265 +} __do_const sctp_sm_table_entry_t;
86266
86267 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
86268 * currently in use.
86269 @@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
86270 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
86271
86272 /* Extern declarations for major data structures. */
86273 -extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86274 +extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86275
86276
86277 /* Get the size of a DATA chunk payload. */
86278 diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
86279 index 4ff3f67..89ae38e 100644
86280 --- a/include/net/sctp/structs.h
86281 +++ b/include/net/sctp/structs.h
86282 @@ -509,7 +509,7 @@ struct sctp_pf {
86283 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
86284 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
86285 struct sctp_af *af;
86286 -};
86287 +} __do_const;
86288
86289
86290 /* Structure to track chunk fragments that have been acked, but peer
86291 diff --git a/include/net/sock.h b/include/net/sock.h
86292 index 7db3db1..a915cca 100644
86293 --- a/include/net/sock.h
86294 +++ b/include/net/sock.h
86295 @@ -355,7 +355,7 @@ struct sock {
86296 unsigned int sk_napi_id;
86297 unsigned int sk_ll_usec;
86298 #endif
86299 - atomic_t sk_drops;
86300 + atomic_unchecked_t sk_drops;
86301 int sk_rcvbuf;
86302
86303 struct sk_filter __rcu *sk_filter;
86304 @@ -1048,7 +1048,7 @@ struct proto {
86305 void (*destroy_cgroup)(struct mem_cgroup *memcg);
86306 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
86307 #endif
86308 -};
86309 +} __randomize_layout;
86310
86311 /*
86312 * Bits in struct cg_proto.flags
86313 @@ -1235,7 +1235,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
86314 return ret >> PAGE_SHIFT;
86315 }
86316
86317 -static inline long
86318 +static inline long __intentional_overflow(-1)
86319 sk_memory_allocated(const struct sock *sk)
86320 {
86321 struct proto *prot = sk->sk_prot;
86322 @@ -1380,7 +1380,7 @@ struct sock_iocb {
86323 struct scm_cookie *scm;
86324 struct msghdr *msg, async_msg;
86325 struct kiocb *kiocb;
86326 -};
86327 +} __randomize_layout;
86328
86329 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
86330 {
86331 @@ -1820,7 +1820,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
86332 }
86333
86334 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
86335 - char __user *from, char *to,
86336 + char __user *from, unsigned char *to,
86337 int copy, int offset)
86338 {
86339 if (skb->ip_summed == CHECKSUM_NONE) {
86340 @@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
86341 }
86342 }
86343
86344 -struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86345 +struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86346
86347 /**
86348 * sk_page_frag - return an appropriate page_frag
86349 diff --git a/include/net/tcp.h b/include/net/tcp.h
86350 index 4062b4f..9ff45e7 100644
86351 --- a/include/net/tcp.h
86352 +++ b/include/net/tcp.h
86353 @@ -519,7 +519,7 @@ void tcp_retransmit_timer(struct sock *sk);
86354 void tcp_xmit_retransmit_queue(struct sock *);
86355 void tcp_simple_retransmit(struct sock *);
86356 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
86357 -int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86358 +int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86359
86360 void tcp_send_probe0(struct sock *);
86361 void tcp_send_partial(struct sock *);
86362 @@ -692,8 +692,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
86363 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
86364 */
86365 struct tcp_skb_cb {
86366 - __u32 seq; /* Starting sequence number */
86367 - __u32 end_seq; /* SEQ + FIN + SYN + datalen */
86368 + __u32 seq __intentional_overflow(0); /* Starting sequence number */
86369 + __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
86370 union {
86371 /* Note : tcp_tw_isn is used in input path only
86372 * (isn chosen by tcp_timewait_state_process())
86373 @@ -718,7 +718,7 @@ struct tcp_skb_cb {
86374
86375 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
86376 /* 1 byte hole */
86377 - __u32 ack_seq; /* Sequence number ACK'd */
86378 + __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
86379 union {
86380 struct inet_skb_parm h4;
86381 #if IS_ENABLED(CONFIG_IPV6)
86382 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
86383 index dc4865e..152ee4c 100644
86384 --- a/include/net/xfrm.h
86385 +++ b/include/net/xfrm.h
86386 @@ -285,7 +285,6 @@ struct xfrm_dst;
86387 struct xfrm_policy_afinfo {
86388 unsigned short family;
86389 struct dst_ops *dst_ops;
86390 - void (*garbage_collect)(struct net *net);
86391 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
86392 const xfrm_address_t *saddr,
86393 const xfrm_address_t *daddr);
86394 @@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
86395 struct net_device *dev,
86396 const struct flowi *fl);
86397 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
86398 -};
86399 +} __do_const;
86400
86401 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
86402 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
86403 @@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
86404 int (*transport_finish)(struct sk_buff *skb,
86405 int async);
86406 void (*local_error)(struct sk_buff *skb, u32 mtu);
86407 -};
86408 +} __do_const;
86409
86410 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
86411 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
86412 @@ -437,7 +436,7 @@ struct xfrm_mode {
86413 struct module *owner;
86414 unsigned int encap;
86415 int flags;
86416 -};
86417 +} __do_const;
86418
86419 /* Flags for xfrm_mode. */
86420 enum {
86421 @@ -534,7 +533,7 @@ struct xfrm_policy {
86422 struct timer_list timer;
86423
86424 struct flow_cache_object flo;
86425 - atomic_t genid;
86426 + atomic_unchecked_t genid;
86427 u32 priority;
86428 u32 index;
86429 struct xfrm_mark mark;
86430 @@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
86431 }
86432
86433 void xfrm_garbage_collect(struct net *net);
86434 +void xfrm_garbage_collect_deferred(struct net *net);
86435
86436 #else
86437
86438 @@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
86439 static inline void xfrm_garbage_collect(struct net *net)
86440 {
86441 }
86442 +static inline void xfrm_garbage_collect_deferred(struct net *net)
86443 +{
86444 +}
86445 #endif
86446
86447 static __inline__
86448 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
86449 index 1017e0b..227aa4d 100644
86450 --- a/include/rdma/iw_cm.h
86451 +++ b/include/rdma/iw_cm.h
86452 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
86453 int backlog);
86454
86455 int (*destroy_listen)(struct iw_cm_id *cm_id);
86456 -};
86457 +} __no_const;
86458
86459 /**
86460 * iw_create_cm_id - Create an IW CM identifier.
86461 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
86462 index 52beadf..598734c 100644
86463 --- a/include/scsi/libfc.h
86464 +++ b/include/scsi/libfc.h
86465 @@ -771,6 +771,7 @@ struct libfc_function_template {
86466 */
86467 void (*disc_stop_final) (struct fc_lport *);
86468 };
86469 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
86470
86471 /**
86472 * struct fc_disc - Discovery context
86473 @@ -875,7 +876,7 @@ struct fc_lport {
86474 struct fc_vport *vport;
86475
86476 /* Operational Information */
86477 - struct libfc_function_template tt;
86478 + libfc_function_template_no_const tt;
86479 u8 link_up;
86480 u8 qfull;
86481 enum fc_lport_state state;
86482 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
86483 index 27ecee7..5f42632 100644
86484 --- a/include/scsi/scsi_device.h
86485 +++ b/include/scsi/scsi_device.h
86486 @@ -186,9 +186,9 @@ struct scsi_device {
86487 unsigned int max_device_blocked; /* what device_blocked counts down from */
86488 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
86489
86490 - atomic_t iorequest_cnt;
86491 - atomic_t iodone_cnt;
86492 - atomic_t ioerr_cnt;
86493 + atomic_unchecked_t iorequest_cnt;
86494 + atomic_unchecked_t iodone_cnt;
86495 + atomic_unchecked_t ioerr_cnt;
86496
86497 struct device sdev_gendev,
86498 sdev_dev;
86499 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
86500 index 007a0bc..7188db8 100644
86501 --- a/include/scsi/scsi_transport_fc.h
86502 +++ b/include/scsi/scsi_transport_fc.h
86503 @@ -756,7 +756,8 @@ struct fc_function_template {
86504 unsigned long show_host_system_hostname:1;
86505
86506 unsigned long disable_target_scan:1;
86507 -};
86508 +} __do_const;
86509 +typedef struct fc_function_template __no_const fc_function_template_no_const;
86510
86511
86512 /**
86513 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
86514 index ae6c3b8..fd748ac 100644
86515 --- a/include/sound/compress_driver.h
86516 +++ b/include/sound/compress_driver.h
86517 @@ -128,7 +128,7 @@ struct snd_compr_ops {
86518 struct snd_compr_caps *caps);
86519 int (*get_codec_caps) (struct snd_compr_stream *stream,
86520 struct snd_compr_codec_caps *codec);
86521 -};
86522 +} __no_const;
86523
86524 /**
86525 * struct snd_compr: Compressed device
86526 diff --git a/include/sound/soc.h b/include/sound/soc.h
86527 index 7ba7130..d46594d 100644
86528 --- a/include/sound/soc.h
86529 +++ b/include/sound/soc.h
86530 @@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
86531 enum snd_soc_dapm_type, int);
86532
86533 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
86534 -};
86535 +} __do_const;
86536
86537 /* SoC platform interface */
86538 struct snd_soc_platform_driver {
86539 @@ -882,7 +882,7 @@ struct snd_soc_platform_driver {
86540 const struct snd_compr_ops *compr_ops;
86541
86542 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
86543 -};
86544 +} __do_const;
86545
86546 struct snd_soc_dai_link_component {
86547 const char *name;
86548 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
86549 index 23c518a..d6ef510 100644
86550 --- a/include/target/target_core_base.h
86551 +++ b/include/target/target_core_base.h
86552 @@ -764,7 +764,7 @@ struct se_device {
86553 atomic_long_t write_bytes;
86554 /* Active commands on this virtual SE device */
86555 atomic_t simple_cmds;
86556 - atomic_t dev_ordered_id;
86557 + atomic_unchecked_t dev_ordered_id;
86558 atomic_t dev_ordered_sync;
86559 atomic_t dev_qf_count;
86560 int export_count;
86561 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
86562 new file mode 100644
86563 index 0000000..fb634b7
86564 --- /dev/null
86565 +++ b/include/trace/events/fs.h
86566 @@ -0,0 +1,53 @@
86567 +#undef TRACE_SYSTEM
86568 +#define TRACE_SYSTEM fs
86569 +
86570 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
86571 +#define _TRACE_FS_H
86572 +
86573 +#include <linux/fs.h>
86574 +#include <linux/tracepoint.h>
86575 +
86576 +TRACE_EVENT(do_sys_open,
86577 +
86578 + TP_PROTO(const char *filename, int flags, int mode),
86579 +
86580 + TP_ARGS(filename, flags, mode),
86581 +
86582 + TP_STRUCT__entry(
86583 + __string( filename, filename )
86584 + __field( int, flags )
86585 + __field( int, mode )
86586 + ),
86587 +
86588 + TP_fast_assign(
86589 + __assign_str(filename, filename);
86590 + __entry->flags = flags;
86591 + __entry->mode = mode;
86592 + ),
86593 +
86594 + TP_printk("\"%s\" %x %o",
86595 + __get_str(filename), __entry->flags, __entry->mode)
86596 +);
86597 +
86598 +TRACE_EVENT(open_exec,
86599 +
86600 + TP_PROTO(const char *filename),
86601 +
86602 + TP_ARGS(filename),
86603 +
86604 + TP_STRUCT__entry(
86605 + __string( filename, filename )
86606 + ),
86607 +
86608 + TP_fast_assign(
86609 + __assign_str(filename, filename);
86610 + ),
86611 +
86612 + TP_printk("\"%s\"",
86613 + __get_str(filename))
86614 +);
86615 +
86616 +#endif /* _TRACE_FS_H */
86617 +
86618 +/* This part must be outside protection */
86619 +#include <trace/define_trace.h>
86620 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
86621 index 3608beb..df39d8a 100644
86622 --- a/include/trace/events/irq.h
86623 +++ b/include/trace/events/irq.h
86624 @@ -36,7 +36,7 @@ struct softirq_action;
86625 */
86626 TRACE_EVENT(irq_handler_entry,
86627
86628 - TP_PROTO(int irq, struct irqaction *action),
86629 + TP_PROTO(int irq, const struct irqaction *action),
86630
86631 TP_ARGS(irq, action),
86632
86633 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
86634 */
86635 TRACE_EVENT(irq_handler_exit,
86636
86637 - TP_PROTO(int irq, struct irqaction *action, int ret),
86638 + TP_PROTO(int irq, const struct irqaction *action, int ret),
86639
86640 TP_ARGS(irq, action, ret),
86641
86642 diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
86643 index 7caf44c..23c6f27 100644
86644 --- a/include/uapi/linux/a.out.h
86645 +++ b/include/uapi/linux/a.out.h
86646 @@ -39,6 +39,14 @@ enum machine_type {
86647 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
86648 };
86649
86650 +/* Constants for the N_FLAGS field */
86651 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86652 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
86653 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
86654 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
86655 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86656 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86657 +
86658 #if !defined (N_MAGIC)
86659 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
86660 #endif
86661 diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
86662 index 22b6ad3..aeba37e 100644
86663 --- a/include/uapi/linux/bcache.h
86664 +++ b/include/uapi/linux/bcache.h
86665 @@ -5,6 +5,7 @@
86666 * Bcache on disk data structures
86667 */
86668
86669 +#include <linux/compiler.h>
86670 #include <asm/types.h>
86671
86672 #define BITMASK(name, type, field, offset, size) \
86673 @@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
86674 /* Btree keys - all units are in sectors */
86675
86676 struct bkey {
86677 - __u64 high;
86678 - __u64 low;
86679 + __u64 high __intentional_overflow(-1);
86680 + __u64 low __intentional_overflow(-1);
86681 __u64 ptr[];
86682 };
86683
86684 diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
86685 index d876736..ccce5c0 100644
86686 --- a/include/uapi/linux/byteorder/little_endian.h
86687 +++ b/include/uapi/linux/byteorder/little_endian.h
86688 @@ -42,51 +42,51 @@
86689
86690 static inline __le64 __cpu_to_le64p(const __u64 *p)
86691 {
86692 - return (__force __le64)*p;
86693 + return (__force const __le64)*p;
86694 }
86695 -static inline __u64 __le64_to_cpup(const __le64 *p)
86696 +static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
86697 {
86698 - return (__force __u64)*p;
86699 + return (__force const __u64)*p;
86700 }
86701 static inline __le32 __cpu_to_le32p(const __u32 *p)
86702 {
86703 - return (__force __le32)*p;
86704 + return (__force const __le32)*p;
86705 }
86706 static inline __u32 __le32_to_cpup(const __le32 *p)
86707 {
86708 - return (__force __u32)*p;
86709 + return (__force const __u32)*p;
86710 }
86711 static inline __le16 __cpu_to_le16p(const __u16 *p)
86712 {
86713 - return (__force __le16)*p;
86714 + return (__force const __le16)*p;
86715 }
86716 static inline __u16 __le16_to_cpup(const __le16 *p)
86717 {
86718 - return (__force __u16)*p;
86719 + return (__force const __u16)*p;
86720 }
86721 static inline __be64 __cpu_to_be64p(const __u64 *p)
86722 {
86723 - return (__force __be64)__swab64p(p);
86724 + return (__force const __be64)__swab64p(p);
86725 }
86726 static inline __u64 __be64_to_cpup(const __be64 *p)
86727 {
86728 - return __swab64p((__u64 *)p);
86729 + return __swab64p((const __u64 *)p);
86730 }
86731 static inline __be32 __cpu_to_be32p(const __u32 *p)
86732 {
86733 - return (__force __be32)__swab32p(p);
86734 + return (__force const __be32)__swab32p(p);
86735 }
86736 -static inline __u32 __be32_to_cpup(const __be32 *p)
86737 +static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
86738 {
86739 - return __swab32p((__u32 *)p);
86740 + return __swab32p((const __u32 *)p);
86741 }
86742 static inline __be16 __cpu_to_be16p(const __u16 *p)
86743 {
86744 - return (__force __be16)__swab16p(p);
86745 + return (__force const __be16)__swab16p(p);
86746 }
86747 static inline __u16 __be16_to_cpup(const __be16 *p)
86748 {
86749 - return __swab16p((__u16 *)p);
86750 + return __swab16p((const __u16 *)p);
86751 }
86752 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
86753 #define __le64_to_cpus(x) do { (void)(x); } while (0)
86754 diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
86755 index ea9bf25..5140c61 100644
86756 --- a/include/uapi/linux/elf.h
86757 +++ b/include/uapi/linux/elf.h
86758 @@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
86759 #define PT_GNU_EH_FRAME 0x6474e550
86760
86761 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
86762 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
86763 +
86764 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
86765 +
86766 +/* Constants for the e_flags field */
86767 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86768 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
86769 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
86770 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
86771 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86772 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86773
86774 /*
86775 * Extended Numbering
86776 @@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
86777 #define DT_DEBUG 21
86778 #define DT_TEXTREL 22
86779 #define DT_JMPREL 23
86780 +#define DT_FLAGS 30
86781 + #define DF_TEXTREL 0x00000004
86782 #define DT_ENCODING 32
86783 #define OLD_DT_LOOS 0x60000000
86784 #define DT_LOOS 0x6000000d
86785 @@ -240,6 +253,19 @@ typedef struct elf64_hdr {
86786 #define PF_W 0x2
86787 #define PF_X 0x1
86788
86789 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
86790 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
86791 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
86792 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
86793 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
86794 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
86795 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
86796 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
86797 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
86798 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
86799 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
86800 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
86801 +
86802 typedef struct elf32_phdr{
86803 Elf32_Word p_type;
86804 Elf32_Off p_offset;
86805 @@ -332,6 +358,8 @@ typedef struct elf64_shdr {
86806 #define EI_OSABI 7
86807 #define EI_PAD 8
86808
86809 +#define EI_PAX 14
86810 +
86811 #define ELFMAG0 0x7f /* EI_MAG */
86812 #define ELFMAG1 'E'
86813 #define ELFMAG2 'L'
86814 diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
86815 index aa169c4..6a2771d 100644
86816 --- a/include/uapi/linux/personality.h
86817 +++ b/include/uapi/linux/personality.h
86818 @@ -30,6 +30,7 @@ enum {
86819 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
86820 ADDR_NO_RANDOMIZE | \
86821 ADDR_COMPAT_LAYOUT | \
86822 + ADDR_LIMIT_3GB | \
86823 MMAP_PAGE_ZERO)
86824
86825 /*
86826 diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
86827 index 7530e74..e714828 100644
86828 --- a/include/uapi/linux/screen_info.h
86829 +++ b/include/uapi/linux/screen_info.h
86830 @@ -43,7 +43,8 @@ struct screen_info {
86831 __u16 pages; /* 0x32 */
86832 __u16 vesa_attributes; /* 0x34 */
86833 __u32 capabilities; /* 0x36 */
86834 - __u8 _reserved[6]; /* 0x3a */
86835 + __u16 vesapm_size; /* 0x3a */
86836 + __u8 _reserved[4]; /* 0x3c */
86837 } __attribute__((packed));
86838
86839 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
86840 diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
86841 index 0e011eb..82681b1 100644
86842 --- a/include/uapi/linux/swab.h
86843 +++ b/include/uapi/linux/swab.h
86844 @@ -43,7 +43,7 @@
86845 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
86846 */
86847
86848 -static inline __attribute_const__ __u16 __fswab16(__u16 val)
86849 +static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
86850 {
86851 #ifdef __HAVE_BUILTIN_BSWAP16__
86852 return __builtin_bswap16(val);
86853 @@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
86854 #endif
86855 }
86856
86857 -static inline __attribute_const__ __u32 __fswab32(__u32 val)
86858 +static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
86859 {
86860 #ifdef __HAVE_BUILTIN_BSWAP32__
86861 return __builtin_bswap32(val);
86862 @@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
86863 #endif
86864 }
86865
86866 -static inline __attribute_const__ __u64 __fswab64(__u64 val)
86867 +static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
86868 {
86869 #ifdef __HAVE_BUILTIN_BSWAP64__
86870 return __builtin_bswap64(val);
86871 diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
86872 index 43aaba1..1c30b48 100644
86873 --- a/include/uapi/linux/sysctl.h
86874 +++ b/include/uapi/linux/sysctl.h
86875 @@ -155,8 +155,6 @@ enum
86876 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
86877 };
86878
86879 -
86880 -
86881 /* CTL_VM names: */
86882 enum
86883 {
86884 diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
86885 index 1590c49..5eab462 100644
86886 --- a/include/uapi/linux/xattr.h
86887 +++ b/include/uapi/linux/xattr.h
86888 @@ -73,5 +73,9 @@
86889 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
86890 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
86891
86892 +/* User namespace */
86893 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
86894 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
86895 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
86896
86897 #endif /* _UAPI_LINUX_XATTR_H */
86898 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
86899 index f9466fa..f4e2b81 100644
86900 --- a/include/video/udlfb.h
86901 +++ b/include/video/udlfb.h
86902 @@ -53,10 +53,10 @@ struct dlfb_data {
86903 u32 pseudo_palette[256];
86904 int blank_mode; /*one of FB_BLANK_ */
86905 /* blit-only rendering path metrics, exposed through sysfs */
86906 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86907 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
86908 - atomic_t bytes_sent; /* to usb, after compression including overhead */
86909 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
86910 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86911 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
86912 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
86913 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
86914 };
86915
86916 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
86917 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
86918 index 30f5362..8ed8ac9 100644
86919 --- a/include/video/uvesafb.h
86920 +++ b/include/video/uvesafb.h
86921 @@ -122,6 +122,7 @@ struct uvesafb_par {
86922 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
86923 u8 pmi_setpal; /* PMI for palette changes */
86924 u16 *pmi_base; /* protected mode interface location */
86925 + u8 *pmi_code; /* protected mode code location */
86926 void *pmi_start;
86927 void *pmi_pal;
86928 u8 *vbe_state_orig; /*
86929 diff --git a/init/Kconfig b/init/Kconfig
86930 index 2081a4d..98d1149 100644
86931 --- a/init/Kconfig
86932 +++ b/init/Kconfig
86933 @@ -1150,6 +1150,7 @@ endif # CGROUPS
86934
86935 config CHECKPOINT_RESTORE
86936 bool "Checkpoint/restore support" if EXPERT
86937 + depends on !GRKERNSEC
86938 default n
86939 help
86940 Enables additional kernel features in a sake of checkpoint/restore.
86941 @@ -1659,7 +1660,7 @@ config SLUB_DEBUG
86942
86943 config COMPAT_BRK
86944 bool "Disable heap randomization"
86945 - default y
86946 + default n
86947 help
86948 Randomizing heap placement makes heap exploits harder, but it
86949 also breaks ancient binaries (including anything libc5 based).
86950 @@ -1990,7 +1991,7 @@ config INIT_ALL_POSSIBLE
86951 config STOP_MACHINE
86952 bool
86953 default y
86954 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
86955 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
86956 help
86957 Need stop_machine() primitive.
86958
86959 diff --git a/init/Makefile b/init/Makefile
86960 index 7bc47ee..6da2dc7 100644
86961 --- a/init/Makefile
86962 +++ b/init/Makefile
86963 @@ -2,6 +2,9 @@
86964 # Makefile for the linux kernel.
86965 #
86966
86967 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
86968 +asflags-y := $(GCC_PLUGINS_AFLAGS)
86969 +
86970 obj-y := main.o version.o mounts.o
86971 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
86972 obj-y += noinitramfs.o
86973 diff --git a/init/do_mounts.c b/init/do_mounts.c
86974 index 9b3565c..3f90cf9 100644
86975 --- a/init/do_mounts.c
86976 +++ b/init/do_mounts.c
86977 @@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
86978 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
86979 {
86980 struct super_block *s;
86981 - int err = sys_mount(name, "/root", fs, flags, data);
86982 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
86983 if (err)
86984 return err;
86985
86986 - sys_chdir("/root");
86987 + sys_chdir((const char __force_user *)"/root");
86988 s = current->fs->pwd.dentry->d_sb;
86989 ROOT_DEV = s->s_dev;
86990 printk(KERN_INFO
86991 @@ -485,18 +485,18 @@ void __init change_floppy(char *fmt, ...)
86992 va_start(args, fmt);
86993 vsprintf(buf, fmt, args);
86994 va_end(args);
86995 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
86996 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
86997 if (fd >= 0) {
86998 sys_ioctl(fd, FDEJECT, 0);
86999 sys_close(fd);
87000 }
87001 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
87002 - fd = sys_open("/dev/console", O_RDWR, 0);
87003 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
87004 if (fd >= 0) {
87005 sys_ioctl(fd, TCGETS, (long)&termios);
87006 termios.c_lflag &= ~ICANON;
87007 sys_ioctl(fd, TCSETSF, (long)&termios);
87008 - sys_read(fd, &c, 1);
87009 + sys_read(fd, (char __user *)&c, 1);
87010 termios.c_lflag |= ICANON;
87011 sys_ioctl(fd, TCSETSF, (long)&termios);
87012 sys_close(fd);
87013 @@ -590,8 +590,8 @@ void __init prepare_namespace(void)
87014 mount_root();
87015 out:
87016 devtmpfs_mount("dev");
87017 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
87018 - sys_chroot(".");
87019 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87020 + sys_chroot((const char __force_user *)".");
87021 }
87022
87023 static bool is_tmpfs;
87024 diff --git a/init/do_mounts.h b/init/do_mounts.h
87025 index f5b978a..69dbfe8 100644
87026 --- a/init/do_mounts.h
87027 +++ b/init/do_mounts.h
87028 @@ -15,15 +15,15 @@ extern int root_mountflags;
87029
87030 static inline int create_dev(char *name, dev_t dev)
87031 {
87032 - sys_unlink(name);
87033 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
87034 + sys_unlink((char __force_user *)name);
87035 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
87036 }
87037
87038 #if BITS_PER_LONG == 32
87039 static inline u32 bstat(char *name)
87040 {
87041 struct stat64 stat;
87042 - if (sys_stat64(name, &stat) != 0)
87043 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
87044 return 0;
87045 if (!S_ISBLK(stat.st_mode))
87046 return 0;
87047 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
87048 static inline u32 bstat(char *name)
87049 {
87050 struct stat stat;
87051 - if (sys_newstat(name, &stat) != 0)
87052 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
87053 return 0;
87054 if (!S_ISBLK(stat.st_mode))
87055 return 0;
87056 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
87057 index 3e0878e..8a9d7a0 100644
87058 --- a/init/do_mounts_initrd.c
87059 +++ b/init/do_mounts_initrd.c
87060 @@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
87061 {
87062 sys_unshare(CLONE_FS | CLONE_FILES);
87063 /* stdin/stdout/stderr for /linuxrc */
87064 - sys_open("/dev/console", O_RDWR, 0);
87065 + sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
87066 sys_dup(0);
87067 sys_dup(0);
87068 /* move initrd over / and chdir/chroot in initrd root */
87069 - sys_chdir("/root");
87070 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
87071 - sys_chroot(".");
87072 + sys_chdir((const char __force_user *)"/root");
87073 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87074 + sys_chroot((const char __force_user *)".");
87075 sys_setsid();
87076 return 0;
87077 }
87078 @@ -59,8 +59,8 @@ static void __init handle_initrd(void)
87079 create_dev("/dev/root.old", Root_RAM0);
87080 /* mount initrd on rootfs' /root */
87081 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
87082 - sys_mkdir("/old", 0700);
87083 - sys_chdir("/old");
87084 + sys_mkdir((const char __force_user *)"/old", 0700);
87085 + sys_chdir((const char __force_user *)"/old");
87086
87087 /* try loading default modules from initrd */
87088 load_default_modules();
87089 @@ -80,31 +80,31 @@ static void __init handle_initrd(void)
87090 current->flags &= ~PF_FREEZER_SKIP;
87091
87092 /* move initrd to rootfs' /old */
87093 - sys_mount("..", ".", NULL, MS_MOVE, NULL);
87094 + sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
87095 /* switch root and cwd back to / of rootfs */
87096 - sys_chroot("..");
87097 + sys_chroot((const char __force_user *)"..");
87098
87099 if (new_decode_dev(real_root_dev) == Root_RAM0) {
87100 - sys_chdir("/old");
87101 + sys_chdir((const char __force_user *)"/old");
87102 return;
87103 }
87104
87105 - sys_chdir("/");
87106 + sys_chdir((const char __force_user *)"/");
87107 ROOT_DEV = new_decode_dev(real_root_dev);
87108 mount_root();
87109
87110 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
87111 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
87112 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
87113 if (!error)
87114 printk("okay\n");
87115 else {
87116 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
87117 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
87118 if (error == -ENOENT)
87119 printk("/initrd does not exist. Ignored.\n");
87120 else
87121 printk("failed\n");
87122 printk(KERN_NOTICE "Unmounting old root\n");
87123 - sys_umount("/old", MNT_DETACH);
87124 + sys_umount((char __force_user *)"/old", MNT_DETACH);
87125 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
87126 if (fd < 0) {
87127 error = fd;
87128 @@ -127,11 +127,11 @@ int __init initrd_load(void)
87129 * mounted in the normal path.
87130 */
87131 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
87132 - sys_unlink("/initrd.image");
87133 + sys_unlink((const char __force_user *)"/initrd.image");
87134 handle_initrd();
87135 return 1;
87136 }
87137 }
87138 - sys_unlink("/initrd.image");
87139 + sys_unlink((const char __force_user *)"/initrd.image");
87140 return 0;
87141 }
87142 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
87143 index 8cb6db5..d729f50 100644
87144 --- a/init/do_mounts_md.c
87145 +++ b/init/do_mounts_md.c
87146 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
87147 partitioned ? "_d" : "", minor,
87148 md_setup_args[ent].device_names);
87149
87150 - fd = sys_open(name, 0, 0);
87151 + fd = sys_open((char __force_user *)name, 0, 0);
87152 if (fd < 0) {
87153 printk(KERN_ERR "md: open failed - cannot start "
87154 "array %s\n", name);
87155 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
87156 * array without it
87157 */
87158 sys_close(fd);
87159 - fd = sys_open(name, 0, 0);
87160 + fd = sys_open((char __force_user *)name, 0, 0);
87161 sys_ioctl(fd, BLKRRPART, 0);
87162 }
87163 sys_close(fd);
87164 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
87165
87166 wait_for_device_probe();
87167
87168 - fd = sys_open("/dev/md0", 0, 0);
87169 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
87170 if (fd >= 0) {
87171 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
87172 sys_close(fd);
87173 diff --git a/init/init_task.c b/init/init_task.c
87174 index ba0a7f36..2bcf1d5 100644
87175 --- a/init/init_task.c
87176 +++ b/init/init_task.c
87177 @@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
87178 * Initial thread structure. Alignment of this is handled by a special
87179 * linker map entry.
87180 */
87181 +#ifdef CONFIG_X86
87182 +union thread_union init_thread_union __init_task_data;
87183 +#else
87184 union thread_union init_thread_union __init_task_data =
87185 { INIT_THREAD_INFO(init_task) };
87186 +#endif
87187 diff --git a/init/initramfs.c b/init/initramfs.c
87188 index ad1bd77..dca2c1b 100644
87189 --- a/init/initramfs.c
87190 +++ b/init/initramfs.c
87191 @@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
87192
87193 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
87194 while (count) {
87195 - ssize_t rv = sys_write(fd, p, count);
87196 + ssize_t rv = sys_write(fd, (char __force_user *)p, count);
87197
87198 if (rv < 0) {
87199 if (rv == -EINTR || rv == -EAGAIN)
87200 @@ -107,7 +107,7 @@ static void __init free_hash(void)
87201 }
87202 }
87203
87204 -static long __init do_utime(char *filename, time_t mtime)
87205 +static long __init do_utime(char __force_user *filename, time_t mtime)
87206 {
87207 struct timespec t[2];
87208
87209 @@ -142,7 +142,7 @@ static void __init dir_utime(void)
87210 struct dir_entry *de, *tmp;
87211 list_for_each_entry_safe(de, tmp, &dir_list, list) {
87212 list_del(&de->list);
87213 - do_utime(de->name, de->mtime);
87214 + do_utime((char __force_user *)de->name, de->mtime);
87215 kfree(de->name);
87216 kfree(de);
87217 }
87218 @@ -304,7 +304,7 @@ static int __init maybe_link(void)
87219 if (nlink >= 2) {
87220 char *old = find_link(major, minor, ino, mode, collected);
87221 if (old)
87222 - return (sys_link(old, collected) < 0) ? -1 : 1;
87223 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
87224 }
87225 return 0;
87226 }
87227 @@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
87228 {
87229 struct stat st;
87230
87231 - if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
87232 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
87233 if (S_ISDIR(st.st_mode))
87234 - sys_rmdir(path);
87235 + sys_rmdir((char __force_user *)path);
87236 else
87237 - sys_unlink(path);
87238 + sys_unlink((char __force_user *)path);
87239 }
87240 }
87241
87242 @@ -338,7 +338,7 @@ static int __init do_name(void)
87243 int openflags = O_WRONLY|O_CREAT;
87244 if (ml != 1)
87245 openflags |= O_TRUNC;
87246 - wfd = sys_open(collected, openflags, mode);
87247 + wfd = sys_open((char __force_user *)collected, openflags, mode);
87248
87249 if (wfd >= 0) {
87250 sys_fchown(wfd, uid, gid);
87251 @@ -350,17 +350,17 @@ static int __init do_name(void)
87252 }
87253 }
87254 } else if (S_ISDIR(mode)) {
87255 - sys_mkdir(collected, mode);
87256 - sys_chown(collected, uid, gid);
87257 - sys_chmod(collected, mode);
87258 + sys_mkdir((char __force_user *)collected, mode);
87259 + sys_chown((char __force_user *)collected, uid, gid);
87260 + sys_chmod((char __force_user *)collected, mode);
87261 dir_add(collected, mtime);
87262 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
87263 S_ISFIFO(mode) || S_ISSOCK(mode)) {
87264 if (maybe_link() == 0) {
87265 - sys_mknod(collected, mode, rdev);
87266 - sys_chown(collected, uid, gid);
87267 - sys_chmod(collected, mode);
87268 - do_utime(collected, mtime);
87269 + sys_mknod((char __force_user *)collected, mode, rdev);
87270 + sys_chown((char __force_user *)collected, uid, gid);
87271 + sys_chmod((char __force_user *)collected, mode);
87272 + do_utime((char __force_user *)collected, mtime);
87273 }
87274 }
87275 return 0;
87276 @@ -372,7 +372,7 @@ static int __init do_copy(void)
87277 if (xwrite(wfd, victim, body_len) != body_len)
87278 error("write error");
87279 sys_close(wfd);
87280 - do_utime(vcollected, mtime);
87281 + do_utime((char __force_user *)vcollected, mtime);
87282 kfree(vcollected);
87283 eat(body_len);
87284 state = SkipIt;
87285 @@ -390,9 +390,9 @@ static int __init do_symlink(void)
87286 {
87287 collected[N_ALIGN(name_len) + body_len] = '\0';
87288 clean_path(collected, 0);
87289 - sys_symlink(collected + N_ALIGN(name_len), collected);
87290 - sys_lchown(collected, uid, gid);
87291 - do_utime(collected, mtime);
87292 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
87293 + sys_lchown((char __force_user *)collected, uid, gid);
87294 + do_utime((char __force_user *)collected, mtime);
87295 state = SkipIt;
87296 next_state = Reset;
87297 return 0;
87298 diff --git a/init/main.c b/init/main.c
87299 index 321d0ce..91b53e5 100644
87300 --- a/init/main.c
87301 +++ b/init/main.c
87302 @@ -98,6 +98,8 @@ extern void radix_tree_init(void);
87303 static inline void mark_rodata_ro(void) { }
87304 #endif
87305
87306 +extern void grsecurity_init(void);
87307 +
87308 /*
87309 * Debug helper: via this flag we know that we are in 'early bootup code'
87310 * where only the boot processor is running with IRQ disabled. This means
87311 @@ -159,6 +161,75 @@ static int __init set_reset_devices(char *str)
87312
87313 __setup("reset_devices", set_reset_devices);
87314
87315 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
87316 +kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
87317 +static int __init setup_grsec_proc_gid(char *str)
87318 +{
87319 + grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
87320 + return 1;
87321 +}
87322 +__setup("grsec_proc_gid=", setup_grsec_proc_gid);
87323 +#endif
87324 +
87325 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
87326 +unsigned long pax_user_shadow_base __read_only;
87327 +EXPORT_SYMBOL(pax_user_shadow_base);
87328 +extern char pax_enter_kernel_user[];
87329 +extern char pax_exit_kernel_user[];
87330 +#endif
87331 +
87332 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
87333 +static int __init setup_pax_nouderef(char *str)
87334 +{
87335 +#ifdef CONFIG_X86_32
87336 + unsigned int cpu;
87337 + struct desc_struct *gdt;
87338 +
87339 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
87340 + gdt = get_cpu_gdt_table(cpu);
87341 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
87342 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
87343 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
87344 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
87345 + }
87346 + loadsegment(ds, __KERNEL_DS);
87347 + loadsegment(es, __KERNEL_DS);
87348 + loadsegment(ss, __KERNEL_DS);
87349 +#else
87350 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
87351 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
87352 + clone_pgd_mask = ~(pgdval_t)0UL;
87353 + pax_user_shadow_base = 0UL;
87354 + setup_clear_cpu_cap(X86_FEATURE_PCID);
87355 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
87356 +#endif
87357 +
87358 + return 0;
87359 +}
87360 +early_param("pax_nouderef", setup_pax_nouderef);
87361 +
87362 +#ifdef CONFIG_X86_64
87363 +static int __init setup_pax_weakuderef(char *str)
87364 +{
87365 + if (clone_pgd_mask != ~(pgdval_t)0UL)
87366 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
87367 + return 1;
87368 +}
87369 +__setup("pax_weakuderef", setup_pax_weakuderef);
87370 +#endif
87371 +#endif
87372 +
87373 +#ifdef CONFIG_PAX_SOFTMODE
87374 +int pax_softmode;
87375 +
87376 +static int __init setup_pax_softmode(char *str)
87377 +{
87378 + get_option(&str, &pax_softmode);
87379 + return 1;
87380 +}
87381 +__setup("pax_softmode=", setup_pax_softmode);
87382 +#endif
87383 +
87384 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
87385 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
87386 static const char *panic_later, *panic_param;
87387 @@ -728,7 +799,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
87388 struct blacklist_entry *entry;
87389 char *fn_name;
87390
87391 - fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
87392 + fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
87393 if (!fn_name)
87394 return false;
87395
87396 @@ -780,7 +851,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
87397 {
87398 int count = preempt_count();
87399 int ret;
87400 - char msgbuf[64];
87401 + const char *msg1 = "", *msg2 = "";
87402
87403 if (initcall_blacklisted(fn))
87404 return -EPERM;
87405 @@ -790,18 +861,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
87406 else
87407 ret = fn();
87408
87409 - msgbuf[0] = 0;
87410 -
87411 if (preempt_count() != count) {
87412 - sprintf(msgbuf, "preemption imbalance ");
87413 + msg1 = " preemption imbalance";
87414 preempt_count_set(count);
87415 }
87416 if (irqs_disabled()) {
87417 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
87418 + msg2 = " disabled interrupts";
87419 local_irq_enable();
87420 }
87421 - WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
87422 + WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
87423
87424 + add_latent_entropy();
87425 return ret;
87426 }
87427
87428 @@ -907,8 +977,8 @@ static int run_init_process(const char *init_filename)
87429 {
87430 argv_init[0] = init_filename;
87431 return do_execve(getname_kernel(init_filename),
87432 - (const char __user *const __user *)argv_init,
87433 - (const char __user *const __user *)envp_init);
87434 + (const char __user *const __force_user *)argv_init,
87435 + (const char __user *const __force_user *)envp_init);
87436 }
87437
87438 static int try_to_run_init_process(const char *init_filename)
87439 @@ -925,6 +995,10 @@ static int try_to_run_init_process(const char *init_filename)
87440 return ret;
87441 }
87442
87443 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87444 +extern int gr_init_ran;
87445 +#endif
87446 +
87447 static noinline void __init kernel_init_freeable(void);
87448
87449 static int __ref kernel_init(void *unused)
87450 @@ -949,6 +1023,11 @@ static int __ref kernel_init(void *unused)
87451 ramdisk_execute_command, ret);
87452 }
87453
87454 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87455 + /* if no initrd was used, be extra sure we enforce chroot restrictions */
87456 + gr_init_ran = 1;
87457 +#endif
87458 +
87459 /*
87460 * We try each of these until one succeeds.
87461 *
87462 @@ -1004,7 +1083,7 @@ static noinline void __init kernel_init_freeable(void)
87463 do_basic_setup();
87464
87465 /* Open the /dev/console on the rootfs, this should never fail */
87466 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
87467 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
87468 pr_err("Warning: unable to open an initial console.\n");
87469
87470 (void) sys_dup(0);
87471 @@ -1017,11 +1096,13 @@ static noinline void __init kernel_init_freeable(void)
87472 if (!ramdisk_execute_command)
87473 ramdisk_execute_command = "/init";
87474
87475 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
87476 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
87477 ramdisk_execute_command = NULL;
87478 prepare_namespace();
87479 }
87480
87481 + grsecurity_init();
87482 +
87483 /*
87484 * Ok, we have completed the initial bootup, and
87485 * we're essentially up and running. Get rid of the
87486 diff --git a/ipc/compat.c b/ipc/compat.c
87487 index 9b3c85f..1c4d897 100644
87488 --- a/ipc/compat.c
87489 +++ b/ipc/compat.c
87490 @@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
87491 COMPAT_SHMLBA);
87492 if (err < 0)
87493 return err;
87494 - return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
87495 + return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
87496 }
87497 case SHMDT:
87498 return sys_shmdt(compat_ptr(ptr));
87499 diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
87500 index e8075b2..76f2c6a 100644
87501 --- a/ipc/ipc_sysctl.c
87502 +++ b/ipc/ipc_sysctl.c
87503 @@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
87504 static int proc_ipc_dointvec(struct ctl_table *table, int write,
87505 void __user *buffer, size_t *lenp, loff_t *ppos)
87506 {
87507 - struct ctl_table ipc_table;
87508 + ctl_table_no_const ipc_table;
87509
87510 memcpy(&ipc_table, table, sizeof(ipc_table));
87511 ipc_table.data = get_ipc(table);
87512 @@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
87513 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
87514 void __user *buffer, size_t *lenp, loff_t *ppos)
87515 {
87516 - struct ctl_table ipc_table;
87517 + ctl_table_no_const ipc_table;
87518
87519 memcpy(&ipc_table, table, sizeof(ipc_table));
87520 ipc_table.data = get_ipc(table);
87521 @@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
87522 static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87523 void __user *buffer, size_t *lenp, loff_t *ppos)
87524 {
87525 - struct ctl_table ipc_table;
87526 + ctl_table_no_const ipc_table;
87527 size_t lenp_bef = *lenp;
87528 int rc;
87529
87530 @@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87531 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
87532 void __user *buffer, size_t *lenp, loff_t *ppos)
87533 {
87534 - struct ctl_table ipc_table;
87535 + ctl_table_no_const ipc_table;
87536 memcpy(&ipc_table, table, sizeof(ipc_table));
87537 ipc_table.data = get_ipc(table);
87538
87539 @@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
87540 static int proc_ipcauto_dointvec_minmax(struct ctl_table *table, int write,
87541 void __user *buffer, size_t *lenp, loff_t *ppos)
87542 {
87543 - struct ctl_table ipc_table;
87544 + ctl_table_no_const ipc_table;
87545 int oldval;
87546 int rc;
87547
87548 diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
87549 index 68d4e95..1477ded 100644
87550 --- a/ipc/mq_sysctl.c
87551 +++ b/ipc/mq_sysctl.c
87552 @@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
87553 static int proc_mq_dointvec(struct ctl_table *table, int write,
87554 void __user *buffer, size_t *lenp, loff_t *ppos)
87555 {
87556 - struct ctl_table mq_table;
87557 + ctl_table_no_const mq_table;
87558 memcpy(&mq_table, table, sizeof(mq_table));
87559 mq_table.data = get_mq(table);
87560
87561 @@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
87562 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
87563 void __user *buffer, size_t *lenp, loff_t *ppos)
87564 {
87565 - struct ctl_table mq_table;
87566 + ctl_table_no_const mq_table;
87567 memcpy(&mq_table, table, sizeof(mq_table));
87568 mq_table.data = get_mq(table);
87569
87570 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
87571 index 4fcf39a..d3cc2ec 100644
87572 --- a/ipc/mqueue.c
87573 +++ b/ipc/mqueue.c
87574 @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
87575 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
87576 info->attr.mq_msgsize);
87577
87578 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
87579 spin_lock(&mq_lock);
87580 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
87581 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
87582 diff --git a/ipc/shm.c b/ipc/shm.c
87583 index 0145479..3d27947 100644
87584 --- a/ipc/shm.c
87585 +++ b/ipc/shm.c
87586 @@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
87587 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
87588 #endif
87589
87590 +#ifdef CONFIG_GRKERNSEC
87591 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87592 + const u64 shm_createtime, const kuid_t cuid,
87593 + const int shmid);
87594 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87595 + const u64 shm_createtime);
87596 +#endif
87597 +
87598 void shm_init_ns(struct ipc_namespace *ns)
87599 {
87600 ns->shm_ctlmax = SHMMAX;
87601 @@ -559,6 +567,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
87602 shp->shm_lprid = 0;
87603 shp->shm_atim = shp->shm_dtim = 0;
87604 shp->shm_ctim = get_seconds();
87605 +#ifdef CONFIG_GRKERNSEC
87606 + shp->shm_createtime = ktime_get_ns();
87607 +#endif
87608 shp->shm_segsz = size;
87609 shp->shm_nattch = 0;
87610 shp->shm_file = file;
87611 @@ -1095,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87612 f_mode = FMODE_READ | FMODE_WRITE;
87613 }
87614 if (shmflg & SHM_EXEC) {
87615 +
87616 +#ifdef CONFIG_PAX_MPROTECT
87617 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
87618 + goto out;
87619 +#endif
87620 +
87621 prot |= PROT_EXEC;
87622 acc_mode |= S_IXUGO;
87623 }
87624 @@ -1119,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87625 if (err)
87626 goto out_unlock;
87627
87628 +#ifdef CONFIG_GRKERNSEC
87629 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
87630 + shp->shm_perm.cuid, shmid) ||
87631 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
87632 + err = -EACCES;
87633 + goto out_unlock;
87634 + }
87635 +#endif
87636 +
87637 ipc_lock_object(&shp->shm_perm);
87638
87639 /* check if shm_destroy() is tearing down shp */
87640 @@ -1131,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87641 path = shp->shm_file->f_path;
87642 path_get(&path);
87643 shp->shm_nattch++;
87644 +#ifdef CONFIG_GRKERNSEC
87645 + shp->shm_lapid = current->pid;
87646 +#endif
87647 size = i_size_read(path.dentry->d_inode);
87648 ipc_unlock_object(&shp->shm_perm);
87649 rcu_read_unlock();
87650 diff --git a/ipc/util.c b/ipc/util.c
87651 index 88adc32..3867c68 100644
87652 --- a/ipc/util.c
87653 +++ b/ipc/util.c
87654 @@ -71,6 +71,8 @@ struct ipc_proc_iface {
87655 int (*show)(struct seq_file *, void *);
87656 };
87657
87658 +extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
87659 +
87660 static void ipc_memory_notifier(struct work_struct *work)
87661 {
87662 ipcns_notify(IPCNS_MEMCHANGED);
87663 @@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
87664 granted_mode >>= 6;
87665 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
87666 granted_mode >>= 3;
87667 +
87668 + if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
87669 + return -1;
87670 +
87671 /* is there some bit set in requested_mode but not in granted_mode? */
87672 if ((requested_mode & ~granted_mode & 0007) &&
87673 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
87674 diff --git a/kernel/audit.c b/kernel/audit.c
87675 index cebb11d..4e0295f 100644
87676 --- a/kernel/audit.c
87677 +++ b/kernel/audit.c
87678 @@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
87679 3) suppressed due to audit_rate_limit
87680 4) suppressed due to audit_backlog_limit
87681 */
87682 -static atomic_t audit_lost = ATOMIC_INIT(0);
87683 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
87684
87685 /* The netlink socket. */
87686 static struct sock *audit_sock;
87687 @@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
87688 unsigned long now;
87689 int print;
87690
87691 - atomic_inc(&audit_lost);
87692 + atomic_inc_unchecked(&audit_lost);
87693
87694 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
87695
87696 @@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
87697 if (print) {
87698 if (printk_ratelimit())
87699 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
87700 - atomic_read(&audit_lost),
87701 + atomic_read_unchecked(&audit_lost),
87702 audit_rate_limit,
87703 audit_backlog_limit);
87704 audit_panic(message);
87705 @@ -840,7 +840,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
87706 s.pid = audit_pid;
87707 s.rate_limit = audit_rate_limit;
87708 s.backlog_limit = audit_backlog_limit;
87709 - s.lost = atomic_read(&audit_lost);
87710 + s.lost = atomic_read_unchecked(&audit_lost);
87711 s.backlog = skb_queue_len(&audit_skb_queue);
87712 s.version = AUDIT_VERSION_LATEST;
87713 s.backlog_wait_time = audit_backlog_wait_time;
87714 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
87715 index e420a0c..38137fa 100644
87716 --- a/kernel/auditsc.c
87717 +++ b/kernel/auditsc.c
87718 @@ -2014,7 +2014,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
87719 }
87720
87721 /* global counter which is incremented every time something logs in */
87722 -static atomic_t session_id = ATOMIC_INIT(0);
87723 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
87724
87725 static int audit_set_loginuid_perm(kuid_t loginuid)
87726 {
87727 @@ -2081,7 +2081,7 @@ int audit_set_loginuid(kuid_t loginuid)
87728
87729 /* are we setting or clearing? */
87730 if (uid_valid(loginuid))
87731 - sessionid = (unsigned int)atomic_inc_return(&session_id);
87732 + sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
87733
87734 task->sessionid = sessionid;
87735 task->loginuid = loginuid;
87736 diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
87737 index d6594e4..597264b 100644
87738 --- a/kernel/bpf/core.c
87739 +++ b/kernel/bpf/core.c
87740 @@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87741 * random section of illegal instructions.
87742 */
87743 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
87744 - hdr = module_alloc(size);
87745 + hdr = module_alloc_exec(size);
87746 if (hdr == NULL)
87747 return NULL;
87748
87749 /* Fill space with illegal/arch-dep instructions. */
87750 bpf_fill_ill_insns(hdr, size);
87751
87752 + pax_open_kernel();
87753 hdr->pages = size / PAGE_SIZE;
87754 + pax_close_kernel();
87755 +
87756 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
87757 PAGE_SIZE - sizeof(*hdr));
87758 start = (prandom_u32() % hole) & ~(alignment - 1);
87759 @@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87760
87761 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
87762 {
87763 - module_free(NULL, hdr);
87764 + module_free_exec(NULL, hdr);
87765 }
87766 #endif /* CONFIG_BPF_JIT */
87767
87768 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
87769 index ba61c8c..c60c486 100644
87770 --- a/kernel/bpf/syscall.c
87771 +++ b/kernel/bpf/syscall.c
87772 @@ -539,11 +539,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
87773 int err;
87774
87775 /* the syscall is limited to root temporarily. This restriction will be
87776 - * lifted when security audit is clean. Note that eBPF+tracing must have
87777 - * this restriction, since it may pass kernel data to user space
87778 + * lifted by upstream when a half-assed security audit is clean. Note
87779 + * that eBPF+tracing must have this restriction, since it may pass
87780 + * kernel data to user space
87781 */
87782 if (!capable(CAP_SYS_ADMIN))
87783 return -EPERM;
87784 +#ifdef CONFIG_GRKERNSEC
87785 + return -EPERM;
87786 +#endif
87787
87788 if (!access_ok(VERIFY_READ, uattr, 1))
87789 return -EFAULT;
87790 diff --git a/kernel/capability.c b/kernel/capability.c
87791 index 989f5bf..d317ca0 100644
87792 --- a/kernel/capability.c
87793 +++ b/kernel/capability.c
87794 @@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
87795 * before modification is attempted and the application
87796 * fails.
87797 */
87798 + if (tocopy > ARRAY_SIZE(kdata))
87799 + return -EFAULT;
87800 +
87801 if (copy_to_user(dataptr, kdata, tocopy
87802 * sizeof(struct __user_cap_data_struct))) {
87803 return -EFAULT;
87804 @@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
87805 int ret;
87806
87807 rcu_read_lock();
87808 - ret = security_capable(__task_cred(t), ns, cap);
87809 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
87810 + gr_task_is_capable(t, __task_cred(t), cap);
87811 rcu_read_unlock();
87812
87813 - return (ret == 0);
87814 + return ret;
87815 }
87816
87817 /**
87818 @@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
87819 int ret;
87820
87821 rcu_read_lock();
87822 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
87823 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
87824 rcu_read_unlock();
87825
87826 - return (ret == 0);
87827 + return ret;
87828 }
87829
87830 /**
87831 @@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
87832 BUG();
87833 }
87834
87835 - if (security_capable(current_cred(), ns, cap) == 0) {
87836 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
87837 current->flags |= PF_SUPERPRIV;
87838 return true;
87839 }
87840 @@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
87841 }
87842 EXPORT_SYMBOL(ns_capable);
87843
87844 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
87845 +{
87846 + if (unlikely(!cap_valid(cap))) {
87847 + printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
87848 + BUG();
87849 + }
87850 +
87851 + if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
87852 + current->flags |= PF_SUPERPRIV;
87853 + return true;
87854 + }
87855 + return false;
87856 +}
87857 +EXPORT_SYMBOL(ns_capable_nolog);
87858 +
87859 /**
87860 * file_ns_capable - Determine if the file's opener had a capability in effect
87861 * @file: The file we want to check
87862 @@ -427,6 +446,12 @@ bool capable(int cap)
87863 }
87864 EXPORT_SYMBOL(capable);
87865
87866 +bool capable_nolog(int cap)
87867 +{
87868 + return ns_capable_nolog(&init_user_ns, cap);
87869 +}
87870 +EXPORT_SYMBOL(capable_nolog);
87871 +
87872 /**
87873 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
87874 * @inode: The inode in question
87875 @@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
87876 kgid_has_mapping(ns, inode->i_gid);
87877 }
87878 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
87879 +
87880 +bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
87881 +{
87882 + struct user_namespace *ns = current_user_ns();
87883 +
87884 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
87885 + kgid_has_mapping(ns, inode->i_gid);
87886 +}
87887 +EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
87888 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
87889 index 136ecea..45157a6 100644
87890 --- a/kernel/cgroup.c
87891 +++ b/kernel/cgroup.c
87892 @@ -5276,6 +5276,9 @@ static void cgroup_release_agent(struct work_struct *work)
87893 if (!pathbuf || !agentbuf)
87894 goto out;
87895
87896 + if (agentbuf[0] == '\0')
87897 + goto out;
87898 +
87899 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
87900 if (!path)
87901 goto out;
87902 @@ -5461,7 +5464,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
87903 struct task_struct *task;
87904 int count = 0;
87905
87906 - seq_printf(seq, "css_set %p\n", cset);
87907 + seq_printf(seq, "css_set %pK\n", cset);
87908
87909 list_for_each_entry(task, &cset->tasks, cg_list) {
87910 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
87911 diff --git a/kernel/compat.c b/kernel/compat.c
87912 index ebb3c36..1df606e 100644
87913 --- a/kernel/compat.c
87914 +++ b/kernel/compat.c
87915 @@ -13,6 +13,7 @@
87916
87917 #include <linux/linkage.h>
87918 #include <linux/compat.h>
87919 +#include <linux/module.h>
87920 #include <linux/errno.h>
87921 #include <linux/time.h>
87922 #include <linux/signal.h>
87923 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
87924 mm_segment_t oldfs;
87925 long ret;
87926
87927 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
87928 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
87929 oldfs = get_fs();
87930 set_fs(KERNEL_DS);
87931 ret = hrtimer_nanosleep_restart(restart);
87932 @@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
87933 oldfs = get_fs();
87934 set_fs(KERNEL_DS);
87935 ret = hrtimer_nanosleep(&tu,
87936 - rmtp ? (struct timespec __user *)&rmt : NULL,
87937 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
87938 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
87939 set_fs(oldfs);
87940
87941 @@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
87942 mm_segment_t old_fs = get_fs();
87943
87944 set_fs(KERNEL_DS);
87945 - ret = sys_sigpending((old_sigset_t __user *) &s);
87946 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
87947 set_fs(old_fs);
87948 if (ret == 0)
87949 ret = put_user(s, set);
87950 @@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
87951 mm_segment_t old_fs = get_fs();
87952
87953 set_fs(KERNEL_DS);
87954 - ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
87955 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
87956 set_fs(old_fs);
87957
87958 if (!ret) {
87959 @@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
87960 set_fs (KERNEL_DS);
87961 ret = sys_wait4(pid,
87962 (stat_addr ?
87963 - (unsigned int __user *) &status : NULL),
87964 - options, (struct rusage __user *) &r);
87965 + (unsigned int __force_user *) &status : NULL),
87966 + options, (struct rusage __force_user *) &r);
87967 set_fs (old_fs);
87968
87969 if (ret > 0) {
87970 @@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
87971 memset(&info, 0, sizeof(info));
87972
87973 set_fs(KERNEL_DS);
87974 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
87975 - uru ? (struct rusage __user *)&ru : NULL);
87976 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
87977 + uru ? (struct rusage __force_user *)&ru : NULL);
87978 set_fs(old_fs);
87979
87980 if ((ret < 0) || (info.si_signo == 0))
87981 @@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
87982 oldfs = get_fs();
87983 set_fs(KERNEL_DS);
87984 err = sys_timer_settime(timer_id, flags,
87985 - (struct itimerspec __user *) &newts,
87986 - (struct itimerspec __user *) &oldts);
87987 + (struct itimerspec __force_user *) &newts,
87988 + (struct itimerspec __force_user *) &oldts);
87989 set_fs(oldfs);
87990 if (!err && old && put_compat_itimerspec(old, &oldts))
87991 return -EFAULT;
87992 @@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
87993 oldfs = get_fs();
87994 set_fs(KERNEL_DS);
87995 err = sys_timer_gettime(timer_id,
87996 - (struct itimerspec __user *) &ts);
87997 + (struct itimerspec __force_user *) &ts);
87998 set_fs(oldfs);
87999 if (!err && put_compat_itimerspec(setting, &ts))
88000 return -EFAULT;
88001 @@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
88002 oldfs = get_fs();
88003 set_fs(KERNEL_DS);
88004 err = sys_clock_settime(which_clock,
88005 - (struct timespec __user *) &ts);
88006 + (struct timespec __force_user *) &ts);
88007 set_fs(oldfs);
88008 return err;
88009 }
88010 @@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
88011 oldfs = get_fs();
88012 set_fs(KERNEL_DS);
88013 err = sys_clock_gettime(which_clock,
88014 - (struct timespec __user *) &ts);
88015 + (struct timespec __force_user *) &ts);
88016 set_fs(oldfs);
88017 if (!err && compat_put_timespec(&ts, tp))
88018 return -EFAULT;
88019 @@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
88020
88021 oldfs = get_fs();
88022 set_fs(KERNEL_DS);
88023 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
88024 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
88025 set_fs(oldfs);
88026
88027 err = compat_put_timex(utp, &txc);
88028 @@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
88029 oldfs = get_fs();
88030 set_fs(KERNEL_DS);
88031 err = sys_clock_getres(which_clock,
88032 - (struct timespec __user *) &ts);
88033 + (struct timespec __force_user *) &ts);
88034 set_fs(oldfs);
88035 if (!err && tp && compat_put_timespec(&ts, tp))
88036 return -EFAULT;
88037 @@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
88038 struct timespec tu;
88039 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
88040
88041 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
88042 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
88043 oldfs = get_fs();
88044 set_fs(KERNEL_DS);
88045 err = clock_nanosleep_restart(restart);
88046 @@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
88047 oldfs = get_fs();
88048 set_fs(KERNEL_DS);
88049 err = sys_clock_nanosleep(which_clock, flags,
88050 - (struct timespec __user *) &in,
88051 - (struct timespec __user *) &out);
88052 + (struct timespec __force_user *) &in,
88053 + (struct timespec __force_user *) &out);
88054 set_fs(oldfs);
88055
88056 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
88057 @@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
88058 mm_segment_t old_fs = get_fs();
88059
88060 set_fs(KERNEL_DS);
88061 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
88062 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
88063 set_fs(old_fs);
88064 if (compat_put_timespec(&t, interval))
88065 return -EFAULT;
88066 diff --git a/kernel/configs.c b/kernel/configs.c
88067 index c18b1f1..b9a0132 100644
88068 --- a/kernel/configs.c
88069 +++ b/kernel/configs.c
88070 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
88071 struct proc_dir_entry *entry;
88072
88073 /* create the current config file */
88074 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
88075 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
88076 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
88077 + &ikconfig_file_ops);
88078 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
88079 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
88080 + &ikconfig_file_ops);
88081 +#endif
88082 +#else
88083 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
88084 &ikconfig_file_ops);
88085 +#endif
88086 +
88087 if (!entry)
88088 return -ENOMEM;
88089
88090 diff --git a/kernel/cred.c b/kernel/cred.c
88091 index e0573a4..26c0fd3 100644
88092 --- a/kernel/cred.c
88093 +++ b/kernel/cred.c
88094 @@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
88095 validate_creds(cred);
88096 alter_cred_subscribers(cred, -1);
88097 put_cred(cred);
88098 +
88099 +#ifdef CONFIG_GRKERNSEC_SETXID
88100 + cred = (struct cred *) tsk->delayed_cred;
88101 + if (cred != NULL) {
88102 + tsk->delayed_cred = NULL;
88103 + validate_creds(cred);
88104 + alter_cred_subscribers(cred, -1);
88105 + put_cred(cred);
88106 + }
88107 +#endif
88108 }
88109
88110 /**
88111 @@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
88112 * Always returns 0 thus allowing this function to be tail-called at the end
88113 * of, say, sys_setgid().
88114 */
88115 -int commit_creds(struct cred *new)
88116 +static int __commit_creds(struct cred *new)
88117 {
88118 struct task_struct *task = current;
88119 const struct cred *old = task->real_cred;
88120 @@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
88121
88122 get_cred(new); /* we will require a ref for the subj creds too */
88123
88124 + gr_set_role_label(task, new->uid, new->gid);
88125 +
88126 /* dumpability changes */
88127 if (!uid_eq(old->euid, new->euid) ||
88128 !gid_eq(old->egid, new->egid) ||
88129 @@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
88130 put_cred(old);
88131 return 0;
88132 }
88133 +#ifdef CONFIG_GRKERNSEC_SETXID
88134 +extern int set_user(struct cred *new);
88135 +
88136 +void gr_delayed_cred_worker(void)
88137 +{
88138 + const struct cred *new = current->delayed_cred;
88139 + struct cred *ncred;
88140 +
88141 + current->delayed_cred = NULL;
88142 +
88143 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
88144 + // from doing get_cred on it when queueing this
88145 + put_cred(new);
88146 + return;
88147 + } else if (new == NULL)
88148 + return;
88149 +
88150 + ncred = prepare_creds();
88151 + if (!ncred)
88152 + goto die;
88153 + // uids
88154 + ncred->uid = new->uid;
88155 + ncred->euid = new->euid;
88156 + ncred->suid = new->suid;
88157 + ncred->fsuid = new->fsuid;
88158 + // gids
88159 + ncred->gid = new->gid;
88160 + ncred->egid = new->egid;
88161 + ncred->sgid = new->sgid;
88162 + ncred->fsgid = new->fsgid;
88163 + // groups
88164 + set_groups(ncred, new->group_info);
88165 + // caps
88166 + ncred->securebits = new->securebits;
88167 + ncred->cap_inheritable = new->cap_inheritable;
88168 + ncred->cap_permitted = new->cap_permitted;
88169 + ncred->cap_effective = new->cap_effective;
88170 + ncred->cap_bset = new->cap_bset;
88171 +
88172 + if (set_user(ncred)) {
88173 + abort_creds(ncred);
88174 + goto die;
88175 + }
88176 +
88177 + // from doing get_cred on it when queueing this
88178 + put_cred(new);
88179 +
88180 + __commit_creds(ncred);
88181 + return;
88182 +die:
88183 + // from doing get_cred on it when queueing this
88184 + put_cred(new);
88185 + do_group_exit(SIGKILL);
88186 +}
88187 +#endif
88188 +
88189 +int commit_creds(struct cred *new)
88190 +{
88191 +#ifdef CONFIG_GRKERNSEC_SETXID
88192 + int ret;
88193 + int schedule_it = 0;
88194 + struct task_struct *t;
88195 + unsigned oldsecurebits = current_cred()->securebits;
88196 +
88197 + /* we won't get called with tasklist_lock held for writing
88198 + and interrupts disabled as the cred struct in that case is
88199 + init_cred
88200 + */
88201 + if (grsec_enable_setxid && !current_is_single_threaded() &&
88202 + uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
88203 + !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
88204 + schedule_it = 1;
88205 + }
88206 + ret = __commit_creds(new);
88207 + if (schedule_it) {
88208 + rcu_read_lock();
88209 + read_lock(&tasklist_lock);
88210 + for (t = next_thread(current); t != current;
88211 + t = next_thread(t)) {
88212 + /* we'll check if the thread has uid 0 in
88213 + * the delayed worker routine
88214 + */
88215 + if (task_securebits(t) == oldsecurebits &&
88216 + t->delayed_cred == NULL) {
88217 + t->delayed_cred = get_cred(new);
88218 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
88219 + set_tsk_need_resched(t);
88220 + }
88221 + }
88222 + read_unlock(&tasklist_lock);
88223 + rcu_read_unlock();
88224 + }
88225 +
88226 + return ret;
88227 +#else
88228 + return __commit_creds(new);
88229 +#endif
88230 +}
88231 +
88232 EXPORT_SYMBOL(commit_creds);
88233
88234 /**
88235 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
88236 index 1adf62b..7736e06 100644
88237 --- a/kernel/debug/debug_core.c
88238 +++ b/kernel/debug/debug_core.c
88239 @@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
88240 */
88241 static atomic_t masters_in_kgdb;
88242 static atomic_t slaves_in_kgdb;
88243 -static atomic_t kgdb_break_tasklet_var;
88244 +static atomic_unchecked_t kgdb_break_tasklet_var;
88245 atomic_t kgdb_setting_breakpoint;
88246
88247 struct task_struct *kgdb_usethread;
88248 @@ -134,7 +134,7 @@ int kgdb_single_step;
88249 static pid_t kgdb_sstep_pid;
88250
88251 /* to keep track of the CPU which is doing the single stepping*/
88252 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88253 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88254
88255 /*
88256 * If you are debugging a problem where roundup (the collection of
88257 @@ -549,7 +549,7 @@ return_normal:
88258 * kernel will only try for the value of sstep_tries before
88259 * giving up and continuing on.
88260 */
88261 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
88262 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
88263 (kgdb_info[cpu].task &&
88264 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
88265 atomic_set(&kgdb_active, -1);
88266 @@ -647,8 +647,8 @@ cpu_master_loop:
88267 }
88268
88269 kgdb_restore:
88270 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
88271 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
88272 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
88273 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
88274 if (kgdb_info[sstep_cpu].task)
88275 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
88276 else
88277 @@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
88278 static void kgdb_tasklet_bpt(unsigned long ing)
88279 {
88280 kgdb_breakpoint();
88281 - atomic_set(&kgdb_break_tasklet_var, 0);
88282 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
88283 }
88284
88285 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
88286
88287 void kgdb_schedule_breakpoint(void)
88288 {
88289 - if (atomic_read(&kgdb_break_tasklet_var) ||
88290 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
88291 atomic_read(&kgdb_active) != -1 ||
88292 atomic_read(&kgdb_setting_breakpoint))
88293 return;
88294 - atomic_inc(&kgdb_break_tasklet_var);
88295 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
88296 tasklet_schedule(&kgdb_tasklet_breakpoint);
88297 }
88298 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
88299 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
88300 index 379650b..30c5180 100644
88301 --- a/kernel/debug/kdb/kdb_main.c
88302 +++ b/kernel/debug/kdb/kdb_main.c
88303 @@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
88304 continue;
88305
88306 kdb_printf("%-20s%8u 0x%p ", mod->name,
88307 - mod->core_size, (void *)mod);
88308 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
88309 #ifdef CONFIG_MODULE_UNLOAD
88310 kdb_printf("%4ld ", module_refcount(mod));
88311 #endif
88312 @@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
88313 kdb_printf(" (Loading)");
88314 else
88315 kdb_printf(" (Live)");
88316 - kdb_printf(" 0x%p", mod->module_core);
88317 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
88318
88319 #ifdef CONFIG_MODULE_UNLOAD
88320 {
88321 diff --git a/kernel/events/core.c b/kernel/events/core.c
88322 index 1cd5eef..e8b5af9 100644
88323 --- a/kernel/events/core.c
88324 +++ b/kernel/events/core.c
88325 @@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
88326 * 0 - disallow raw tracepoint access for unpriv
88327 * 1 - disallow cpu events for unpriv
88328 * 2 - disallow kernel profiling for unpriv
88329 + * 3 - disallow all unpriv perf event use
88330 */
88331 -int sysctl_perf_event_paranoid __read_mostly = 1;
88332 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88333 +int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
88334 +#elif defined(CONFIG_GRKERNSEC_HIDESYM)
88335 +int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
88336 +#else
88337 +int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
88338 +#endif
88339
88340 /* Minimum for 512 kiB + 1 user control page */
88341 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
88342 @@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
88343
88344 tmp *= sysctl_perf_cpu_time_max_percent;
88345 do_div(tmp, 100);
88346 - ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
88347 + ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
88348 }
88349
88350 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
88351 @@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
88352 }
88353 }
88354
88355 -static atomic64_t perf_event_id;
88356 +static atomic64_unchecked_t perf_event_id;
88357
88358 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
88359 enum event_type_t event_type);
88360 @@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
88361
88362 static inline u64 perf_event_count(struct perf_event *event)
88363 {
88364 - return local64_read(&event->count) + atomic64_read(&event->child_count);
88365 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
88366 }
88367
88368 static u64 perf_event_read(struct perf_event *event)
88369 @@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
88370 mutex_lock(&event->child_mutex);
88371 total += perf_event_read(event);
88372 *enabled += event->total_time_enabled +
88373 - atomic64_read(&event->child_total_time_enabled);
88374 + atomic64_read_unchecked(&event->child_total_time_enabled);
88375 *running += event->total_time_running +
88376 - atomic64_read(&event->child_total_time_running);
88377 + atomic64_read_unchecked(&event->child_total_time_running);
88378
88379 list_for_each_entry(child, &event->child_list, child_list) {
88380 total += perf_event_read(child);
88381 @@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
88382 userpg->offset -= local64_read(&event->hw.prev_count);
88383
88384 userpg->time_enabled = enabled +
88385 - atomic64_read(&event->child_total_time_enabled);
88386 + atomic64_read_unchecked(&event->child_total_time_enabled);
88387
88388 userpg->time_running = running +
88389 - atomic64_read(&event->child_total_time_running);
88390 + atomic64_read_unchecked(&event->child_total_time_running);
88391
88392 arch_perf_update_userpage(userpg, now);
88393
88394 @@ -4561,7 +4568,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
88395
88396 /* Data. */
88397 sp = perf_user_stack_pointer(regs);
88398 - rem = __output_copy_user(handle, (void *) sp, dump_size);
88399 + rem = __output_copy_user(handle, (void __user *) sp, dump_size);
88400 dyn_size = dump_size - rem;
88401
88402 perf_output_skip(handle, rem);
88403 @@ -4652,11 +4659,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
88404 values[n++] = perf_event_count(event);
88405 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
88406 values[n++] = enabled +
88407 - atomic64_read(&event->child_total_time_enabled);
88408 + atomic64_read_unchecked(&event->child_total_time_enabled);
88409 }
88410 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
88411 values[n++] = running +
88412 - atomic64_read(&event->child_total_time_running);
88413 + atomic64_read_unchecked(&event->child_total_time_running);
88414 }
88415 if (read_format & PERF_FORMAT_ID)
88416 values[n++] = primary_event_id(event);
88417 @@ -6958,7 +6965,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
88418 event->parent = parent_event;
88419
88420 event->ns = get_pid_ns(task_active_pid_ns(current));
88421 - event->id = atomic64_inc_return(&perf_event_id);
88422 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
88423
88424 event->state = PERF_EVENT_STATE_INACTIVE;
88425
88426 @@ -7237,6 +7244,11 @@ SYSCALL_DEFINE5(perf_event_open,
88427 if (flags & ~PERF_FLAG_ALL)
88428 return -EINVAL;
88429
88430 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88431 + if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
88432 + return -EACCES;
88433 +#endif
88434 +
88435 err = perf_copy_attr(attr_uptr, &attr);
88436 if (err)
88437 return err;
88438 @@ -7592,10 +7604,10 @@ static void sync_child_event(struct perf_event *child_event,
88439 /*
88440 * Add back the child's count to the parent's count:
88441 */
88442 - atomic64_add(child_val, &parent_event->child_count);
88443 - atomic64_add(child_event->total_time_enabled,
88444 + atomic64_add_unchecked(child_val, &parent_event->child_count);
88445 + atomic64_add_unchecked(child_event->total_time_enabled,
88446 &parent_event->child_total_time_enabled);
88447 - atomic64_add(child_event->total_time_running,
88448 + atomic64_add_unchecked(child_event->total_time_running,
88449 &parent_event->child_total_time_running);
88450
88451 /*
88452 diff --git a/kernel/events/internal.h b/kernel/events/internal.h
88453 index 569b2187..19940d9 100644
88454 --- a/kernel/events/internal.h
88455 +++ b/kernel/events/internal.h
88456 @@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
88457 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
88458 }
88459
88460 -#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
88461 +#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
88462 static inline unsigned long \
88463 func_name(struct perf_output_handle *handle, \
88464 - const void *buf, unsigned long len) \
88465 + const void user *buf, unsigned long len) \
88466 { \
88467 unsigned long size, written; \
88468 \
88469 @@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
88470 return 0;
88471 }
88472
88473 -DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
88474 +DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
88475
88476 static inline unsigned long
88477 memcpy_skip(void *dst, const void *src, unsigned long n)
88478 @@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
88479 return 0;
88480 }
88481
88482 -DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
88483 +DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
88484
88485 #ifndef arch_perf_out_copy_user
88486 #define arch_perf_out_copy_user arch_perf_out_copy_user
88487 @@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
88488 }
88489 #endif
88490
88491 -DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
88492 +DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
88493
88494 /* Callchain handling */
88495 extern struct perf_callchain_entry *
88496 diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
88497 index ed8f2cd..fe8030c 100644
88498 --- a/kernel/events/uprobes.c
88499 +++ b/kernel/events/uprobes.c
88500 @@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
88501 {
88502 struct page *page;
88503 uprobe_opcode_t opcode;
88504 - int result;
88505 + long result;
88506
88507 pagefault_disable();
88508 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
88509 diff --git a/kernel/exit.c b/kernel/exit.c
88510 index 5d30019..934add5 100644
88511 --- a/kernel/exit.c
88512 +++ b/kernel/exit.c
88513 @@ -174,6 +174,10 @@ void release_task(struct task_struct *p)
88514 struct task_struct *leader;
88515 int zap_leader;
88516 repeat:
88517 +#ifdef CONFIG_NET
88518 + gr_del_task_from_ip_table(p);
88519 +#endif
88520 +
88521 /* don't need to get the RCU readlock here - the process is dead and
88522 * can't be modifying its own credentials. But shut RCU-lockdep up */
88523 rcu_read_lock();
88524 @@ -670,6 +674,8 @@ void do_exit(long code)
88525 int group_dead;
88526 TASKS_RCU(int tasks_rcu_i);
88527
88528 + set_fs(USER_DS);
88529 +
88530 profile_task_exit(tsk);
88531
88532 WARN_ON(blk_needs_flush_plug(tsk));
88533 @@ -686,7 +692,6 @@ void do_exit(long code)
88534 * mm_release()->clear_child_tid() from writing to a user-controlled
88535 * kernel address.
88536 */
88537 - set_fs(USER_DS);
88538
88539 ptrace_event(PTRACE_EVENT_EXIT, code);
88540
88541 @@ -744,6 +749,9 @@ void do_exit(long code)
88542 tsk->exit_code = code;
88543 taskstats_exit(tsk, group_dead);
88544
88545 + gr_acl_handle_psacct(tsk, code);
88546 + gr_acl_handle_exit();
88547 +
88548 exit_mm(tsk);
88549
88550 if (group_dead)
88551 @@ -863,7 +871,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
88552 * Take down every thread in the group. This is called by fatal signals
88553 * as well as by sys_exit_group (below).
88554 */
88555 -void
88556 +__noreturn void
88557 do_group_exit(int exit_code)
88558 {
88559 struct signal_struct *sig = current->signal;
88560 diff --git a/kernel/fork.c b/kernel/fork.c
88561 index 9b7d746..5b898ab 100644
88562 --- a/kernel/fork.c
88563 +++ b/kernel/fork.c
88564 @@ -183,6 +183,48 @@ void thread_info_cache_init(void)
88565 # endif
88566 #endif
88567
88568 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88569 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88570 + int node, void **lowmem_stack)
88571 +{
88572 + struct page *pages[THREAD_SIZE / PAGE_SIZE];
88573 + void *ret = NULL;
88574 + unsigned int i;
88575 +
88576 + *lowmem_stack = alloc_thread_info_node(tsk, node);
88577 + if (*lowmem_stack == NULL)
88578 + goto out;
88579 +
88580 + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
88581 + pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
88582 +
88583 + /* use VM_IOREMAP to gain THREAD_SIZE alignment */
88584 + ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
88585 + if (ret == NULL) {
88586 + free_thread_info(*lowmem_stack);
88587 + *lowmem_stack = NULL;
88588 + }
88589 +
88590 +out:
88591 + return ret;
88592 +}
88593 +
88594 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88595 +{
88596 + unmap_process_stacks(tsk);
88597 +}
88598 +#else
88599 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88600 + int node, void **lowmem_stack)
88601 +{
88602 + return alloc_thread_info_node(tsk, node);
88603 +}
88604 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88605 +{
88606 + free_thread_info(ti);
88607 +}
88608 +#endif
88609 +
88610 /* SLAB cache for signal_struct structures (tsk->signal) */
88611 static struct kmem_cache *signal_cachep;
88612
88613 @@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
88614 /* SLAB cache for mm_struct structures (tsk->mm) */
88615 static struct kmem_cache *mm_cachep;
88616
88617 -static void account_kernel_stack(struct thread_info *ti, int account)
88618 +static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
88619 {
88620 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88621 + struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
88622 +#else
88623 struct zone *zone = page_zone(virt_to_page(ti));
88624 +#endif
88625
88626 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
88627 }
88628
88629 void free_task(struct task_struct *tsk)
88630 {
88631 - account_kernel_stack(tsk->stack, -1);
88632 + account_kernel_stack(tsk, tsk->stack, -1);
88633 arch_release_thread_info(tsk->stack);
88634 - free_thread_info(tsk->stack);
88635 + gr_free_thread_info(tsk, tsk->stack);
88636 rt_mutex_debug_task_free(tsk);
88637 ftrace_graph_exit_task(tsk);
88638 put_seccomp_filter(tsk);
88639 @@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88640 {
88641 struct task_struct *tsk;
88642 struct thread_info *ti;
88643 + void *lowmem_stack;
88644 int node = tsk_fork_get_node(orig);
88645 int err;
88646
88647 @@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88648 if (!tsk)
88649 return NULL;
88650
88651 - ti = alloc_thread_info_node(tsk, node);
88652 + ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
88653 if (!ti)
88654 goto free_tsk;
88655
88656 @@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88657 goto free_ti;
88658
88659 tsk->stack = ti;
88660 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88661 + tsk->lowmem_stack = lowmem_stack;
88662 +#endif
88663 #ifdef CONFIG_SECCOMP
88664 /*
88665 * We must handle setting up seccomp filters once we're under
88666 @@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88667 set_task_stack_end_magic(tsk);
88668
88669 #ifdef CONFIG_CC_STACKPROTECTOR
88670 - tsk->stack_canary = get_random_int();
88671 + tsk->stack_canary = pax_get_random_long();
88672 #endif
88673
88674 /*
88675 @@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88676 tsk->splice_pipe = NULL;
88677 tsk->task_frag.page = NULL;
88678
88679 - account_kernel_stack(ti, 1);
88680 + account_kernel_stack(tsk, ti, 1);
88681
88682 return tsk;
88683
88684 free_ti:
88685 - free_thread_info(ti);
88686 + gr_free_thread_info(tsk, ti);
88687 free_tsk:
88688 free_task_struct(tsk);
88689 return NULL;
88690 }
88691
88692 #ifdef CONFIG_MMU
88693 -static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88694 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
88695 +{
88696 + struct vm_area_struct *tmp;
88697 + unsigned long charge;
88698 + struct file *file;
88699 + int retval;
88700 +
88701 + charge = 0;
88702 + if (mpnt->vm_flags & VM_ACCOUNT) {
88703 + unsigned long len = vma_pages(mpnt);
88704 +
88705 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88706 + goto fail_nomem;
88707 + charge = len;
88708 + }
88709 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88710 + if (!tmp)
88711 + goto fail_nomem;
88712 + *tmp = *mpnt;
88713 + tmp->vm_mm = mm;
88714 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
88715 + retval = vma_dup_policy(mpnt, tmp);
88716 + if (retval)
88717 + goto fail_nomem_policy;
88718 + if (anon_vma_fork(tmp, mpnt))
88719 + goto fail_nomem_anon_vma_fork;
88720 + tmp->vm_flags &= ~VM_LOCKED;
88721 + tmp->vm_next = tmp->vm_prev = NULL;
88722 + tmp->vm_mirror = NULL;
88723 + file = tmp->vm_file;
88724 + if (file) {
88725 + struct inode *inode = file_inode(file);
88726 + struct address_space *mapping = file->f_mapping;
88727 +
88728 + get_file(file);
88729 + if (tmp->vm_flags & VM_DENYWRITE)
88730 + atomic_dec(&inode->i_writecount);
88731 + mutex_lock(&mapping->i_mmap_mutex);
88732 + if (tmp->vm_flags & VM_SHARED)
88733 + atomic_inc(&mapping->i_mmap_writable);
88734 + flush_dcache_mmap_lock(mapping);
88735 + /* insert tmp into the share list, just after mpnt */
88736 + if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88737 + vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
88738 + else
88739 + vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
88740 + flush_dcache_mmap_unlock(mapping);
88741 + mutex_unlock(&mapping->i_mmap_mutex);
88742 + }
88743 +
88744 + /*
88745 + * Clear hugetlb-related page reserves for children. This only
88746 + * affects MAP_PRIVATE mappings. Faults generated by the child
88747 + * are not guaranteed to succeed, even if read-only
88748 + */
88749 + if (is_vm_hugetlb_page(tmp))
88750 + reset_vma_resv_huge_pages(tmp);
88751 +
88752 + return tmp;
88753 +
88754 +fail_nomem_anon_vma_fork:
88755 + mpol_put(vma_policy(tmp));
88756 +fail_nomem_policy:
88757 + kmem_cache_free(vm_area_cachep, tmp);
88758 +fail_nomem:
88759 + vm_unacct_memory(charge);
88760 + return NULL;
88761 +}
88762 +
88763 +static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88764 {
88765 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
88766 struct rb_node **rb_link, *rb_parent;
88767 int retval;
88768 - unsigned long charge;
88769
88770 uprobe_start_dup_mmap();
88771 down_write(&oldmm->mmap_sem);
88772 @@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88773
88774 prev = NULL;
88775 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
88776 - struct file *file;
88777 -
88778 if (mpnt->vm_flags & VM_DONTCOPY) {
88779 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
88780 -vma_pages(mpnt));
88781 continue;
88782 }
88783 - charge = 0;
88784 - if (mpnt->vm_flags & VM_ACCOUNT) {
88785 - unsigned long len = vma_pages(mpnt);
88786 -
88787 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88788 - goto fail_nomem;
88789 - charge = len;
88790 - }
88791 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88792 - if (!tmp)
88793 - goto fail_nomem;
88794 - *tmp = *mpnt;
88795 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
88796 - retval = vma_dup_policy(mpnt, tmp);
88797 - if (retval)
88798 - goto fail_nomem_policy;
88799 - tmp->vm_mm = mm;
88800 - if (anon_vma_fork(tmp, mpnt))
88801 - goto fail_nomem_anon_vma_fork;
88802 - tmp->vm_flags &= ~VM_LOCKED;
88803 - tmp->vm_next = tmp->vm_prev = NULL;
88804 - file = tmp->vm_file;
88805 - if (file) {
88806 - struct inode *inode = file_inode(file);
88807 - struct address_space *mapping = file->f_mapping;
88808 -
88809 - get_file(file);
88810 - if (tmp->vm_flags & VM_DENYWRITE)
88811 - atomic_dec(&inode->i_writecount);
88812 - mutex_lock(&mapping->i_mmap_mutex);
88813 - if (tmp->vm_flags & VM_SHARED)
88814 - atomic_inc(&mapping->i_mmap_writable);
88815 - flush_dcache_mmap_lock(mapping);
88816 - /* insert tmp into the share list, just after mpnt */
88817 - if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88818 - vma_nonlinear_insert(tmp,
88819 - &mapping->i_mmap_nonlinear);
88820 - else
88821 - vma_interval_tree_insert_after(tmp, mpnt,
88822 - &mapping->i_mmap);
88823 - flush_dcache_mmap_unlock(mapping);
88824 - mutex_unlock(&mapping->i_mmap_mutex);
88825 + tmp = dup_vma(mm, oldmm, mpnt);
88826 + if (!tmp) {
88827 + retval = -ENOMEM;
88828 + goto out;
88829 }
88830
88831 /*
88832 @@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88833 if (retval)
88834 goto out;
88835 }
88836 +
88837 +#ifdef CONFIG_PAX_SEGMEXEC
88838 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
88839 + struct vm_area_struct *mpnt_m;
88840 +
88841 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
88842 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
88843 +
88844 + if (!mpnt->vm_mirror)
88845 + continue;
88846 +
88847 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
88848 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
88849 + mpnt->vm_mirror = mpnt_m;
88850 + } else {
88851 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
88852 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
88853 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
88854 + mpnt->vm_mirror->vm_mirror = mpnt;
88855 + }
88856 + }
88857 + BUG_ON(mpnt_m);
88858 + }
88859 +#endif
88860 +
88861 /* a new mm has just been created */
88862 arch_dup_mmap(oldmm, mm);
88863 retval = 0;
88864 @@ -486,14 +589,6 @@ out:
88865 up_write(&oldmm->mmap_sem);
88866 uprobe_end_dup_mmap();
88867 return retval;
88868 -fail_nomem_anon_vma_fork:
88869 - mpol_put(vma_policy(tmp));
88870 -fail_nomem_policy:
88871 - kmem_cache_free(vm_area_cachep, tmp);
88872 -fail_nomem:
88873 - retval = -ENOMEM;
88874 - vm_unacct_memory(charge);
88875 - goto out;
88876 }
88877
88878 static inline int mm_alloc_pgd(struct mm_struct *mm)
88879 @@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
88880 return ERR_PTR(err);
88881
88882 mm = get_task_mm(task);
88883 - if (mm && mm != current->mm &&
88884 - !ptrace_may_access(task, mode)) {
88885 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
88886 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
88887 mmput(mm);
88888 mm = ERR_PTR(-EACCES);
88889 }
88890 @@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
88891 spin_unlock(&fs->lock);
88892 return -EAGAIN;
88893 }
88894 - fs->users++;
88895 + atomic_inc(&fs->users);
88896 spin_unlock(&fs->lock);
88897 return 0;
88898 }
88899 tsk->fs = copy_fs_struct(fs);
88900 if (!tsk->fs)
88901 return -ENOMEM;
88902 + /* Carry through gr_chroot_dentry and is_chrooted instead
88903 + of recomputing it here. Already copied when the task struct
88904 + is duplicated. This allows pivot_root to not be treated as
88905 + a chroot
88906 + */
88907 + //gr_set_chroot_entries(tsk, &tsk->fs->root);
88908 +
88909 return 0;
88910 }
88911
88912 @@ -1179,7 +1281,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
88913 * parts of the process environment (as per the clone
88914 * flags). The actual kick-off is left to the caller.
88915 */
88916 -static struct task_struct *copy_process(unsigned long clone_flags,
88917 +static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
88918 unsigned long stack_start,
88919 unsigned long stack_size,
88920 int __user *child_tidptr,
88921 @@ -1250,6 +1352,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88922 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
88923 #endif
88924 retval = -EAGAIN;
88925 +
88926 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
88927 +
88928 if (atomic_read(&p->real_cred->user->processes) >=
88929 task_rlimit(p, RLIMIT_NPROC)) {
88930 if (p->real_cred->user != INIT_USER &&
88931 @@ -1499,6 +1604,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88932 goto bad_fork_free_pid;
88933 }
88934
88935 + /* synchronizes with gr_set_acls()
88936 + we need to call this past the point of no return for fork()
88937 + */
88938 + gr_copy_label(p);
88939 +
88940 if (likely(p->pid)) {
88941 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
88942
88943 @@ -1589,6 +1699,8 @@ bad_fork_cleanup_count:
88944 bad_fork_free:
88945 free_task(p);
88946 fork_out:
88947 + gr_log_forkfail(retval);
88948 +
88949 return ERR_PTR(retval);
88950 }
88951
88952 @@ -1650,6 +1762,7 @@ long do_fork(unsigned long clone_flags,
88953
88954 p = copy_process(clone_flags, stack_start, stack_size,
88955 child_tidptr, NULL, trace);
88956 + add_latent_entropy();
88957 /*
88958 * Do this prior waking up the new thread - the thread pointer
88959 * might get invalid after that point, if the thread exits quickly.
88960 @@ -1666,6 +1779,8 @@ long do_fork(unsigned long clone_flags,
88961 if (clone_flags & CLONE_PARENT_SETTID)
88962 put_user(nr, parent_tidptr);
88963
88964 + gr_handle_brute_check();
88965 +
88966 if (clone_flags & CLONE_VFORK) {
88967 p->vfork_done = &vfork;
88968 init_completion(&vfork);
88969 @@ -1784,7 +1899,7 @@ void __init proc_caches_init(void)
88970 mm_cachep = kmem_cache_create("mm_struct",
88971 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
88972 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
88973 - vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
88974 + vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
88975 mmap_init();
88976 nsproxy_cache_init();
88977 }
88978 @@ -1824,7 +1939,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
88979 return 0;
88980
88981 /* don't need lock here; in the worst case we'll do useless copy */
88982 - if (fs->users == 1)
88983 + if (atomic_read(&fs->users) == 1)
88984 return 0;
88985
88986 *new_fsp = copy_fs_struct(fs);
88987 @@ -1936,7 +2051,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
88988 fs = current->fs;
88989 spin_lock(&fs->lock);
88990 current->fs = new_fs;
88991 - if (--fs->users)
88992 + gr_set_chroot_entries(current, &current->fs->root);
88993 + if (atomic_dec_return(&fs->users))
88994 new_fs = NULL;
88995 else
88996 new_fs = fs;
88997 diff --git a/kernel/futex.c b/kernel/futex.c
88998 index 63678b5..512f9af 100644
88999 --- a/kernel/futex.c
89000 +++ b/kernel/futex.c
89001 @@ -201,7 +201,7 @@ struct futex_pi_state {
89002 atomic_t refcount;
89003
89004 union futex_key key;
89005 -};
89006 +} __randomize_layout;
89007
89008 /**
89009 * struct futex_q - The hashed futex queue entry, one per waiting task
89010 @@ -235,7 +235,7 @@ struct futex_q {
89011 struct rt_mutex_waiter *rt_waiter;
89012 union futex_key *requeue_pi_key;
89013 u32 bitset;
89014 -};
89015 +} __randomize_layout;
89016
89017 static const struct futex_q futex_q_init = {
89018 /* list gets initialized in queue_me()*/
89019 @@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
89020 struct page *page, *page_head;
89021 int err, ro = 0;
89022
89023 +#ifdef CONFIG_PAX_SEGMEXEC
89024 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
89025 + return -EFAULT;
89026 +#endif
89027 +
89028 /*
89029 * The futex address must be "naturally" aligned.
89030 */
89031 @@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
89032
89033 static int get_futex_value_locked(u32 *dest, u32 __user *from)
89034 {
89035 - int ret;
89036 + unsigned long ret;
89037
89038 pagefault_disable();
89039 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
89040 @@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
89041 {
89042 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
89043 u32 curval;
89044 + mm_segment_t oldfs;
89045
89046 /*
89047 * This will fail and we want it. Some arch implementations do
89048 @@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
89049 * implementation, the non-functional ones will return
89050 * -ENOSYS.
89051 */
89052 + oldfs = get_fs();
89053 + set_fs(USER_DS);
89054 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
89055 futex_cmpxchg_enabled = 1;
89056 + set_fs(oldfs);
89057 #endif
89058 }
89059
89060 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
89061 index 55c8c93..9ba7ad6 100644
89062 --- a/kernel/futex_compat.c
89063 +++ b/kernel/futex_compat.c
89064 @@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
89065 return 0;
89066 }
89067
89068 -static void __user *futex_uaddr(struct robust_list __user *entry,
89069 +static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
89070 compat_long_t futex_offset)
89071 {
89072 compat_uptr_t base = ptr_to_compat(entry);
89073 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
89074 index b358a80..fc25240 100644
89075 --- a/kernel/gcov/base.c
89076 +++ b/kernel/gcov/base.c
89077 @@ -114,11 +114,6 @@ void gcov_enable_events(void)
89078 }
89079
89080 #ifdef CONFIG_MODULES
89081 -static inline int within(void *addr, void *start, unsigned long size)
89082 -{
89083 - return ((addr >= start) && (addr < start + size));
89084 -}
89085 -
89086 /* Update list and generate events when modules are unloaded. */
89087 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89088 void *data)
89089 @@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89090
89091 /* Remove entries located in module from linked list. */
89092 while ((info = gcov_info_next(info))) {
89093 - if (within(info, mod->module_core, mod->core_size)) {
89094 + if (within_module_core_rw((unsigned long)info, mod)) {
89095 gcov_info_unlink(prev, info);
89096 if (gcov_events_enabled)
89097 gcov_event(GCOV_REMOVE, info);
89098 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
89099 index 9019f15..9a3c42e 100644
89100 --- a/kernel/jump_label.c
89101 +++ b/kernel/jump_label.c
89102 @@ -14,6 +14,7 @@
89103 #include <linux/err.h>
89104 #include <linux/static_key.h>
89105 #include <linux/jump_label_ratelimit.h>
89106 +#include <linux/mm.h>
89107
89108 #ifdef HAVE_JUMP_LABEL
89109
89110 @@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
89111
89112 size = (((unsigned long)stop - (unsigned long)start)
89113 / sizeof(struct jump_entry));
89114 + pax_open_kernel();
89115 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
89116 + pax_close_kernel();
89117 }
89118
89119 static void jump_label_update(struct static_key *key, int enable);
89120 @@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
89121 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
89122 struct jump_entry *iter;
89123
89124 + pax_open_kernel();
89125 for (iter = iter_start; iter < iter_stop; iter++) {
89126 if (within_module_init(iter->code, mod))
89127 iter->code = 0;
89128 }
89129 + pax_close_kernel();
89130 }
89131
89132 static int
89133 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
89134 index 5c5987f..bc502b0 100644
89135 --- a/kernel/kallsyms.c
89136 +++ b/kernel/kallsyms.c
89137 @@ -11,6 +11,9 @@
89138 * Changed the compression method from stem compression to "table lookup"
89139 * compression (see scripts/kallsyms.c for a more complete description)
89140 */
89141 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89142 +#define __INCLUDED_BY_HIDESYM 1
89143 +#endif
89144 #include <linux/kallsyms.h>
89145 #include <linux/module.h>
89146 #include <linux/init.h>
89147 @@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
89148
89149 static inline int is_kernel_inittext(unsigned long addr)
89150 {
89151 + if (system_state != SYSTEM_BOOTING)
89152 + return 0;
89153 +
89154 if (addr >= (unsigned long)_sinittext
89155 && addr <= (unsigned long)_einittext)
89156 return 1;
89157 return 0;
89158 }
89159
89160 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89161 +#ifdef CONFIG_MODULES
89162 +static inline int is_module_text(unsigned long addr)
89163 +{
89164 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
89165 + return 1;
89166 +
89167 + addr = ktla_ktva(addr);
89168 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
89169 +}
89170 +#else
89171 +static inline int is_module_text(unsigned long addr)
89172 +{
89173 + return 0;
89174 +}
89175 +#endif
89176 +#endif
89177 +
89178 static inline int is_kernel_text(unsigned long addr)
89179 {
89180 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
89181 @@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
89182
89183 static inline int is_kernel(unsigned long addr)
89184 {
89185 +
89186 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89187 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
89188 + return 1;
89189 +
89190 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
89191 +#else
89192 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
89193 +#endif
89194 +
89195 return 1;
89196 return in_gate_area_no_mm(addr);
89197 }
89198
89199 static int is_ksym_addr(unsigned long addr)
89200 {
89201 +
89202 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89203 + if (is_module_text(addr))
89204 + return 0;
89205 +#endif
89206 +
89207 if (all_var)
89208 return is_kernel(addr);
89209
89210 @@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
89211
89212 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
89213 {
89214 - iter->name[0] = '\0';
89215 iter->nameoff = get_symbol_offset(new_pos);
89216 iter->pos = new_pos;
89217 }
89218 @@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
89219 {
89220 struct kallsym_iter *iter = m->private;
89221
89222 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89223 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
89224 + return 0;
89225 +#endif
89226 +
89227 /* Some debugging symbols have no name. Ignore them. */
89228 if (!iter->name[0])
89229 return 0;
89230 @@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
89231 */
89232 type = iter->exported ? toupper(iter->type) :
89233 tolower(iter->type);
89234 +
89235 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
89236 type, iter->name, iter->module_name);
89237 } else
89238 diff --git a/kernel/kcmp.c b/kernel/kcmp.c
89239 index 0aa69ea..a7fcafb 100644
89240 --- a/kernel/kcmp.c
89241 +++ b/kernel/kcmp.c
89242 @@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
89243 struct task_struct *task1, *task2;
89244 int ret;
89245
89246 +#ifdef CONFIG_GRKERNSEC
89247 + return -ENOSYS;
89248 +#endif
89249 +
89250 rcu_read_lock();
89251
89252 /*
89253 diff --git a/kernel/kexec.c b/kernel/kexec.c
89254 index 2abf9f6..c40cf85 100644
89255 --- a/kernel/kexec.c
89256 +++ b/kernel/kexec.c
89257 @@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
89258 compat_ulong_t, flags)
89259 {
89260 struct compat_kexec_segment in;
89261 - struct kexec_segment out, __user *ksegments;
89262 + struct kexec_segment out;
89263 + struct kexec_segment __user *ksegments;
89264 unsigned long i, result;
89265
89266 /* Don't allow clients that don't understand the native
89267 diff --git a/kernel/kmod.c b/kernel/kmod.c
89268 index 80f7a6d..3c476d3 100644
89269 --- a/kernel/kmod.c
89270 +++ b/kernel/kmod.c
89271 @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
89272 kfree(info->argv);
89273 }
89274
89275 -static int call_modprobe(char *module_name, int wait)
89276 +static int call_modprobe(char *module_name, char *module_param, int wait)
89277 {
89278 struct subprocess_info *info;
89279 static char *envp[] = {
89280 @@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
89281 NULL
89282 };
89283
89284 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
89285 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
89286 if (!argv)
89287 goto out;
89288
89289 @@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
89290 argv[1] = "-q";
89291 argv[2] = "--";
89292 argv[3] = module_name; /* check free_modprobe_argv() */
89293 - argv[4] = NULL;
89294 + argv[4] = module_param;
89295 + argv[5] = NULL;
89296
89297 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
89298 NULL, free_modprobe_argv, NULL);
89299 @@ -129,9 +130,8 @@ out:
89300 * If module auto-loading support is disabled then this function
89301 * becomes a no-operation.
89302 */
89303 -int __request_module(bool wait, const char *fmt, ...)
89304 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
89305 {
89306 - va_list args;
89307 char module_name[MODULE_NAME_LEN];
89308 unsigned int max_modprobes;
89309 int ret;
89310 @@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
89311 if (!modprobe_path[0])
89312 return 0;
89313
89314 - va_start(args, fmt);
89315 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
89316 - va_end(args);
89317 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
89318 if (ret >= MODULE_NAME_LEN)
89319 return -ENAMETOOLONG;
89320
89321 @@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
89322 if (ret)
89323 return ret;
89324
89325 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89326 + if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89327 + /* hack to workaround consolekit/udisks stupidity */
89328 + read_lock(&tasklist_lock);
89329 + if (!strcmp(current->comm, "mount") &&
89330 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
89331 + read_unlock(&tasklist_lock);
89332 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
89333 + return -EPERM;
89334 + }
89335 + read_unlock(&tasklist_lock);
89336 + }
89337 +#endif
89338 +
89339 /* If modprobe needs a service that is in a module, we get a recursive
89340 * loop. Limit the number of running kmod threads to max_threads/2 or
89341 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
89342 @@ -188,16 +200,61 @@ int __request_module(bool wait, const char *fmt, ...)
89343
89344 trace_module_request(module_name, wait, _RET_IP_);
89345
89346 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89347 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89348
89349 atomic_dec(&kmod_concurrent);
89350 return ret;
89351 }
89352 +
89353 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
89354 +{
89355 + va_list args;
89356 + int ret;
89357 +
89358 + va_start(args, fmt);
89359 + ret = ____request_module(wait, module_param, fmt, args);
89360 + va_end(args);
89361 +
89362 + return ret;
89363 +}
89364 +
89365 +int __request_module(bool wait, const char *fmt, ...)
89366 +{
89367 + va_list args;
89368 + int ret;
89369 +
89370 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89371 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89372 + char module_param[MODULE_NAME_LEN];
89373 +
89374 + memset(module_param, 0, sizeof(module_param));
89375 +
89376 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
89377 +
89378 + va_start(args, fmt);
89379 + ret = ____request_module(wait, module_param, fmt, args);
89380 + va_end(args);
89381 +
89382 + return ret;
89383 + }
89384 +#endif
89385 +
89386 + va_start(args, fmt);
89387 + ret = ____request_module(wait, NULL, fmt, args);
89388 + va_end(args);
89389 +
89390 + return ret;
89391 +}
89392 +
89393 EXPORT_SYMBOL(__request_module);
89394 #endif /* CONFIG_MODULES */
89395
89396 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
89397 {
89398 +#ifdef CONFIG_GRKERNSEC
89399 + kfree(info->path);
89400 + info->path = info->origpath;
89401 +#endif
89402 if (info->cleanup)
89403 (*info->cleanup)(info);
89404 kfree(info);
89405 @@ -240,6 +297,20 @@ static int ____call_usermodehelper(void *data)
89406 */
89407 set_user_nice(current, 0);
89408
89409 +#ifdef CONFIG_GRKERNSEC
89410 + /* this is race-free as far as userland is concerned as we copied
89411 + out the path to be used prior to this point and are now operating
89412 + on that copy
89413 + */
89414 + if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
89415 + strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
89416 + strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
89417 + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
89418 + retval = -EPERM;
89419 + goto out;
89420 + }
89421 +#endif
89422 +
89423 retval = -ENOMEM;
89424 new = prepare_kernel_cred(current);
89425 if (!new)
89426 @@ -262,8 +333,8 @@ static int ____call_usermodehelper(void *data)
89427 commit_creds(new);
89428
89429 retval = do_execve(getname_kernel(sub_info->path),
89430 - (const char __user *const __user *)sub_info->argv,
89431 - (const char __user *const __user *)sub_info->envp);
89432 + (const char __user *const __force_user *)sub_info->argv,
89433 + (const char __user *const __force_user *)sub_info->envp);
89434 out:
89435 sub_info->retval = retval;
89436 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
89437 @@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
89438 *
89439 * Thus the __user pointer cast is valid here.
89440 */
89441 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
89442 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
89443
89444 /*
89445 * If ret is 0, either ____call_usermodehelper failed and the
89446 @@ -532,7 +603,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
89447 goto out;
89448
89449 INIT_WORK(&sub_info->work, __call_usermodehelper);
89450 +#ifdef CONFIG_GRKERNSEC
89451 + sub_info->origpath = path;
89452 + sub_info->path = kstrdup(path, gfp_mask);
89453 +#else
89454 sub_info->path = path;
89455 +#endif
89456 sub_info->argv = argv;
89457 sub_info->envp = envp;
89458
89459 @@ -645,7 +721,7 @@ EXPORT_SYMBOL(call_usermodehelper);
89460 static int proc_cap_handler(struct ctl_table *table, int write,
89461 void __user *buffer, size_t *lenp, loff_t *ppos)
89462 {
89463 - struct ctl_table t;
89464 + ctl_table_no_const t;
89465 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
89466 kernel_cap_t new_cap;
89467 int err, i;
89468 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
89469 index 3995f54..e247879 100644
89470 --- a/kernel/kprobes.c
89471 +++ b/kernel/kprobes.c
89472 @@ -31,6 +31,9 @@
89473 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
89474 * <prasanna@in.ibm.com> added function-return probes.
89475 */
89476 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89477 +#define __INCLUDED_BY_HIDESYM 1
89478 +#endif
89479 #include <linux/kprobes.h>
89480 #include <linux/hash.h>
89481 #include <linux/init.h>
89482 @@ -122,12 +125,12 @@ enum kprobe_slot_state {
89483
89484 static void *alloc_insn_page(void)
89485 {
89486 - return module_alloc(PAGE_SIZE);
89487 + return module_alloc_exec(PAGE_SIZE);
89488 }
89489
89490 static void free_insn_page(void *page)
89491 {
89492 - module_free(NULL, page);
89493 + module_free_exec(NULL, page);
89494 }
89495
89496 struct kprobe_insn_cache kprobe_insn_slots = {
89497 @@ -2187,11 +2190,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
89498 kprobe_type = "k";
89499
89500 if (sym)
89501 - seq_printf(pi, "%p %s %s+0x%x %s ",
89502 + seq_printf(pi, "%pK %s %s+0x%x %s ",
89503 p->addr, kprobe_type, sym, offset,
89504 (modname ? modname : " "));
89505 else
89506 - seq_printf(pi, "%p %s %p ",
89507 + seq_printf(pi, "%pK %s %pK ",
89508 p->addr, kprobe_type, p->addr);
89509
89510 if (!pp)
89511 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
89512 index 6683cce..daf8999 100644
89513 --- a/kernel/ksysfs.c
89514 +++ b/kernel/ksysfs.c
89515 @@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
89516 {
89517 if (count+1 > UEVENT_HELPER_PATH_LEN)
89518 return -ENOENT;
89519 + if (!capable(CAP_SYS_ADMIN))
89520 + return -EPERM;
89521 memcpy(uevent_helper, buf, count);
89522 uevent_helper[count] = '\0';
89523 if (count && uevent_helper[count-1] == '\n')
89524 @@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
89525 return count;
89526 }
89527
89528 -static struct bin_attribute notes_attr = {
89529 +static bin_attribute_no_const notes_attr __read_only = {
89530 .attr = {
89531 .name = "notes",
89532 .mode = S_IRUGO,
89533 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
89534 index 88d0d44..e9ce0ee 100644
89535 --- a/kernel/locking/lockdep.c
89536 +++ b/kernel/locking/lockdep.c
89537 @@ -599,6 +599,10 @@ static int static_obj(void *obj)
89538 end = (unsigned long) &_end,
89539 addr = (unsigned long) obj;
89540
89541 +#ifdef CONFIG_PAX_KERNEXEC
89542 + start = ktla_ktva(start);
89543 +#endif
89544 +
89545 /*
89546 * static variable?
89547 */
89548 @@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
89549 if (!static_obj(lock->key)) {
89550 debug_locks_off();
89551 printk("INFO: trying to register non-static key.\n");
89552 + printk("lock:%pS key:%pS.\n", lock, lock->key);
89553 printk("the code is fine but needs lockdep annotation.\n");
89554 printk("turning off the locking correctness validator.\n");
89555 dump_stack();
89556 @@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
89557 if (!class)
89558 return 0;
89559 }
89560 - atomic_inc((atomic_t *)&class->ops);
89561 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
89562 if (very_verbose(class)) {
89563 printk("\nacquire class [%p] %s", class->key, class->name);
89564 if (class->name_version > 1)
89565 diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
89566 index ef43ac4..2720dfa 100644
89567 --- a/kernel/locking/lockdep_proc.c
89568 +++ b/kernel/locking/lockdep_proc.c
89569 @@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
89570 return 0;
89571 }
89572
89573 - seq_printf(m, "%p", class->key);
89574 + seq_printf(m, "%pK", class->key);
89575 #ifdef CONFIG_DEBUG_LOCKDEP
89576 seq_printf(m, " OPS:%8ld", class->ops);
89577 #endif
89578 @@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
89579
89580 list_for_each_entry(entry, &class->locks_after, entry) {
89581 if (entry->distance == 1) {
89582 - seq_printf(m, " -> [%p] ", entry->class->key);
89583 + seq_printf(m, " -> [%pK] ", entry->class->key);
89584 print_name(m, entry->class);
89585 seq_puts(m, "\n");
89586 }
89587 @@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
89588 if (!class->key)
89589 continue;
89590
89591 - seq_printf(m, "[%p] ", class->key);
89592 + seq_printf(m, "[%pK] ", class->key);
89593 print_name(m, class);
89594 seq_puts(m, "\n");
89595 }
89596 @@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89597 if (!i)
89598 seq_line(m, '-', 40-namelen, namelen);
89599
89600 - snprintf(ip, sizeof(ip), "[<%p>]",
89601 + snprintf(ip, sizeof(ip), "[<%pK>]",
89602 (void *)class->contention_point[i]);
89603 seq_printf(m, "%40s %14lu %29s %pS\n",
89604 name, stats->contention_point[i],
89605 @@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89606 if (!i)
89607 seq_line(m, '-', 40-namelen, namelen);
89608
89609 - snprintf(ip, sizeof(ip), "[<%p>]",
89610 + snprintf(ip, sizeof(ip), "[<%pK>]",
89611 (void *)class->contending_point[i]);
89612 seq_printf(m, "%40s %14lu %29s %pS\n",
89613 name, stats->contending_point[i],
89614 diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
89615 index 9887a90..0cd2b1d 100644
89616 --- a/kernel/locking/mcs_spinlock.c
89617 +++ b/kernel/locking/mcs_spinlock.c
89618 @@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
89619
89620 prev = decode_cpu(old);
89621 node->prev = prev;
89622 - ACCESS_ONCE(prev->next) = node;
89623 + ACCESS_ONCE_RW(prev->next) = node;
89624
89625 /*
89626 * Normally @prev is untouchable after the above store; because at that
89627 @@ -172,8 +172,8 @@ unqueue:
89628 * it will wait in Step-A.
89629 */
89630
89631 - ACCESS_ONCE(next->prev) = prev;
89632 - ACCESS_ONCE(prev->next) = next;
89633 + ACCESS_ONCE_RW(next->prev) = prev;
89634 + ACCESS_ONCE_RW(prev->next) = next;
89635
89636 return false;
89637 }
89638 @@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
89639 node = this_cpu_ptr(&osq_node);
89640 next = xchg(&node->next, NULL);
89641 if (next) {
89642 - ACCESS_ONCE(next->locked) = 1;
89643 + ACCESS_ONCE_RW(next->locked) = 1;
89644 return;
89645 }
89646
89647 next = osq_wait_next(lock, node, NULL);
89648 if (next)
89649 - ACCESS_ONCE(next->locked) = 1;
89650 + ACCESS_ONCE_RW(next->locked) = 1;
89651 }
89652
89653 #endif
89654 diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
89655 index 4d60986..5d351c1 100644
89656 --- a/kernel/locking/mcs_spinlock.h
89657 +++ b/kernel/locking/mcs_spinlock.h
89658 @@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
89659 */
89660 return;
89661 }
89662 - ACCESS_ONCE(prev->next) = node;
89663 + ACCESS_ONCE_RW(prev->next) = node;
89664
89665 /* Wait until the lock holder passes the lock down. */
89666 arch_mcs_spin_lock_contended(&node->locked);
89667 diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
89668 index 5cf6731..ce3bc5a 100644
89669 --- a/kernel/locking/mutex-debug.c
89670 +++ b/kernel/locking/mutex-debug.c
89671 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
89672 }
89673
89674 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89675 - struct thread_info *ti)
89676 + struct task_struct *task)
89677 {
89678 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
89679
89680 /* Mark the current thread as blocked on the lock: */
89681 - ti->task->blocked_on = waiter;
89682 + task->blocked_on = waiter;
89683 }
89684
89685 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89686 - struct thread_info *ti)
89687 + struct task_struct *task)
89688 {
89689 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
89690 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
89691 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
89692 - ti->task->blocked_on = NULL;
89693 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
89694 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
89695 + task->blocked_on = NULL;
89696
89697 list_del_init(&waiter->list);
89698 waiter->task = NULL;
89699 diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
89700 index 0799fd3..d06ae3b 100644
89701 --- a/kernel/locking/mutex-debug.h
89702 +++ b/kernel/locking/mutex-debug.h
89703 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
89704 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
89705 extern void debug_mutex_add_waiter(struct mutex *lock,
89706 struct mutex_waiter *waiter,
89707 - struct thread_info *ti);
89708 + struct task_struct *task);
89709 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89710 - struct thread_info *ti);
89711 + struct task_struct *task);
89712 extern void debug_mutex_unlock(struct mutex *lock);
89713 extern void debug_mutex_init(struct mutex *lock, const char *name,
89714 struct lock_class_key *key);
89715 diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
89716 index dadbf88..4500507 100644
89717 --- a/kernel/locking/mutex.c
89718 +++ b/kernel/locking/mutex.c
89719 @@ -518,7 +518,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89720 goto skip_wait;
89721
89722 debug_mutex_lock_common(lock, &waiter);
89723 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
89724 + debug_mutex_add_waiter(lock, &waiter, task);
89725
89726 /* add waiting tasks to the end of the waitqueue (FIFO): */
89727 list_add_tail(&waiter.list, &lock->wait_list);
89728 @@ -563,7 +563,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89729 schedule_preempt_disabled();
89730 spin_lock_mutex(&lock->wait_lock, flags);
89731 }
89732 - mutex_remove_waiter(lock, &waiter, current_thread_info());
89733 + mutex_remove_waiter(lock, &waiter, task);
89734 /* set it to 0 if there are no waiters left: */
89735 if (likely(list_empty(&lock->wait_list)))
89736 atomic_set(&lock->count, 0);
89737 @@ -600,7 +600,7 @@ skip_wait:
89738 return 0;
89739
89740 err:
89741 - mutex_remove_waiter(lock, &waiter, task_thread_info(task));
89742 + mutex_remove_waiter(lock, &waiter, task);
89743 spin_unlock_mutex(&lock->wait_lock, flags);
89744 debug_mutex_free_waiter(&waiter);
89745 mutex_release(&lock->dep_map, 1, ip);
89746 diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
89747 index 1d96dd0..994ff19 100644
89748 --- a/kernel/locking/rtmutex-tester.c
89749 +++ b/kernel/locking/rtmutex-tester.c
89750 @@ -22,7 +22,7 @@
89751 #define MAX_RT_TEST_MUTEXES 8
89752
89753 static spinlock_t rttest_lock;
89754 -static atomic_t rttest_event;
89755 +static atomic_unchecked_t rttest_event;
89756
89757 struct test_thread_data {
89758 int opcode;
89759 @@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89760
89761 case RTTEST_LOCKCONT:
89762 td->mutexes[td->opdata] = 1;
89763 - td->event = atomic_add_return(1, &rttest_event);
89764 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89765 return 0;
89766
89767 case RTTEST_RESET:
89768 @@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89769 return 0;
89770
89771 case RTTEST_RESETEVENT:
89772 - atomic_set(&rttest_event, 0);
89773 + atomic_set_unchecked(&rttest_event, 0);
89774 return 0;
89775
89776 default:
89777 @@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89778 return ret;
89779
89780 td->mutexes[id] = 1;
89781 - td->event = atomic_add_return(1, &rttest_event);
89782 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89783 rt_mutex_lock(&mutexes[id]);
89784 - td->event = atomic_add_return(1, &rttest_event);
89785 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89786 td->mutexes[id] = 4;
89787 return 0;
89788
89789 @@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89790 return ret;
89791
89792 td->mutexes[id] = 1;
89793 - td->event = atomic_add_return(1, &rttest_event);
89794 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89795 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
89796 - td->event = atomic_add_return(1, &rttest_event);
89797 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89798 td->mutexes[id] = ret ? 0 : 4;
89799 return ret ? -EINTR : 0;
89800
89801 @@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89802 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
89803 return ret;
89804
89805 - td->event = atomic_add_return(1, &rttest_event);
89806 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89807 rt_mutex_unlock(&mutexes[id]);
89808 - td->event = atomic_add_return(1, &rttest_event);
89809 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89810 td->mutexes[id] = 0;
89811 return 0;
89812
89813 @@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89814 break;
89815
89816 td->mutexes[dat] = 2;
89817 - td->event = atomic_add_return(1, &rttest_event);
89818 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89819 break;
89820
89821 default:
89822 @@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89823 return;
89824
89825 td->mutexes[dat] = 3;
89826 - td->event = atomic_add_return(1, &rttest_event);
89827 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89828 break;
89829
89830 case RTTEST_LOCKNOWAIT:
89831 @@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89832 return;
89833
89834 td->mutexes[dat] = 1;
89835 - td->event = atomic_add_return(1, &rttest_event);
89836 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89837 return;
89838
89839 default:
89840 diff --git a/kernel/module.c b/kernel/module.c
89841 index 88cec1d..d097c28 100644
89842 --- a/kernel/module.c
89843 +++ b/kernel/module.c
89844 @@ -60,6 +60,7 @@
89845 #include <linux/jump_label.h>
89846 #include <linux/pfn.h>
89847 #include <linux/bsearch.h>
89848 +#include <linux/grsecurity.h>
89849 #include <uapi/linux/module.h>
89850 #include "module-internal.h"
89851
89852 @@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
89853
89854 /* Bounds of module allocation, for speeding __module_address.
89855 * Protected by module_mutex. */
89856 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
89857 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
89858 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
89859
89860 int register_module_notifier(struct notifier_block * nb)
89861 {
89862 @@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89863 return true;
89864
89865 list_for_each_entry_rcu(mod, &modules, list) {
89866 - struct symsearch arr[] = {
89867 + struct symsearch modarr[] = {
89868 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
89869 NOT_GPL_ONLY, false },
89870 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
89871 @@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89872 if (mod->state == MODULE_STATE_UNFORMED)
89873 continue;
89874
89875 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
89876 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
89877 return true;
89878 }
89879 return false;
89880 @@ -488,7 +490,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
89881 if (!pcpusec->sh_size)
89882 return 0;
89883
89884 - if (align > PAGE_SIZE) {
89885 + if (align-1 >= PAGE_SIZE) {
89886 pr_warn("%s: per-cpu alignment %li > %li\n",
89887 mod->name, align, PAGE_SIZE);
89888 align = PAGE_SIZE;
89889 @@ -1060,7 +1062,7 @@ struct module_attribute module_uevent =
89890 static ssize_t show_coresize(struct module_attribute *mattr,
89891 struct module_kobject *mk, char *buffer)
89892 {
89893 - return sprintf(buffer, "%u\n", mk->mod->core_size);
89894 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
89895 }
89896
89897 static struct module_attribute modinfo_coresize =
89898 @@ -1069,7 +1071,7 @@ static struct module_attribute modinfo_coresize =
89899 static ssize_t show_initsize(struct module_attribute *mattr,
89900 struct module_kobject *mk, char *buffer)
89901 {
89902 - return sprintf(buffer, "%u\n", mk->mod->init_size);
89903 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
89904 }
89905
89906 static struct module_attribute modinfo_initsize =
89907 @@ -1161,12 +1163,29 @@ static int check_version(Elf_Shdr *sechdrs,
89908 goto bad_version;
89909 }
89910
89911 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89912 + /*
89913 + * avoid potentially printing jibberish on attempted load
89914 + * of a module randomized with a different seed
89915 + */
89916 + pr_warn("no symbol version for %s\n", symname);
89917 +#else
89918 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
89919 +#endif
89920 return 0;
89921
89922 bad_version:
89923 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89924 + /*
89925 + * avoid potentially printing jibberish on attempted load
89926 + * of a module randomized with a different seed
89927 + */
89928 + printk("attempted module disagrees about version of symbol %s\n",
89929 + symname);
89930 +#else
89931 printk("%s: disagrees about version of symbol %s\n",
89932 mod->name, symname);
89933 +#endif
89934 return 0;
89935 }
89936
89937 @@ -1282,7 +1301,7 @@ resolve_symbol_wait(struct module *mod,
89938 */
89939 #ifdef CONFIG_SYSFS
89940
89941 -#ifdef CONFIG_KALLSYMS
89942 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
89943 static inline bool sect_empty(const Elf_Shdr *sect)
89944 {
89945 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
89946 @@ -1422,7 +1441,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
89947 {
89948 unsigned int notes, loaded, i;
89949 struct module_notes_attrs *notes_attrs;
89950 - struct bin_attribute *nattr;
89951 + bin_attribute_no_const *nattr;
89952
89953 /* failed to create section attributes, so can't create notes */
89954 if (!mod->sect_attrs)
89955 @@ -1534,7 +1553,7 @@ static void del_usage_links(struct module *mod)
89956 static int module_add_modinfo_attrs(struct module *mod)
89957 {
89958 struct module_attribute *attr;
89959 - struct module_attribute *temp_attr;
89960 + module_attribute_no_const *temp_attr;
89961 int error = 0;
89962 int i;
89963
89964 @@ -1755,21 +1774,21 @@ static void set_section_ro_nx(void *base,
89965
89966 static void unset_module_core_ro_nx(struct module *mod)
89967 {
89968 - set_page_attributes(mod->module_core + mod->core_text_size,
89969 - mod->module_core + mod->core_size,
89970 + set_page_attributes(mod->module_core_rw,
89971 + mod->module_core_rw + mod->core_size_rw,
89972 set_memory_x);
89973 - set_page_attributes(mod->module_core,
89974 - mod->module_core + mod->core_ro_size,
89975 + set_page_attributes(mod->module_core_rx,
89976 + mod->module_core_rx + mod->core_size_rx,
89977 set_memory_rw);
89978 }
89979
89980 static void unset_module_init_ro_nx(struct module *mod)
89981 {
89982 - set_page_attributes(mod->module_init + mod->init_text_size,
89983 - mod->module_init + mod->init_size,
89984 + set_page_attributes(mod->module_init_rw,
89985 + mod->module_init_rw + mod->init_size_rw,
89986 set_memory_x);
89987 - set_page_attributes(mod->module_init,
89988 - mod->module_init + mod->init_ro_size,
89989 + set_page_attributes(mod->module_init_rx,
89990 + mod->module_init_rx + mod->init_size_rx,
89991 set_memory_rw);
89992 }
89993
89994 @@ -1782,14 +1801,14 @@ void set_all_modules_text_rw(void)
89995 list_for_each_entry_rcu(mod, &modules, list) {
89996 if (mod->state == MODULE_STATE_UNFORMED)
89997 continue;
89998 - if ((mod->module_core) && (mod->core_text_size)) {
89999 - set_page_attributes(mod->module_core,
90000 - mod->module_core + mod->core_text_size,
90001 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
90002 + set_page_attributes(mod->module_core_rx,
90003 + mod->module_core_rx + mod->core_size_rx,
90004 set_memory_rw);
90005 }
90006 - if ((mod->module_init) && (mod->init_text_size)) {
90007 - set_page_attributes(mod->module_init,
90008 - mod->module_init + mod->init_text_size,
90009 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
90010 + set_page_attributes(mod->module_init_rx,
90011 + mod->module_init_rx + mod->init_size_rx,
90012 set_memory_rw);
90013 }
90014 }
90015 @@ -1805,14 +1824,14 @@ void set_all_modules_text_ro(void)
90016 list_for_each_entry_rcu(mod, &modules, list) {
90017 if (mod->state == MODULE_STATE_UNFORMED)
90018 continue;
90019 - if ((mod->module_core) && (mod->core_text_size)) {
90020 - set_page_attributes(mod->module_core,
90021 - mod->module_core + mod->core_text_size,
90022 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
90023 + set_page_attributes(mod->module_core_rx,
90024 + mod->module_core_rx + mod->core_size_rx,
90025 set_memory_ro);
90026 }
90027 - if ((mod->module_init) && (mod->init_text_size)) {
90028 - set_page_attributes(mod->module_init,
90029 - mod->module_init + mod->init_text_size,
90030 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
90031 + set_page_attributes(mod->module_init_rx,
90032 + mod->module_init_rx + mod->init_size_rx,
90033 set_memory_ro);
90034 }
90035 }
90036 @@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
90037
90038 /* This may be NULL, but that's OK */
90039 unset_module_init_ro_nx(mod);
90040 - module_free(mod, mod->module_init);
90041 + module_free(mod, mod->module_init_rw);
90042 + module_free_exec(mod, mod->module_init_rx);
90043 kfree(mod->args);
90044 percpu_modfree(mod);
90045
90046 /* Free lock-classes: */
90047 - lockdep_free_key_range(mod->module_core, mod->core_size);
90048 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
90049 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
90050
90051 /* Finally, free the core (containing the module structure) */
90052 unset_module_core_ro_nx(mod);
90053 - module_free(mod, mod->module_core);
90054 + module_free_exec(mod, mod->module_core_rx);
90055 + module_free(mod, mod->module_core_rw);
90056
90057 #ifdef CONFIG_MPU
90058 update_protections(current->mm);
90059 @@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90060 int ret = 0;
90061 const struct kernel_symbol *ksym;
90062
90063 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90064 + int is_fs_load = 0;
90065 + int register_filesystem_found = 0;
90066 + char *p;
90067 +
90068 + p = strstr(mod->args, "grsec_modharden_fs");
90069 + if (p) {
90070 + char *endptr = p + sizeof("grsec_modharden_fs") - 1;
90071 + /* copy \0 as well */
90072 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
90073 + is_fs_load = 1;
90074 + }
90075 +#endif
90076 +
90077 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
90078 const char *name = info->strtab + sym[i].st_name;
90079
90080 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90081 + /* it's a real shame this will never get ripped and copied
90082 + upstream! ;(
90083 + */
90084 + if (is_fs_load && !strcmp(name, "register_filesystem"))
90085 + register_filesystem_found = 1;
90086 +#endif
90087 +
90088 switch (sym[i].st_shndx) {
90089 case SHN_COMMON:
90090 /* Ignore common symbols */
90091 @@ -1970,7 +2014,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90092 ksym = resolve_symbol_wait(mod, info, name);
90093 /* Ok if resolved. */
90094 if (ksym && !IS_ERR(ksym)) {
90095 + pax_open_kernel();
90096 sym[i].st_value = ksym->value;
90097 + pax_close_kernel();
90098 break;
90099 }
90100
90101 @@ -1989,11 +2035,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90102 secbase = (unsigned long)mod_percpu(mod);
90103 else
90104 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
90105 + pax_open_kernel();
90106 sym[i].st_value += secbase;
90107 + pax_close_kernel();
90108 break;
90109 }
90110 }
90111
90112 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90113 + if (is_fs_load && !register_filesystem_found) {
90114 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
90115 + ret = -EPERM;
90116 + }
90117 +#endif
90118 +
90119 return ret;
90120 }
90121
90122 @@ -2077,22 +2132,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
90123 || s->sh_entsize != ~0UL
90124 || strstarts(sname, ".init"))
90125 continue;
90126 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
90127 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90128 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
90129 + else
90130 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
90131 pr_debug("\t%s\n", sname);
90132 }
90133 - switch (m) {
90134 - case 0: /* executable */
90135 - mod->core_size = debug_align(mod->core_size);
90136 - mod->core_text_size = mod->core_size;
90137 - break;
90138 - case 1: /* RO: text and ro-data */
90139 - mod->core_size = debug_align(mod->core_size);
90140 - mod->core_ro_size = mod->core_size;
90141 - break;
90142 - case 3: /* whole core */
90143 - mod->core_size = debug_align(mod->core_size);
90144 - break;
90145 - }
90146 }
90147
90148 pr_debug("Init section allocation order:\n");
90149 @@ -2106,23 +2151,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
90150 || s->sh_entsize != ~0UL
90151 || !strstarts(sname, ".init"))
90152 continue;
90153 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
90154 - | INIT_OFFSET_MASK);
90155 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90156 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
90157 + else
90158 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
90159 + s->sh_entsize |= INIT_OFFSET_MASK;
90160 pr_debug("\t%s\n", sname);
90161 }
90162 - switch (m) {
90163 - case 0: /* executable */
90164 - mod->init_size = debug_align(mod->init_size);
90165 - mod->init_text_size = mod->init_size;
90166 - break;
90167 - case 1: /* RO: text and ro-data */
90168 - mod->init_size = debug_align(mod->init_size);
90169 - mod->init_ro_size = mod->init_size;
90170 - break;
90171 - case 3: /* whole init */
90172 - mod->init_size = debug_align(mod->init_size);
90173 - break;
90174 - }
90175 }
90176 }
90177
90178 @@ -2295,7 +2330,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90179
90180 /* Put symbol section at end of init part of module. */
90181 symsect->sh_flags |= SHF_ALLOC;
90182 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
90183 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
90184 info->index.sym) | INIT_OFFSET_MASK;
90185 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
90186
90187 @@ -2312,13 +2347,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90188 }
90189
90190 /* Append room for core symbols at end of core part. */
90191 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
90192 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
90193 - mod->core_size += strtab_size;
90194 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
90195 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
90196 + mod->core_size_rx += strtab_size;
90197
90198 /* Put string table section at end of init part of module. */
90199 strsect->sh_flags |= SHF_ALLOC;
90200 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
90201 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
90202 info->index.str) | INIT_OFFSET_MASK;
90203 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
90204 }
90205 @@ -2336,12 +2371,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90206 /* Make sure we get permanent strtab: don't use info->strtab. */
90207 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
90208
90209 + pax_open_kernel();
90210 +
90211 /* Set types up while we still have access to sections. */
90212 for (i = 0; i < mod->num_symtab; i++)
90213 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
90214
90215 - mod->core_symtab = dst = mod->module_core + info->symoffs;
90216 - mod->core_strtab = s = mod->module_core + info->stroffs;
90217 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
90218 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
90219 src = mod->symtab;
90220 for (ndst = i = 0; i < mod->num_symtab; i++) {
90221 if (i == 0 ||
90222 @@ -2353,6 +2390,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90223 }
90224 }
90225 mod->core_num_syms = ndst;
90226 +
90227 + pax_close_kernel();
90228 }
90229 #else
90230 static inline void layout_symtab(struct module *mod, struct load_info *info)
90231 @@ -2386,17 +2425,33 @@ void * __weak module_alloc(unsigned long size)
90232 return vmalloc_exec(size);
90233 }
90234
90235 -static void *module_alloc_update_bounds(unsigned long size)
90236 +static void *module_alloc_update_bounds_rw(unsigned long size)
90237 {
90238 void *ret = module_alloc(size);
90239
90240 if (ret) {
90241 mutex_lock(&module_mutex);
90242 /* Update module bounds. */
90243 - if ((unsigned long)ret < module_addr_min)
90244 - module_addr_min = (unsigned long)ret;
90245 - if ((unsigned long)ret + size > module_addr_max)
90246 - module_addr_max = (unsigned long)ret + size;
90247 + if ((unsigned long)ret < module_addr_min_rw)
90248 + module_addr_min_rw = (unsigned long)ret;
90249 + if ((unsigned long)ret + size > module_addr_max_rw)
90250 + module_addr_max_rw = (unsigned long)ret + size;
90251 + mutex_unlock(&module_mutex);
90252 + }
90253 + return ret;
90254 +}
90255 +
90256 +static void *module_alloc_update_bounds_rx(unsigned long size)
90257 +{
90258 + void *ret = module_alloc_exec(size);
90259 +
90260 + if (ret) {
90261 + mutex_lock(&module_mutex);
90262 + /* Update module bounds. */
90263 + if ((unsigned long)ret < module_addr_min_rx)
90264 + module_addr_min_rx = (unsigned long)ret;
90265 + if ((unsigned long)ret + size > module_addr_max_rx)
90266 + module_addr_max_rx = (unsigned long)ret + size;
90267 mutex_unlock(&module_mutex);
90268 }
90269 return ret;
90270 @@ -2650,7 +2705,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90271 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
90272
90273 if (info->index.sym == 0) {
90274 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90275 + /*
90276 + * avoid potentially printing jibberish on attempted load
90277 + * of a module randomized with a different seed
90278 + */
90279 + pr_warn("module has no symbols (stripped?)\n");
90280 +#else
90281 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
90282 +#endif
90283 return ERR_PTR(-ENOEXEC);
90284 }
90285
90286 @@ -2666,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90287 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90288 {
90289 const char *modmagic = get_modinfo(info, "vermagic");
90290 + const char *license = get_modinfo(info, "license");
90291 int err;
90292
90293 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
90294 + if (!license || !license_is_gpl_compatible(license))
90295 + return -ENOEXEC;
90296 +#endif
90297 +
90298 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
90299 modmagic = NULL;
90300
90301 @@ -2692,7 +2761,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90302 }
90303
90304 /* Set up license info based on the info section */
90305 - set_license(mod, get_modinfo(info, "license"));
90306 + set_license(mod, license);
90307
90308 return 0;
90309 }
90310 @@ -2786,7 +2855,7 @@ static int move_module(struct module *mod, struct load_info *info)
90311 void *ptr;
90312
90313 /* Do the allocs. */
90314 - ptr = module_alloc_update_bounds(mod->core_size);
90315 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
90316 /*
90317 * The pointer to this block is stored in the module structure
90318 * which is inside the block. Just mark it as not being a
90319 @@ -2796,11 +2865,11 @@ static int move_module(struct module *mod, struct load_info *info)
90320 if (!ptr)
90321 return -ENOMEM;
90322
90323 - memset(ptr, 0, mod->core_size);
90324 - mod->module_core = ptr;
90325 + memset(ptr, 0, mod->core_size_rw);
90326 + mod->module_core_rw = ptr;
90327
90328 - if (mod->init_size) {
90329 - ptr = module_alloc_update_bounds(mod->init_size);
90330 + if (mod->init_size_rw) {
90331 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
90332 /*
90333 * The pointer to this block is stored in the module structure
90334 * which is inside the block. This block doesn't need to be
90335 @@ -2809,13 +2878,45 @@ static int move_module(struct module *mod, struct load_info *info)
90336 */
90337 kmemleak_ignore(ptr);
90338 if (!ptr) {
90339 - module_free(mod, mod->module_core);
90340 + module_free(mod, mod->module_core_rw);
90341 return -ENOMEM;
90342 }
90343 - memset(ptr, 0, mod->init_size);
90344 - mod->module_init = ptr;
90345 + memset(ptr, 0, mod->init_size_rw);
90346 + mod->module_init_rw = ptr;
90347 } else
90348 - mod->module_init = NULL;
90349 + mod->module_init_rw = NULL;
90350 +
90351 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
90352 + kmemleak_not_leak(ptr);
90353 + if (!ptr) {
90354 + if (mod->module_init_rw)
90355 + module_free(mod, mod->module_init_rw);
90356 + module_free(mod, mod->module_core_rw);
90357 + return -ENOMEM;
90358 + }
90359 +
90360 + pax_open_kernel();
90361 + memset(ptr, 0, mod->core_size_rx);
90362 + pax_close_kernel();
90363 + mod->module_core_rx = ptr;
90364 +
90365 + if (mod->init_size_rx) {
90366 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
90367 + kmemleak_ignore(ptr);
90368 + if (!ptr && mod->init_size_rx) {
90369 + module_free_exec(mod, mod->module_core_rx);
90370 + if (mod->module_init_rw)
90371 + module_free(mod, mod->module_init_rw);
90372 + module_free(mod, mod->module_core_rw);
90373 + return -ENOMEM;
90374 + }
90375 +
90376 + pax_open_kernel();
90377 + memset(ptr, 0, mod->init_size_rx);
90378 + pax_close_kernel();
90379 + mod->module_init_rx = ptr;
90380 + } else
90381 + mod->module_init_rx = NULL;
90382
90383 /* Transfer each section which specifies SHF_ALLOC */
90384 pr_debug("final section addresses:\n");
90385 @@ -2826,16 +2927,45 @@ static int move_module(struct module *mod, struct load_info *info)
90386 if (!(shdr->sh_flags & SHF_ALLOC))
90387 continue;
90388
90389 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
90390 - dest = mod->module_init
90391 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90392 - else
90393 - dest = mod->module_core + shdr->sh_entsize;
90394 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
90395 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90396 + dest = mod->module_init_rw
90397 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90398 + else
90399 + dest = mod->module_init_rx
90400 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90401 + } else {
90402 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90403 + dest = mod->module_core_rw + shdr->sh_entsize;
90404 + else
90405 + dest = mod->module_core_rx + shdr->sh_entsize;
90406 + }
90407 +
90408 + if (shdr->sh_type != SHT_NOBITS) {
90409 +
90410 +#ifdef CONFIG_PAX_KERNEXEC
90411 +#ifdef CONFIG_X86_64
90412 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
90413 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
90414 +#endif
90415 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
90416 + pax_open_kernel();
90417 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90418 + pax_close_kernel();
90419 + } else
90420 +#endif
90421
90422 - if (shdr->sh_type != SHT_NOBITS)
90423 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90424 + }
90425 /* Update sh_addr to point to copy in image. */
90426 - shdr->sh_addr = (unsigned long)dest;
90427 +
90428 +#ifdef CONFIG_PAX_KERNEXEC
90429 + if (shdr->sh_flags & SHF_EXECINSTR)
90430 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
90431 + else
90432 +#endif
90433 +
90434 + shdr->sh_addr = (unsigned long)dest;
90435 pr_debug("\t0x%lx %s\n",
90436 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
90437 }
90438 @@ -2892,12 +3022,12 @@ static void flush_module_icache(const struct module *mod)
90439 * Do it before processing of module parameters, so the module
90440 * can provide parameter accessor functions of its own.
90441 */
90442 - if (mod->module_init)
90443 - flush_icache_range((unsigned long)mod->module_init,
90444 - (unsigned long)mod->module_init
90445 - + mod->init_size);
90446 - flush_icache_range((unsigned long)mod->module_core,
90447 - (unsigned long)mod->module_core + mod->core_size);
90448 + if (mod->module_init_rx)
90449 + flush_icache_range((unsigned long)mod->module_init_rx,
90450 + (unsigned long)mod->module_init_rx
90451 + + mod->init_size_rx);
90452 + flush_icache_range((unsigned long)mod->module_core_rx,
90453 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
90454
90455 set_fs(old_fs);
90456 }
90457 @@ -2954,8 +3084,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
90458 static void module_deallocate(struct module *mod, struct load_info *info)
90459 {
90460 percpu_modfree(mod);
90461 - module_free(mod, mod->module_init);
90462 - module_free(mod, mod->module_core);
90463 + module_free_exec(mod, mod->module_init_rx);
90464 + module_free_exec(mod, mod->module_core_rx);
90465 + module_free(mod, mod->module_init_rw);
90466 + module_free(mod, mod->module_core_rw);
90467 }
90468
90469 int __weak module_finalize(const Elf_Ehdr *hdr,
90470 @@ -2968,7 +3100,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
90471 static int post_relocation(struct module *mod, const struct load_info *info)
90472 {
90473 /* Sort exception table now relocations are done. */
90474 + pax_open_kernel();
90475 sort_extable(mod->extable, mod->extable + mod->num_exentries);
90476 + pax_close_kernel();
90477
90478 /* Copy relocated percpu area over. */
90479 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
90480 @@ -3077,11 +3211,12 @@ static int do_init_module(struct module *mod)
90481 mod->strtab = mod->core_strtab;
90482 #endif
90483 unset_module_init_ro_nx(mod);
90484 - module_free(mod, mod->module_init);
90485 - mod->module_init = NULL;
90486 - mod->init_size = 0;
90487 - mod->init_ro_size = 0;
90488 - mod->init_text_size = 0;
90489 + module_free(mod, mod->module_init_rw);
90490 + module_free_exec(mod, mod->module_init_rx);
90491 + mod->module_init_rw = NULL;
90492 + mod->module_init_rx = NULL;
90493 + mod->init_size_rw = 0;
90494 + mod->init_size_rx = 0;
90495 mutex_unlock(&module_mutex);
90496 wake_up_all(&module_wq);
90497
90498 @@ -3149,16 +3284,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
90499 module_bug_finalize(info->hdr, info->sechdrs, mod);
90500
90501 /* Set RO and NX regions for core */
90502 - set_section_ro_nx(mod->module_core,
90503 - mod->core_text_size,
90504 - mod->core_ro_size,
90505 - mod->core_size);
90506 + set_section_ro_nx(mod->module_core_rx,
90507 + mod->core_size_rx,
90508 + mod->core_size_rx,
90509 + mod->core_size_rx);
90510
90511 /* Set RO and NX regions for init */
90512 - set_section_ro_nx(mod->module_init,
90513 - mod->init_text_size,
90514 - mod->init_ro_size,
90515 - mod->init_size);
90516 + set_section_ro_nx(mod->module_init_rx,
90517 + mod->init_size_rx,
90518 + mod->init_size_rx,
90519 + mod->init_size_rx);
90520
90521 /* Mark state as coming so strong_try_module_get() ignores us,
90522 * but kallsyms etc. can see us. */
90523 @@ -3242,9 +3377,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
90524 if (err)
90525 goto free_unload;
90526
90527 + /* Now copy in args */
90528 + mod->args = strndup_user(uargs, ~0UL >> 1);
90529 + if (IS_ERR(mod->args)) {
90530 + err = PTR_ERR(mod->args);
90531 + goto free_unload;
90532 + }
90533 +
90534 /* Set up MODINFO_ATTR fields */
90535 setup_modinfo(mod, info);
90536
90537 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90538 + {
90539 + char *p, *p2;
90540 +
90541 + if (strstr(mod->args, "grsec_modharden_netdev")) {
90542 + 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);
90543 + err = -EPERM;
90544 + goto free_modinfo;
90545 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
90546 + p += sizeof("grsec_modharden_normal") - 1;
90547 + p2 = strstr(p, "_");
90548 + if (p2) {
90549 + *p2 = '\0';
90550 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
90551 + *p2 = '_';
90552 + }
90553 + err = -EPERM;
90554 + goto free_modinfo;
90555 + }
90556 + }
90557 +#endif
90558 +
90559 /* Fix up syms, so that st_value is a pointer to location. */
90560 err = simplify_symbols(mod, info);
90561 if (err < 0)
90562 @@ -3260,13 +3424,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
90563
90564 flush_module_icache(mod);
90565
90566 - /* Now copy in args */
90567 - mod->args = strndup_user(uargs, ~0UL >> 1);
90568 - if (IS_ERR(mod->args)) {
90569 - err = PTR_ERR(mod->args);
90570 - goto free_arch_cleanup;
90571 - }
90572 -
90573 dynamic_debug_setup(info->debug, info->num_debug);
90574
90575 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
90576 @@ -3314,11 +3471,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
90577 ddebug_cleanup:
90578 dynamic_debug_remove(info->debug);
90579 synchronize_sched();
90580 - kfree(mod->args);
90581 - free_arch_cleanup:
90582 module_arch_cleanup(mod);
90583 free_modinfo:
90584 free_modinfo(mod);
90585 + kfree(mod->args);
90586 free_unload:
90587 module_unload_free(mod);
90588 unlink_mod:
90589 @@ -3403,10 +3559,16 @@ static const char *get_ksymbol(struct module *mod,
90590 unsigned long nextval;
90591
90592 /* At worse, next value is at end of module */
90593 - if (within_module_init(addr, mod))
90594 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
90595 + if (within_module_init_rx(addr, mod))
90596 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
90597 + else if (within_module_init_rw(addr, mod))
90598 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
90599 + else if (within_module_core_rx(addr, mod))
90600 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
90601 + else if (within_module_core_rw(addr, mod))
90602 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
90603 else
90604 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
90605 + return NULL;
90606
90607 /* Scan for closest preceding symbol, and next symbol. (ELF
90608 starts real symbols at 1). */
90609 @@ -3654,7 +3816,7 @@ static int m_show(struct seq_file *m, void *p)
90610 return 0;
90611
90612 seq_printf(m, "%s %u",
90613 - mod->name, mod->init_size + mod->core_size);
90614 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
90615 print_unload_info(m, mod);
90616
90617 /* Informative for users. */
90618 @@ -3663,7 +3825,7 @@ static int m_show(struct seq_file *m, void *p)
90619 mod->state == MODULE_STATE_COMING ? "Loading":
90620 "Live");
90621 /* Used by oprofile and other similar tools. */
90622 - seq_printf(m, " 0x%pK", mod->module_core);
90623 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
90624
90625 /* Taints info */
90626 if (mod->taints)
90627 @@ -3699,7 +3861,17 @@ static const struct file_operations proc_modules_operations = {
90628
90629 static int __init proc_modules_init(void)
90630 {
90631 +#ifndef CONFIG_GRKERNSEC_HIDESYM
90632 +#ifdef CONFIG_GRKERNSEC_PROC_USER
90633 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90634 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90635 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
90636 +#else
90637 proc_create("modules", 0, NULL, &proc_modules_operations);
90638 +#endif
90639 +#else
90640 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90641 +#endif
90642 return 0;
90643 }
90644 module_init(proc_modules_init);
90645 @@ -3760,7 +3932,8 @@ struct module *__module_address(unsigned long addr)
90646 {
90647 struct module *mod;
90648
90649 - if (addr < module_addr_min || addr > module_addr_max)
90650 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
90651 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
90652 return NULL;
90653
90654 list_for_each_entry_rcu(mod, &modules, list) {
90655 @@ -3801,11 +3974,20 @@ bool is_module_text_address(unsigned long addr)
90656 */
90657 struct module *__module_text_address(unsigned long addr)
90658 {
90659 - struct module *mod = __module_address(addr);
90660 + struct module *mod;
90661 +
90662 +#ifdef CONFIG_X86_32
90663 + addr = ktla_ktva(addr);
90664 +#endif
90665 +
90666 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
90667 + return NULL;
90668 +
90669 + mod = __module_address(addr);
90670 +
90671 if (mod) {
90672 /* Make sure it's within the text section. */
90673 - if (!within(addr, mod->module_init, mod->init_text_size)
90674 - && !within(addr, mod->module_core, mod->core_text_size))
90675 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
90676 mod = NULL;
90677 }
90678 return mod;
90679 diff --git a/kernel/notifier.c b/kernel/notifier.c
90680 index 4803da6..1c5eea6 100644
90681 --- a/kernel/notifier.c
90682 +++ b/kernel/notifier.c
90683 @@ -5,6 +5,7 @@
90684 #include <linux/rcupdate.h>
90685 #include <linux/vmalloc.h>
90686 #include <linux/reboot.h>
90687 +#include <linux/mm.h>
90688
90689 /*
90690 * Notifier list for kernel code which wants to be called
90691 @@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
90692 while ((*nl) != NULL) {
90693 if (n->priority > (*nl)->priority)
90694 break;
90695 - nl = &((*nl)->next);
90696 + nl = (struct notifier_block **)&((*nl)->next);
90697 }
90698 - n->next = *nl;
90699 + pax_open_kernel();
90700 + *(const void **)&n->next = *nl;
90701 rcu_assign_pointer(*nl, n);
90702 + pax_close_kernel();
90703 return 0;
90704 }
90705
90706 @@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
90707 return 0;
90708 if (n->priority > (*nl)->priority)
90709 break;
90710 - nl = &((*nl)->next);
90711 + nl = (struct notifier_block **)&((*nl)->next);
90712 }
90713 - n->next = *nl;
90714 + pax_open_kernel();
90715 + *(const void **)&n->next = *nl;
90716 rcu_assign_pointer(*nl, n);
90717 + pax_close_kernel();
90718 return 0;
90719 }
90720
90721 @@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
90722 {
90723 while ((*nl) != NULL) {
90724 if ((*nl) == n) {
90725 + pax_open_kernel();
90726 rcu_assign_pointer(*nl, n->next);
90727 + pax_close_kernel();
90728 return 0;
90729 }
90730 - nl = &((*nl)->next);
90731 + nl = (struct notifier_block **)&((*nl)->next);
90732 }
90733 return -ENOENT;
90734 }
90735 diff --git a/kernel/padata.c b/kernel/padata.c
90736 index 161402f..598814c 100644
90737 --- a/kernel/padata.c
90738 +++ b/kernel/padata.c
90739 @@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
90740 * seq_nr mod. number of cpus in use.
90741 */
90742
90743 - seq_nr = atomic_inc_return(&pd->seq_nr);
90744 + seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
90745 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
90746
90747 return padata_index_to_cpu(pd, cpu_index);
90748 @@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
90749 padata_init_pqueues(pd);
90750 padata_init_squeues(pd);
90751 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
90752 - atomic_set(&pd->seq_nr, -1);
90753 + atomic_set_unchecked(&pd->seq_nr, -1);
90754 atomic_set(&pd->reorder_objects, 0);
90755 atomic_set(&pd->refcnt, 0);
90756 pd->pinst = pinst;
90757 diff --git a/kernel/panic.c b/kernel/panic.c
90758 index cf80672..f6771b2 100644
90759 --- a/kernel/panic.c
90760 +++ b/kernel/panic.c
90761 @@ -53,7 +53,7 @@ EXPORT_SYMBOL(panic_blink);
90762 /*
90763 * Stop ourself in panic -- architecture code may override this
90764 */
90765 -void __weak panic_smp_self_stop(void)
90766 +void __weak __noreturn panic_smp_self_stop(void)
90767 {
90768 while (1)
90769 cpu_relax();
90770 @@ -422,7 +422,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
90771 disable_trace_on_warning();
90772
90773 pr_warn("------------[ cut here ]------------\n");
90774 - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
90775 + pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
90776 raw_smp_processor_id(), current->pid, file, line, caller);
90777
90778 if (args)
90779 @@ -476,7 +476,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
90780 */
90781 __visible void __stack_chk_fail(void)
90782 {
90783 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
90784 + dump_stack();
90785 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
90786 __builtin_return_address(0));
90787 }
90788 EXPORT_SYMBOL(__stack_chk_fail);
90789 diff --git a/kernel/pid.c b/kernel/pid.c
90790 index 9b9a266..c20ef80 100644
90791 --- a/kernel/pid.c
90792 +++ b/kernel/pid.c
90793 @@ -33,6 +33,7 @@
90794 #include <linux/rculist.h>
90795 #include <linux/bootmem.h>
90796 #include <linux/hash.h>
90797 +#include <linux/security.h>
90798 #include <linux/pid_namespace.h>
90799 #include <linux/init_task.h>
90800 #include <linux/syscalls.h>
90801 @@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
90802
90803 int pid_max = PID_MAX_DEFAULT;
90804
90805 -#define RESERVED_PIDS 300
90806 +#define RESERVED_PIDS 500
90807
90808 int pid_max_min = RESERVED_PIDS + 1;
90809 int pid_max_max = PID_MAX_LIMIT;
90810 @@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
90811 */
90812 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
90813 {
90814 + struct task_struct *task;
90815 +
90816 rcu_lockdep_assert(rcu_read_lock_held(),
90817 "find_task_by_pid_ns() needs rcu_read_lock()"
90818 " protection");
90819 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90820 +
90821 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90822 +
90823 + if (gr_pid_is_chrooted(task))
90824 + return NULL;
90825 +
90826 + return task;
90827 }
90828
90829 struct task_struct *find_task_by_vpid(pid_t vnr)
90830 @@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
90831 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
90832 }
90833
90834 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
90835 +{
90836 + rcu_lockdep_assert(rcu_read_lock_held(),
90837 + "find_task_by_pid_ns() needs rcu_read_lock()"
90838 + " protection");
90839 + return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
90840 +}
90841 +
90842 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
90843 {
90844 struct pid *pid;
90845 diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
90846 index db95d8e..a0ca23f 100644
90847 --- a/kernel/pid_namespace.c
90848 +++ b/kernel/pid_namespace.c
90849 @@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
90850 void __user *buffer, size_t *lenp, loff_t *ppos)
90851 {
90852 struct pid_namespace *pid_ns = task_active_pid_ns(current);
90853 - struct ctl_table tmp = *table;
90854 + ctl_table_no_const tmp = *table;
90855
90856 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
90857 return -EPERM;
90858 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
90859 index bbef57f..5f94462 100644
90860 --- a/kernel/power/Kconfig
90861 +++ b/kernel/power/Kconfig
90862 @@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
90863 config HIBERNATION
90864 bool "Hibernation (aka 'suspend to disk')"
90865 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
90866 + depends on !GRKERNSEC_KMEM
90867 + depends on !PAX_MEMORY_SANITIZE
90868 select HIBERNATE_CALLBACKS
90869 select LZO_COMPRESS
90870 select LZO_DECOMPRESS
90871 diff --git a/kernel/power/process.c b/kernel/power/process.c
90872 index 5a6ec86..3a8c884 100644
90873 --- a/kernel/power/process.c
90874 +++ b/kernel/power/process.c
90875 @@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
90876 unsigned int elapsed_msecs;
90877 bool wakeup = false;
90878 int sleep_usecs = USEC_PER_MSEC;
90879 + bool timedout = false;
90880
90881 do_gettimeofday(&start);
90882
90883 @@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
90884
90885 while (true) {
90886 todo = 0;
90887 + if (time_after(jiffies, end_time))
90888 + timedout = true;
90889 read_lock(&tasklist_lock);
90890 for_each_process_thread(g, p) {
90891 if (p == current || !freeze_task(p))
90892 continue;
90893
90894 - if (!freezer_should_skip(p))
90895 + if (!freezer_should_skip(p)) {
90896 todo++;
90897 + if (timedout) {
90898 + printk(KERN_ERR "Task refusing to freeze:\n");
90899 + sched_show_task(p);
90900 + }
90901 + }
90902 }
90903 read_unlock(&tasklist_lock);
90904
90905 @@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
90906 todo += wq_busy;
90907 }
90908
90909 - if (!todo || time_after(jiffies, end_time))
90910 + if (!todo || timedout)
90911 break;
90912
90913 if (pm_wakeup_pending()) {
90914 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
90915 index ced2b84..ffc4791 100644
90916 --- a/kernel/printk/printk.c
90917 +++ b/kernel/printk/printk.c
90918 @@ -489,6 +489,11 @@ static int check_syslog_permissions(int type, bool from_file)
90919 if (from_file && type != SYSLOG_ACTION_OPEN)
90920 return 0;
90921
90922 +#ifdef CONFIG_GRKERNSEC_DMESG
90923 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
90924 + return -EPERM;
90925 +#endif
90926 +
90927 if (syslog_action_restricted(type)) {
90928 if (capable(CAP_SYSLOG))
90929 return 0;
90930 diff --git a/kernel/profile.c b/kernel/profile.c
90931 index 54bf5ba..df6e0a2 100644
90932 --- a/kernel/profile.c
90933 +++ b/kernel/profile.c
90934 @@ -37,7 +37,7 @@ struct profile_hit {
90935 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
90936 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
90937
90938 -static atomic_t *prof_buffer;
90939 +static atomic_unchecked_t *prof_buffer;
90940 static unsigned long prof_len, prof_shift;
90941
90942 int prof_on __read_mostly;
90943 @@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
90944 hits[i].pc = 0;
90945 continue;
90946 }
90947 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90948 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90949 hits[i].hits = hits[i].pc = 0;
90950 }
90951 }
90952 @@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90953 * Add the current hit(s) and flush the write-queue out
90954 * to the global buffer:
90955 */
90956 - atomic_add(nr_hits, &prof_buffer[pc]);
90957 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
90958 for (i = 0; i < NR_PROFILE_HIT; ++i) {
90959 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90960 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90961 hits[i].pc = hits[i].hits = 0;
90962 }
90963 out:
90964 @@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90965 {
90966 unsigned long pc;
90967 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
90968 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90969 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90970 }
90971 #endif /* !CONFIG_SMP */
90972
90973 @@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
90974 return -EFAULT;
90975 buf++; p++; count--; read++;
90976 }
90977 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
90978 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
90979 if (copy_to_user(buf, (void *)pnt, count))
90980 return -EFAULT;
90981 read += count;
90982 @@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
90983 }
90984 #endif
90985 profile_discard_flip_buffers();
90986 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
90987 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
90988 return count;
90989 }
90990
90991 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
90992 index 54e7522..5b82dd6 100644
90993 --- a/kernel/ptrace.c
90994 +++ b/kernel/ptrace.c
90995 @@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
90996 if (seize)
90997 flags |= PT_SEIZED;
90998 rcu_read_lock();
90999 - if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91000 + if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91001 flags |= PT_PTRACE_CAP;
91002 rcu_read_unlock();
91003 task->ptrace = flags;
91004 @@ -532,7 +532,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
91005 break;
91006 return -EIO;
91007 }
91008 - if (copy_to_user(dst, buf, retval))
91009 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
91010 return -EFAULT;
91011 copied += retval;
91012 src += retval;
91013 @@ -800,7 +800,7 @@ int ptrace_request(struct task_struct *child, long request,
91014 bool seized = child->ptrace & PT_SEIZED;
91015 int ret = -EIO;
91016 siginfo_t siginfo, *si;
91017 - void __user *datavp = (void __user *) data;
91018 + void __user *datavp = (__force void __user *) data;
91019 unsigned long __user *datalp = datavp;
91020 unsigned long flags;
91021
91022 @@ -1046,14 +1046,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
91023 goto out;
91024 }
91025
91026 + if (gr_handle_ptrace(child, request)) {
91027 + ret = -EPERM;
91028 + goto out_put_task_struct;
91029 + }
91030 +
91031 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91032 ret = ptrace_attach(child, request, addr, data);
91033 /*
91034 * Some architectures need to do book-keeping after
91035 * a ptrace attach.
91036 */
91037 - if (!ret)
91038 + if (!ret) {
91039 arch_ptrace_attach(child);
91040 + gr_audit_ptrace(child);
91041 + }
91042 goto out_put_task_struct;
91043 }
91044
91045 @@ -1081,7 +1088,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
91046 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
91047 if (copied != sizeof(tmp))
91048 return -EIO;
91049 - return put_user(tmp, (unsigned long __user *)data);
91050 + return put_user(tmp, (__force unsigned long __user *)data);
91051 }
91052
91053 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
91054 @@ -1175,7 +1182,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
91055 }
91056
91057 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91058 - compat_long_t, addr, compat_long_t, data)
91059 + compat_ulong_t, addr, compat_ulong_t, data)
91060 {
91061 struct task_struct *child;
91062 long ret;
91063 @@ -1191,14 +1198,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91064 goto out;
91065 }
91066
91067 + if (gr_handle_ptrace(child, request)) {
91068 + ret = -EPERM;
91069 + goto out_put_task_struct;
91070 + }
91071 +
91072 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91073 ret = ptrace_attach(child, request, addr, data);
91074 /*
91075 * Some architectures need to do book-keeping after
91076 * a ptrace attach.
91077 */
91078 - if (!ret)
91079 + if (!ret) {
91080 arch_ptrace_attach(child);
91081 + gr_audit_ptrace(child);
91082 + }
91083 goto out_put_task_struct;
91084 }
91085
91086 diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
91087 index 240fa90..5fa56bd 100644
91088 --- a/kernel/rcu/rcutorture.c
91089 +++ b/kernel/rcu/rcutorture.c
91090 @@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91091 rcu_torture_count) = { 0 };
91092 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91093 rcu_torture_batch) = { 0 };
91094 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91095 -static atomic_t n_rcu_torture_alloc;
91096 -static atomic_t n_rcu_torture_alloc_fail;
91097 -static atomic_t n_rcu_torture_free;
91098 -static atomic_t n_rcu_torture_mberror;
91099 -static atomic_t n_rcu_torture_error;
91100 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91101 +static atomic_unchecked_t n_rcu_torture_alloc;
91102 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
91103 +static atomic_unchecked_t n_rcu_torture_free;
91104 +static atomic_unchecked_t n_rcu_torture_mberror;
91105 +static atomic_unchecked_t n_rcu_torture_error;
91106 static long n_rcu_torture_barrier_error;
91107 static long n_rcu_torture_boost_ktrerror;
91108 static long n_rcu_torture_boost_rterror;
91109 @@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
91110 static long n_rcu_torture_timers;
91111 static long n_barrier_attempts;
91112 static long n_barrier_successes;
91113 -static atomic_long_t n_cbfloods;
91114 +static atomic_long_unchecked_t n_cbfloods;
91115 static struct list_head rcu_torture_removed;
91116
91117 static int rcu_torture_writer_state;
91118 @@ -211,11 +211,11 @@ rcu_torture_alloc(void)
91119
91120 spin_lock_bh(&rcu_torture_lock);
91121 if (list_empty(&rcu_torture_freelist)) {
91122 - atomic_inc(&n_rcu_torture_alloc_fail);
91123 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
91124 spin_unlock_bh(&rcu_torture_lock);
91125 return NULL;
91126 }
91127 - atomic_inc(&n_rcu_torture_alloc);
91128 + atomic_inc_unchecked(&n_rcu_torture_alloc);
91129 p = rcu_torture_freelist.next;
91130 list_del_init(p);
91131 spin_unlock_bh(&rcu_torture_lock);
91132 @@ -228,7 +228,7 @@ rcu_torture_alloc(void)
91133 static void
91134 rcu_torture_free(struct rcu_torture *p)
91135 {
91136 - atomic_inc(&n_rcu_torture_free);
91137 + atomic_inc_unchecked(&n_rcu_torture_free);
91138 spin_lock_bh(&rcu_torture_lock);
91139 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
91140 spin_unlock_bh(&rcu_torture_lock);
91141 @@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
91142 i = rp->rtort_pipe_count;
91143 if (i > RCU_TORTURE_PIPE_LEN)
91144 i = RCU_TORTURE_PIPE_LEN;
91145 - atomic_inc(&rcu_torture_wcount[i]);
91146 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
91147 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
91148 rp->rtort_mbtest = 0;
91149 return true;
91150 @@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
91151 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
91152 do {
91153 schedule_timeout_interruptible(cbflood_inter_holdoff);
91154 - atomic_long_inc(&n_cbfloods);
91155 + atomic_long_inc_unchecked(&n_cbfloods);
91156 WARN_ON(signal_pending(current));
91157 for (i = 0; i < cbflood_n_burst; i++) {
91158 for (j = 0; j < cbflood_n_per_burst; j++) {
91159 @@ -917,7 +917,7 @@ rcu_torture_writer(void *arg)
91160 i = old_rp->rtort_pipe_count;
91161 if (i > RCU_TORTURE_PIPE_LEN)
91162 i = RCU_TORTURE_PIPE_LEN;
91163 - atomic_inc(&rcu_torture_wcount[i]);
91164 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
91165 old_rp->rtort_pipe_count++;
91166 switch (synctype[torture_random(&rand) % nsynctypes]) {
91167 case RTWS_DEF_FREE:
91168 @@ -1035,7 +1035,7 @@ static void rcu_torture_timer(unsigned long unused)
91169 return;
91170 }
91171 if (p->rtort_mbtest == 0)
91172 - atomic_inc(&n_rcu_torture_mberror);
91173 + atomic_inc_unchecked(&n_rcu_torture_mberror);
91174 spin_lock(&rand_lock);
91175 cur_ops->read_delay(&rand);
91176 n_rcu_torture_timers++;
91177 @@ -1105,7 +1105,7 @@ rcu_torture_reader(void *arg)
91178 continue;
91179 }
91180 if (p->rtort_mbtest == 0)
91181 - atomic_inc(&n_rcu_torture_mberror);
91182 + atomic_inc_unchecked(&n_rcu_torture_mberror);
91183 cur_ops->read_delay(&rand);
91184 preempt_disable();
91185 pipe_count = p->rtort_pipe_count;
91186 @@ -1172,11 +1172,11 @@ rcu_torture_stats_print(void)
91187 rcu_torture_current,
91188 rcu_torture_current_version,
91189 list_empty(&rcu_torture_freelist),
91190 - atomic_read(&n_rcu_torture_alloc),
91191 - atomic_read(&n_rcu_torture_alloc_fail),
91192 - atomic_read(&n_rcu_torture_free));
91193 + atomic_read_unchecked(&n_rcu_torture_alloc),
91194 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
91195 + atomic_read_unchecked(&n_rcu_torture_free));
91196 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
91197 - atomic_read(&n_rcu_torture_mberror),
91198 + atomic_read_unchecked(&n_rcu_torture_mberror),
91199 n_rcu_torture_boost_ktrerror,
91200 n_rcu_torture_boost_rterror);
91201 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
91202 @@ -1188,17 +1188,17 @@ rcu_torture_stats_print(void)
91203 n_barrier_successes,
91204 n_barrier_attempts,
91205 n_rcu_torture_barrier_error);
91206 - pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
91207 + pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
91208
91209 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91210 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
91211 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
91212 n_rcu_torture_barrier_error != 0 ||
91213 n_rcu_torture_boost_ktrerror != 0 ||
91214 n_rcu_torture_boost_rterror != 0 ||
91215 n_rcu_torture_boost_failure != 0 ||
91216 i > 1) {
91217 pr_cont("%s", "!!! ");
91218 - atomic_inc(&n_rcu_torture_error);
91219 + atomic_inc_unchecked(&n_rcu_torture_error);
91220 WARN_ON_ONCE(1);
91221 }
91222 pr_cont("Reader Pipe: ");
91223 @@ -1215,7 +1215,7 @@ rcu_torture_stats_print(void)
91224 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91225 pr_cont("Free-Block Circulation: ");
91226 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91227 - pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
91228 + pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
91229 }
91230 pr_cont("\n");
91231
91232 @@ -1559,7 +1559,7 @@ rcu_torture_cleanup(void)
91233
91234 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
91235
91236 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91237 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91238 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
91239 else if (torture_onoff_failures())
91240 rcu_torture_print_module_parms(cur_ops,
91241 @@ -1684,18 +1684,18 @@ rcu_torture_init(void)
91242
91243 rcu_torture_current = NULL;
91244 rcu_torture_current_version = 0;
91245 - atomic_set(&n_rcu_torture_alloc, 0);
91246 - atomic_set(&n_rcu_torture_alloc_fail, 0);
91247 - atomic_set(&n_rcu_torture_free, 0);
91248 - atomic_set(&n_rcu_torture_mberror, 0);
91249 - atomic_set(&n_rcu_torture_error, 0);
91250 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
91251 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
91252 + atomic_set_unchecked(&n_rcu_torture_free, 0);
91253 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
91254 + atomic_set_unchecked(&n_rcu_torture_error, 0);
91255 n_rcu_torture_barrier_error = 0;
91256 n_rcu_torture_boost_ktrerror = 0;
91257 n_rcu_torture_boost_rterror = 0;
91258 n_rcu_torture_boost_failure = 0;
91259 n_rcu_torture_boosts = 0;
91260 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
91261 - atomic_set(&rcu_torture_wcount[i], 0);
91262 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
91263 for_each_possible_cpu(cpu) {
91264 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91265 per_cpu(rcu_torture_count, cpu)[i] = 0;
91266 diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
91267 index c0623fc..329c091 100644
91268 --- a/kernel/rcu/tiny.c
91269 +++ b/kernel/rcu/tiny.c
91270 @@ -42,7 +42,7 @@
91271 /* Forward declarations for tiny_plugin.h. */
91272 struct rcu_ctrlblk;
91273 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
91274 -static void rcu_process_callbacks(struct softirq_action *unused);
91275 +static void rcu_process_callbacks(void);
91276 static void __call_rcu(struct rcu_head *head,
91277 void (*func)(struct rcu_head *rcu),
91278 struct rcu_ctrlblk *rcp);
91279 @@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
91280 false));
91281 }
91282
91283 -static void rcu_process_callbacks(struct softirq_action *unused)
91284 +static __latent_entropy void rcu_process_callbacks(void)
91285 {
91286 __rcu_process_callbacks(&rcu_sched_ctrlblk);
91287 __rcu_process_callbacks(&rcu_bh_ctrlblk);
91288 diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
91289 index 858c565..7efd915 100644
91290 --- a/kernel/rcu/tiny_plugin.h
91291 +++ b/kernel/rcu/tiny_plugin.h
91292 @@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
91293 dump_stack();
91294 }
91295 if (*rcp->curtail && ULONG_CMP_GE(j, js))
91296 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
91297 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
91298 3 * rcu_jiffies_till_stall_check() + 3;
91299 else if (ULONG_CMP_GE(j, js))
91300 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91301 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91302 }
91303
91304 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
91305 {
91306 rcp->ticks_this_gp = 0;
91307 rcp->gp_start = jiffies;
91308 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91309 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91310 }
91311
91312 static void check_cpu_stalls(void)
91313 diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
91314 index 9815447..2cdf92a 100644
91315 --- a/kernel/rcu/tree.c
91316 +++ b/kernel/rcu/tree.c
91317 @@ -274,7 +274,7 @@ static void rcu_momentary_dyntick_idle(void)
91318 */
91319 rdtp = this_cpu_ptr(&rcu_dynticks);
91320 smp_mb__before_atomic(); /* Earlier stuff before QS. */
91321 - atomic_add(2, &rdtp->dynticks); /* QS. */
91322 + atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
91323 smp_mb__after_atomic(); /* Later stuff after QS. */
91324 break;
91325 }
91326 @@ -534,9 +534,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
91327 rcu_prepare_for_idle(smp_processor_id());
91328 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91329 smp_mb__before_atomic(); /* See above. */
91330 - atomic_inc(&rdtp->dynticks);
91331 + atomic_inc_unchecked(&rdtp->dynticks);
91332 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
91333 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91334 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91335 rcu_dynticks_task_enter();
91336
91337 /*
91338 @@ -656,10 +656,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
91339 {
91340 rcu_dynticks_task_exit();
91341 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
91342 - atomic_inc(&rdtp->dynticks);
91343 + atomic_inc_unchecked(&rdtp->dynticks);
91344 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91345 smp_mb__after_atomic(); /* See above. */
91346 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91347 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91348 rcu_cleanup_after_idle(smp_processor_id());
91349 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
91350 if (!user && !is_idle_task(current)) {
91351 @@ -780,14 +780,14 @@ void rcu_nmi_enter(void)
91352 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
91353
91354 if (rdtp->dynticks_nmi_nesting == 0 &&
91355 - (atomic_read(&rdtp->dynticks) & 0x1))
91356 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
91357 return;
91358 rdtp->dynticks_nmi_nesting++;
91359 smp_mb__before_atomic(); /* Force delay from prior write. */
91360 - atomic_inc(&rdtp->dynticks);
91361 + atomic_inc_unchecked(&rdtp->dynticks);
91362 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91363 smp_mb__after_atomic(); /* See above. */
91364 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91365 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91366 }
91367
91368 /**
91369 @@ -806,9 +806,9 @@ void rcu_nmi_exit(void)
91370 return;
91371 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91372 smp_mb__before_atomic(); /* See above. */
91373 - atomic_inc(&rdtp->dynticks);
91374 + atomic_inc_unchecked(&rdtp->dynticks);
91375 smp_mb__after_atomic(); /* Force delay to next write. */
91376 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91377 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91378 }
91379
91380 /**
91381 @@ -821,7 +821,7 @@ void rcu_nmi_exit(void)
91382 */
91383 bool notrace __rcu_is_watching(void)
91384 {
91385 - return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91386 + return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91387 }
91388
91389 /**
91390 @@ -904,7 +904,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
91391 static int dyntick_save_progress_counter(struct rcu_data *rdp,
91392 bool *isidle, unsigned long *maxj)
91393 {
91394 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
91395 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91396 rcu_sysidle_check_cpu(rdp, isidle, maxj);
91397 if ((rdp->dynticks_snap & 0x1) == 0) {
91398 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
91399 @@ -933,7 +933,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91400 int *rcrmp;
91401 unsigned int snap;
91402
91403 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
91404 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91405 snap = (unsigned int)rdp->dynticks_snap;
91406
91407 /*
91408 @@ -996,10 +996,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91409 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
91410 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
91411 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
91412 - ACCESS_ONCE(rdp->cond_resched_completed) =
91413 + ACCESS_ONCE_RW(rdp->cond_resched_completed) =
91414 ACCESS_ONCE(rdp->mynode->completed);
91415 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
91416 - ACCESS_ONCE(*rcrmp) =
91417 + ACCESS_ONCE_RW(*rcrmp) =
91418 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
91419 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
91420 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
91421 @@ -1021,7 +1021,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
91422 rsp->gp_start = j;
91423 smp_wmb(); /* Record start time before stall time. */
91424 j1 = rcu_jiffies_till_stall_check();
91425 - ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
91426 + ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
91427 rsp->jiffies_resched = j + j1 / 2;
91428 }
91429
91430 @@ -1062,7 +1062,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
91431 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91432 return;
91433 }
91434 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91435 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91436 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91437
91438 /*
91439 @@ -1139,7 +1139,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
91440
91441 raw_spin_lock_irqsave(&rnp->lock, flags);
91442 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
91443 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
91444 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
91445 3 * rcu_jiffies_till_stall_check() + 3;
91446 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91447
91448 @@ -1223,7 +1223,7 @@ void rcu_cpu_stall_reset(void)
91449 struct rcu_state *rsp;
91450
91451 for_each_rcu_flavor(rsp)
91452 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91453 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91454 }
91455
91456 /*
91457 @@ -1609,7 +1609,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
91458 raw_spin_unlock_irq(&rnp->lock);
91459 return 0;
91460 }
91461 - ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91462 + ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91463
91464 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
91465 /*
91466 @@ -1650,9 +1650,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
91467 rdp = this_cpu_ptr(rsp->rda);
91468 rcu_preempt_check_blocked_tasks(rnp);
91469 rnp->qsmask = rnp->qsmaskinit;
91470 - ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
91471 + ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
91472 WARN_ON_ONCE(rnp->completed != rsp->completed);
91473 - ACCESS_ONCE(rnp->completed) = rsp->completed;
91474 + ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
91475 if (rnp == rdp->mynode)
91476 (void)__note_gp_changes(rsp, rnp, rdp);
91477 rcu_preempt_boost_start_gp(rnp);
91478 @@ -1697,7 +1697,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
91479 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
91480 raw_spin_lock_irq(&rnp->lock);
91481 smp_mb__after_unlock_lock();
91482 - ACCESS_ONCE(rsp->gp_flags) =
91483 + ACCESS_ONCE_RW(rsp->gp_flags) =
91484 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
91485 raw_spin_unlock_irq(&rnp->lock);
91486 }
91487 @@ -1743,7 +1743,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91488 rcu_for_each_node_breadth_first(rsp, rnp) {
91489 raw_spin_lock_irq(&rnp->lock);
91490 smp_mb__after_unlock_lock();
91491 - ACCESS_ONCE(rnp->completed) = rsp->gpnum;
91492 + ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
91493 rdp = this_cpu_ptr(rsp->rda);
91494 if (rnp == rdp->mynode)
91495 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
91496 @@ -1758,14 +1758,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91497 rcu_nocb_gp_set(rnp, nocb);
91498
91499 /* Declare grace period done. */
91500 - ACCESS_ONCE(rsp->completed) = rsp->gpnum;
91501 + ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
91502 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
91503 rsp->fqs_state = RCU_GP_IDLE;
91504 rdp = this_cpu_ptr(rsp->rda);
91505 /* Advance CBs to reduce false positives below. */
91506 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
91507 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
91508 - ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91509 + ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91510 trace_rcu_grace_period(rsp->name,
91511 ACCESS_ONCE(rsp->gpnum),
91512 TPS("newreq"));
91513 @@ -1890,7 +1890,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
91514 */
91515 return false;
91516 }
91517 - ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91518 + ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91519 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
91520 TPS("newreq"));
91521
91522 @@ -2111,7 +2111,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
91523 rsp->qlen += rdp->qlen;
91524 rdp->n_cbs_orphaned += rdp->qlen;
91525 rdp->qlen_lazy = 0;
91526 - ACCESS_ONCE(rdp->qlen) = 0;
91527 + ACCESS_ONCE_RW(rdp->qlen) = 0;
91528 }
91529
91530 /*
91531 @@ -2356,7 +2356,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
91532 }
91533 smp_mb(); /* List handling before counting for rcu_barrier(). */
91534 rdp->qlen_lazy -= count_lazy;
91535 - ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
91536 + ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
91537 rdp->n_cbs_invoked += count;
91538
91539 /* Reinstate batch limit if we have worked down the excess. */
91540 @@ -2519,7 +2519,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
91541 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91542 return; /* Someone beat us to it. */
91543 }
91544 - ACCESS_ONCE(rsp->gp_flags) =
91545 + ACCESS_ONCE_RW(rsp->gp_flags) =
91546 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
91547 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91548 rcu_gp_kthread_wake(rsp);
91549 @@ -2565,7 +2565,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
91550 /*
91551 * Do RCU core processing for the current CPU.
91552 */
91553 -static void rcu_process_callbacks(struct softirq_action *unused)
91554 +static void rcu_process_callbacks(void)
91555 {
91556 struct rcu_state *rsp;
91557
91558 @@ -2677,7 +2677,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91559 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
91560 if (debug_rcu_head_queue(head)) {
91561 /* Probable double call_rcu(), so leak the callback. */
91562 - ACCESS_ONCE(head->func) = rcu_leak_callback;
91563 + ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
91564 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
91565 return;
91566 }
91567 @@ -2705,7 +2705,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91568 local_irq_restore(flags);
91569 return;
91570 }
91571 - ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
91572 + ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
91573 if (lazy)
91574 rdp->qlen_lazy++;
91575 else
91576 @@ -2975,11 +2975,11 @@ void synchronize_sched_expedited(void)
91577 * counter wrap on a 32-bit system. Quite a few more CPUs would of
91578 * course be required on a 64-bit system.
91579 */
91580 - if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
91581 + if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
91582 (ulong)atomic_long_read(&rsp->expedited_done) +
91583 ULONG_MAX / 8)) {
91584 synchronize_sched();
91585 - atomic_long_inc(&rsp->expedited_wrap);
91586 + atomic_long_inc_unchecked(&rsp->expedited_wrap);
91587 return;
91588 }
91589
91590 @@ -2987,12 +2987,12 @@ void synchronize_sched_expedited(void)
91591 * Take a ticket. Note that atomic_inc_return() implies a
91592 * full memory barrier.
91593 */
91594 - snap = atomic_long_inc_return(&rsp->expedited_start);
91595 + snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
91596 firstsnap = snap;
91597 if (!try_get_online_cpus()) {
91598 /* CPU hotplug operation in flight, fall back to normal GP. */
91599 wait_rcu_gp(call_rcu_sched);
91600 - atomic_long_inc(&rsp->expedited_normal);
91601 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91602 return;
91603 }
91604 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
91605 @@ -3005,14 +3005,14 @@ void synchronize_sched_expedited(void)
91606 synchronize_sched_expedited_cpu_stop,
91607 NULL) == -EAGAIN) {
91608 put_online_cpus();
91609 - atomic_long_inc(&rsp->expedited_tryfail);
91610 + atomic_long_inc_unchecked(&rsp->expedited_tryfail);
91611
91612 /* Check to see if someone else did our work for us. */
91613 s = atomic_long_read(&rsp->expedited_done);
91614 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91615 /* ensure test happens before caller kfree */
91616 smp_mb__before_atomic(); /* ^^^ */
91617 - atomic_long_inc(&rsp->expedited_workdone1);
91618 + atomic_long_inc_unchecked(&rsp->expedited_workdone1);
91619 return;
91620 }
91621
91622 @@ -3021,7 +3021,7 @@ void synchronize_sched_expedited(void)
91623 udelay(trycount * num_online_cpus());
91624 } else {
91625 wait_rcu_gp(call_rcu_sched);
91626 - atomic_long_inc(&rsp->expedited_normal);
91627 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91628 return;
91629 }
91630
91631 @@ -3030,7 +3030,7 @@ void synchronize_sched_expedited(void)
91632 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91633 /* ensure test happens before caller kfree */
91634 smp_mb__before_atomic(); /* ^^^ */
91635 - atomic_long_inc(&rsp->expedited_workdone2);
91636 + atomic_long_inc_unchecked(&rsp->expedited_workdone2);
91637 return;
91638 }
91639
91640 @@ -3044,13 +3044,13 @@ void synchronize_sched_expedited(void)
91641 if (!try_get_online_cpus()) {
91642 /* CPU hotplug operation in flight, use normal GP. */
91643 wait_rcu_gp(call_rcu_sched);
91644 - atomic_long_inc(&rsp->expedited_normal);
91645 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91646 return;
91647 }
91648 - snap = atomic_long_read(&rsp->expedited_start);
91649 + snap = atomic_long_read_unchecked(&rsp->expedited_start);
91650 smp_mb(); /* ensure read is before try_stop_cpus(). */
91651 }
91652 - atomic_long_inc(&rsp->expedited_stoppedcpus);
91653 + atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
91654
91655 /*
91656 * Everyone up to our most recent fetch is covered by our grace
91657 @@ -3059,16 +3059,16 @@ void synchronize_sched_expedited(void)
91658 * than we did already did their update.
91659 */
91660 do {
91661 - atomic_long_inc(&rsp->expedited_done_tries);
91662 + atomic_long_inc_unchecked(&rsp->expedited_done_tries);
91663 s = atomic_long_read(&rsp->expedited_done);
91664 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
91665 /* ensure test happens before caller kfree */
91666 smp_mb__before_atomic(); /* ^^^ */
91667 - atomic_long_inc(&rsp->expedited_done_lost);
91668 + atomic_long_inc_unchecked(&rsp->expedited_done_lost);
91669 break;
91670 }
91671 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
91672 - atomic_long_inc(&rsp->expedited_done_exit);
91673 + atomic_long_inc_unchecked(&rsp->expedited_done_exit);
91674
91675 put_online_cpus();
91676 }
91677 @@ -3274,7 +3274,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91678 * ACCESS_ONCE() to prevent the compiler from speculating
91679 * the increment to precede the early-exit check.
91680 */
91681 - ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91682 + ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91683 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
91684 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
91685 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
91686 @@ -3329,7 +3329,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91687
91688 /* Increment ->n_barrier_done to prevent duplicate work. */
91689 smp_mb(); /* Keep increment after above mechanism. */
91690 - ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91691 + ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91692 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
91693 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
91694 smp_mb(); /* Keep increment before caller's subsequent code. */
91695 @@ -3374,10 +3374,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
91696 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
91697 init_callback_list(rdp);
91698 rdp->qlen_lazy = 0;
91699 - ACCESS_ONCE(rdp->qlen) = 0;
91700 + ACCESS_ONCE_RW(rdp->qlen) = 0;
91701 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
91702 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
91703 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
91704 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
91705 rdp->cpu = cpu;
91706 rdp->rsp = rsp;
91707 rcu_boot_init_nocb_percpu_data(rdp);
91708 @@ -3410,8 +3410,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
91709 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
91710 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
91711 rcu_sysidle_init_percpu_data(rdp->dynticks);
91712 - atomic_set(&rdp->dynticks->dynticks,
91713 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
91714 + atomic_set_unchecked(&rdp->dynticks->dynticks,
91715 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
91716 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
91717
91718 /* Add CPU to rcu_node bitmasks. */
91719 diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
91720 index bbdc45d..c882ccb 100644
91721 --- a/kernel/rcu/tree.h
91722 +++ b/kernel/rcu/tree.h
91723 @@ -87,11 +87,11 @@ struct rcu_dynticks {
91724 long long dynticks_nesting; /* Track irq/process nesting level. */
91725 /* Process level is worth LLONG_MAX/2. */
91726 int dynticks_nmi_nesting; /* Track NMI nesting level. */
91727 - atomic_t dynticks; /* Even value for idle, else odd. */
91728 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
91729 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
91730 long long dynticks_idle_nesting;
91731 /* irq/process nesting level from idle. */
91732 - atomic_t dynticks_idle; /* Even value for idle, else odd. */
91733 + atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
91734 /* "Idle" excludes userspace execution. */
91735 unsigned long dynticks_idle_jiffies;
91736 /* End of last non-NMI non-idle period. */
91737 @@ -466,17 +466,17 @@ struct rcu_state {
91738 /* _rcu_barrier(). */
91739 /* End of fields guarded by barrier_mutex. */
91740
91741 - atomic_long_t expedited_start; /* Starting ticket. */
91742 - atomic_long_t expedited_done; /* Done ticket. */
91743 - atomic_long_t expedited_wrap; /* # near-wrap incidents. */
91744 - atomic_long_t expedited_tryfail; /* # acquisition failures. */
91745 - atomic_long_t expedited_workdone1; /* # done by others #1. */
91746 - atomic_long_t expedited_workdone2; /* # done by others #2. */
91747 - atomic_long_t expedited_normal; /* # fallbacks to normal. */
91748 - atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
91749 - atomic_long_t expedited_done_tries; /* # tries to update _done. */
91750 - atomic_long_t expedited_done_lost; /* # times beaten to _done. */
91751 - atomic_long_t expedited_done_exit; /* # times exited _done loop. */
91752 + atomic_long_unchecked_t expedited_start; /* Starting ticket. */
91753 + atomic_long_t expedited_done; /* Done ticket. */
91754 + atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
91755 + atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
91756 + atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
91757 + atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
91758 + atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
91759 + atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
91760 + atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
91761 + atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
91762 + atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
91763
91764 unsigned long jiffies_force_qs; /* Time at which to invoke */
91765 /* force_quiescent_state(). */
91766 diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
91767 index c1d7f27..a64bf49 100644
91768 --- a/kernel/rcu/tree_plugin.h
91769 +++ b/kernel/rcu/tree_plugin.h
91770 @@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
91771 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
91772 {
91773 return !rcu_preempted_readers_exp(rnp) &&
91774 - ACCESS_ONCE(rnp->expmask) == 0;
91775 + ACCESS_ONCE_RW(rnp->expmask) == 0;
91776 }
91777
91778 /*
91779 @@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
91780
91781 /* Clean up and exit. */
91782 smp_mb(); /* ensure expedited GP seen before counter increment. */
91783 - ACCESS_ONCE(sync_rcu_preempt_exp_count) =
91784 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
91785 sync_rcu_preempt_exp_count + 1;
91786 unlock_mb_ret:
91787 mutex_unlock(&sync_rcu_preempt_exp_mutex);
91788 @@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
91789 free_cpumask_var(cm);
91790 }
91791
91792 -static struct smp_hotplug_thread rcu_cpu_thread_spec = {
91793 +static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
91794 .store = &rcu_cpu_kthread_task,
91795 .thread_should_run = rcu_cpu_kthread_should_run,
91796 .thread_fn = rcu_cpu_kthread,
91797 @@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
91798 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
91799 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
91800 cpu, ticks_value, ticks_title,
91801 - atomic_read(&rdtp->dynticks) & 0xfff,
91802 + atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
91803 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
91804 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
91805 fast_no_hz);
91806 @@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
91807 return;
91808 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
91809 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
91810 - ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
91811 + ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
91812 wake_up(&rdp_leader->nocb_wq);
91813 }
91814 }
91815 @@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
91816
91817 /* Enqueue the callback on the nocb list and update counts. */
91818 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
91819 - ACCESS_ONCE(*old_rhpp) = rhp;
91820 + ACCESS_ONCE_RW(*old_rhpp) = rhp;
91821 atomic_long_add(rhcount, &rdp->nocb_q_count);
91822 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
91823 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
91824 @@ -2286,7 +2286,7 @@ wait_again:
91825 continue; /* No CBs here, try next follower. */
91826
91827 /* Move callbacks to wait-for-GP list, which is empty. */
91828 - ACCESS_ONCE(rdp->nocb_head) = NULL;
91829 + ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
91830 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
91831 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
91832 rdp->nocb_gp_count_lazy =
91833 @@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
91834 list = ACCESS_ONCE(rdp->nocb_follower_head);
91835 BUG_ON(!list);
91836 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
91837 - ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
91838 + ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
91839 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
91840 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
91841 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
91842 @@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
91843 list = next;
91844 }
91845 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
91846 - ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91847 - ACCESS_ONCE(rdp->nocb_p_count_lazy) =
91848 + ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91849 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
91850 rdp->nocb_p_count_lazy - cl;
91851 rdp->n_nocbs_invoked += c;
91852 }
91853 @@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
91854 if (!rcu_nocb_need_deferred_wakeup(rdp))
91855 return;
91856 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
91857 - ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91858 + ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91859 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
91860 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
91861 }
91862 @@ -2584,7 +2584,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
91863 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
91864 "rcuo%c/%d", rsp->abbr, cpu);
91865 BUG_ON(IS_ERR(t));
91866 - ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
91867 + ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
91868 }
91869
91870 /*
91871 @@ -2788,11 +2788,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
91872
91873 /* Record start of fully idle period. */
91874 j = jiffies;
91875 - ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
91876 + ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
91877 smp_mb__before_atomic();
91878 - atomic_inc(&rdtp->dynticks_idle);
91879 + atomic_inc_unchecked(&rdtp->dynticks_idle);
91880 smp_mb__after_atomic();
91881 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
91882 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
91883 }
91884
91885 /*
91886 @@ -2861,9 +2861,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
91887
91888 /* Record end of idle period. */
91889 smp_mb__before_atomic();
91890 - atomic_inc(&rdtp->dynticks_idle);
91891 + atomic_inc_unchecked(&rdtp->dynticks_idle);
91892 smp_mb__after_atomic();
91893 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
91894 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
91895
91896 /*
91897 * If we are the timekeeping CPU, we are permitted to be non-idle
91898 @@ -2908,7 +2908,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
91899 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
91900
91901 /* Pick up current idle and NMI-nesting counter and check. */
91902 - cur = atomic_read(&rdtp->dynticks_idle);
91903 + cur = atomic_read_unchecked(&rdtp->dynticks_idle);
91904 if (cur & 0x1) {
91905 *isidle = false; /* We are not idle! */
91906 return;
91907 @@ -2957,7 +2957,7 @@ static void rcu_sysidle(unsigned long j)
91908 case RCU_SYSIDLE_NOT:
91909
91910 /* First time all are idle, so note a short idle period. */
91911 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91912 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91913 break;
91914
91915 case RCU_SYSIDLE_SHORT:
91916 @@ -2995,7 +2995,7 @@ static void rcu_sysidle_cancel(void)
91917 {
91918 smp_mb();
91919 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
91920 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
91921 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
91922 }
91923
91924 /*
91925 @@ -3047,7 +3047,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
91926 smp_mb(); /* grace period precedes setting inuse. */
91927
91928 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
91929 - ACCESS_ONCE(rshp->inuse) = 0;
91930 + ACCESS_ONCE_RW(rshp->inuse) = 0;
91931 }
91932
91933 /*
91934 @@ -3200,7 +3200,7 @@ static void rcu_bind_gp_kthread(void)
91935 static void rcu_dynticks_task_enter(void)
91936 {
91937 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91938 - ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
91939 + ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
91940 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91941 }
91942
91943 @@ -3208,6 +3208,6 @@ static void rcu_dynticks_task_enter(void)
91944 static void rcu_dynticks_task_exit(void)
91945 {
91946 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91947 - ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
91948 + ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
91949 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91950 }
91951 diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
91952 index 5cdc62e..cc52e88 100644
91953 --- a/kernel/rcu/tree_trace.c
91954 +++ b/kernel/rcu/tree_trace.c
91955 @@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
91956 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
91957 rdp->passed_quiesce, rdp->qs_pending);
91958 seq_printf(m, " dt=%d/%llx/%d df=%lu",
91959 - atomic_read(&rdp->dynticks->dynticks),
91960 + atomic_read_unchecked(&rdp->dynticks->dynticks),
91961 rdp->dynticks->dynticks_nesting,
91962 rdp->dynticks->dynticks_nmi_nesting,
91963 rdp->dynticks_fqs);
91964 @@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
91965 struct rcu_state *rsp = (struct rcu_state *)m->private;
91966
91967 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",
91968 - atomic_long_read(&rsp->expedited_start),
91969 + atomic_long_read_unchecked(&rsp->expedited_start),
91970 atomic_long_read(&rsp->expedited_done),
91971 - atomic_long_read(&rsp->expedited_wrap),
91972 - atomic_long_read(&rsp->expedited_tryfail),
91973 - atomic_long_read(&rsp->expedited_workdone1),
91974 - atomic_long_read(&rsp->expedited_workdone2),
91975 - atomic_long_read(&rsp->expedited_normal),
91976 - atomic_long_read(&rsp->expedited_stoppedcpus),
91977 - atomic_long_read(&rsp->expedited_done_tries),
91978 - atomic_long_read(&rsp->expedited_done_lost),
91979 - atomic_long_read(&rsp->expedited_done_exit));
91980 + atomic_long_read_unchecked(&rsp->expedited_wrap),
91981 + atomic_long_read_unchecked(&rsp->expedited_tryfail),
91982 + atomic_long_read_unchecked(&rsp->expedited_workdone1),
91983 + atomic_long_read_unchecked(&rsp->expedited_workdone2),
91984 + atomic_long_read_unchecked(&rsp->expedited_normal),
91985 + atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
91986 + atomic_long_read_unchecked(&rsp->expedited_done_tries),
91987 + atomic_long_read_unchecked(&rsp->expedited_done_lost),
91988 + atomic_long_read_unchecked(&rsp->expedited_done_exit));
91989 return 0;
91990 }
91991
91992 diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
91993 index 3ef8ba5..8c5ebfb6 100644
91994 --- a/kernel/rcu/update.c
91995 +++ b/kernel/rcu/update.c
91996 @@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
91997 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
91998 */
91999 if (till_stall_check < 3) {
92000 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
92001 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
92002 till_stall_check = 3;
92003 } else if (till_stall_check > 300) {
92004 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
92005 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
92006 till_stall_check = 300;
92007 }
92008 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
92009 @@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
92010 !ACCESS_ONCE(t->on_rq) ||
92011 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
92012 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
92013 - ACCESS_ONCE(t->rcu_tasks_holdout) = false;
92014 + ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
92015 list_del_init(&t->rcu_tasks_holdout_list);
92016 put_task_struct(t);
92017 return;
92018 @@ -588,7 +588,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
92019 !is_idle_task(t)) {
92020 get_task_struct(t);
92021 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
92022 - ACCESS_ONCE(t->rcu_tasks_holdout) = true;
92023 + ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
92024 list_add(&t->rcu_tasks_holdout_list,
92025 &rcu_tasks_holdouts);
92026 }
92027 @@ -685,7 +685,7 @@ static void rcu_spawn_tasks_kthread(void)
92028 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
92029 BUG_ON(IS_ERR(t));
92030 smp_mb(); /* Ensure others see full kthread. */
92031 - ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
92032 + ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
92033 mutex_unlock(&rcu_tasks_kthread_mutex);
92034 }
92035
92036 diff --git a/kernel/resource.c b/kernel/resource.c
92037 index 0bcebff..e7cd5b2 100644
92038 --- a/kernel/resource.c
92039 +++ b/kernel/resource.c
92040 @@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
92041
92042 static int __init ioresources_init(void)
92043 {
92044 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
92045 +#ifdef CONFIG_GRKERNSEC_PROC_USER
92046 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
92047 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
92048 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92049 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
92050 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
92051 +#endif
92052 +#else
92053 proc_create("ioports", 0, NULL, &proc_ioports_operations);
92054 proc_create("iomem", 0, NULL, &proc_iomem_operations);
92055 +#endif
92056 return 0;
92057 }
92058 __initcall(ioresources_init);
92059 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
92060 index 8a2e230..6020954 100644
92061 --- a/kernel/sched/auto_group.c
92062 +++ b/kernel/sched/auto_group.c
92063 @@ -11,7 +11,7 @@
92064
92065 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
92066 static struct autogroup autogroup_default;
92067 -static atomic_t autogroup_seq_nr;
92068 +static atomic_unchecked_t autogroup_seq_nr;
92069
92070 void __init autogroup_init(struct task_struct *init_task)
92071 {
92072 @@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
92073
92074 kref_init(&ag->kref);
92075 init_rwsem(&ag->lock);
92076 - ag->id = atomic_inc_return(&autogroup_seq_nr);
92077 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
92078 ag->tg = tg;
92079 #ifdef CONFIG_RT_GROUP_SCHED
92080 /*
92081 diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
92082 index a63f4dc..349bbb0 100644
92083 --- a/kernel/sched/completion.c
92084 +++ b/kernel/sched/completion.c
92085 @@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
92086 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92087 * or number of jiffies left till timeout) if completed.
92088 */
92089 -long __sched
92090 +long __sched __intentional_overflow(-1)
92091 wait_for_completion_interruptible_timeout(struct completion *x,
92092 unsigned long timeout)
92093 {
92094 @@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
92095 *
92096 * Return: -ERESTARTSYS if interrupted, 0 if completed.
92097 */
92098 -int __sched wait_for_completion_killable(struct completion *x)
92099 +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
92100 {
92101 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
92102 if (t == -ERESTARTSYS)
92103 @@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
92104 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92105 * or number of jiffies left till timeout) if completed.
92106 */
92107 -long __sched
92108 +long __sched __intentional_overflow(-1)
92109 wait_for_completion_killable_timeout(struct completion *x,
92110 unsigned long timeout)
92111 {
92112 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
92113 index 89e7283..072bc26 100644
92114 --- a/kernel/sched/core.c
92115 +++ b/kernel/sched/core.c
92116 @@ -1885,7 +1885,7 @@ void set_numabalancing_state(bool enabled)
92117 int sysctl_numa_balancing(struct ctl_table *table, int write,
92118 void __user *buffer, size_t *lenp, loff_t *ppos)
92119 {
92120 - struct ctl_table t;
92121 + ctl_table_no_const t;
92122 int err;
92123 int state = numabalancing_enabled;
92124
92125 @@ -2348,8 +2348,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
92126 next->active_mm = oldmm;
92127 atomic_inc(&oldmm->mm_count);
92128 enter_lazy_tlb(oldmm, next);
92129 - } else
92130 + } else {
92131 switch_mm(oldmm, mm, next);
92132 + populate_stack();
92133 + }
92134
92135 if (!prev->mm) {
92136 prev->active_mm = NULL;
92137 @@ -3160,6 +3162,8 @@ int can_nice(const struct task_struct *p, const int nice)
92138 /* convert nice value [19,-20] to rlimit style value [1,40] */
92139 int nice_rlim = nice_to_rlimit(nice);
92140
92141 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
92142 +
92143 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
92144 capable(CAP_SYS_NICE));
92145 }
92146 @@ -3186,7 +3190,8 @@ SYSCALL_DEFINE1(nice, int, increment)
92147 nice = task_nice(current) + increment;
92148
92149 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
92150 - if (increment < 0 && !can_nice(current, nice))
92151 + if (increment < 0 && (!can_nice(current, nice) ||
92152 + gr_handle_chroot_nice()))
92153 return -EPERM;
92154
92155 retval = security_task_setnice(current, nice);
92156 @@ -3465,6 +3470,7 @@ recheck:
92157 if (policy != p->policy && !rlim_rtprio)
92158 return -EPERM;
92159
92160 + gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
92161 /* can't increase priority */
92162 if (attr->sched_priority > p->rt_priority &&
92163 attr->sched_priority > rlim_rtprio)
92164 @@ -4885,6 +4891,7 @@ void idle_task_exit(void)
92165
92166 if (mm != &init_mm) {
92167 switch_mm(mm, &init_mm, current);
92168 + populate_stack();
92169 finish_arch_post_lock_switch();
92170 }
92171 mmdrop(mm);
92172 @@ -4980,7 +4987,7 @@ static void migrate_tasks(unsigned int dead_cpu)
92173
92174 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
92175
92176 -static struct ctl_table sd_ctl_dir[] = {
92177 +static ctl_table_no_const sd_ctl_dir[] __read_only = {
92178 {
92179 .procname = "sched_domain",
92180 .mode = 0555,
92181 @@ -4997,17 +5004,17 @@ static struct ctl_table sd_ctl_root[] = {
92182 {}
92183 };
92184
92185 -static struct ctl_table *sd_alloc_ctl_entry(int n)
92186 +static ctl_table_no_const *sd_alloc_ctl_entry(int n)
92187 {
92188 - struct ctl_table *entry =
92189 + ctl_table_no_const *entry =
92190 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
92191
92192 return entry;
92193 }
92194
92195 -static void sd_free_ctl_entry(struct ctl_table **tablep)
92196 +static void sd_free_ctl_entry(ctl_table_no_const *tablep)
92197 {
92198 - struct ctl_table *entry;
92199 + ctl_table_no_const *entry;
92200
92201 /*
92202 * In the intermediate directories, both the child directory and
92203 @@ -5015,22 +5022,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
92204 * will always be set. In the lowest directory the names are
92205 * static strings and all have proc handlers.
92206 */
92207 - for (entry = *tablep; entry->mode; entry++) {
92208 - if (entry->child)
92209 - sd_free_ctl_entry(&entry->child);
92210 + for (entry = tablep; entry->mode; entry++) {
92211 + if (entry->child) {
92212 + sd_free_ctl_entry(entry->child);
92213 + pax_open_kernel();
92214 + entry->child = NULL;
92215 + pax_close_kernel();
92216 + }
92217 if (entry->proc_handler == NULL)
92218 kfree(entry->procname);
92219 }
92220
92221 - kfree(*tablep);
92222 - *tablep = NULL;
92223 + kfree(tablep);
92224 }
92225
92226 static int min_load_idx = 0;
92227 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
92228
92229 static void
92230 -set_table_entry(struct ctl_table *entry,
92231 +set_table_entry(ctl_table_no_const *entry,
92232 const char *procname, void *data, int maxlen,
92233 umode_t mode, proc_handler *proc_handler,
92234 bool load_idx)
92235 @@ -5050,7 +5060,7 @@ set_table_entry(struct ctl_table *entry,
92236 static struct ctl_table *
92237 sd_alloc_ctl_domain_table(struct sched_domain *sd)
92238 {
92239 - struct ctl_table *table = sd_alloc_ctl_entry(14);
92240 + ctl_table_no_const *table = sd_alloc_ctl_entry(14);
92241
92242 if (table == NULL)
92243 return NULL;
92244 @@ -5088,9 +5098,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
92245 return table;
92246 }
92247
92248 -static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
92249 +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
92250 {
92251 - struct ctl_table *entry, *table;
92252 + ctl_table_no_const *entry, *table;
92253 struct sched_domain *sd;
92254 int domain_num = 0, i;
92255 char buf[32];
92256 @@ -5117,11 +5127,13 @@ static struct ctl_table_header *sd_sysctl_header;
92257 static void register_sched_domain_sysctl(void)
92258 {
92259 int i, cpu_num = num_possible_cpus();
92260 - struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
92261 + ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
92262 char buf[32];
92263
92264 WARN_ON(sd_ctl_dir[0].child);
92265 + pax_open_kernel();
92266 sd_ctl_dir[0].child = entry;
92267 + pax_close_kernel();
92268
92269 if (entry == NULL)
92270 return;
92271 @@ -5144,8 +5156,12 @@ static void unregister_sched_domain_sysctl(void)
92272 if (sd_sysctl_header)
92273 unregister_sysctl_table(sd_sysctl_header);
92274 sd_sysctl_header = NULL;
92275 - if (sd_ctl_dir[0].child)
92276 - sd_free_ctl_entry(&sd_ctl_dir[0].child);
92277 + if (sd_ctl_dir[0].child) {
92278 + sd_free_ctl_entry(sd_ctl_dir[0].child);
92279 + pax_open_kernel();
92280 + sd_ctl_dir[0].child = NULL;
92281 + pax_close_kernel();
92282 + }
92283 }
92284 #else
92285 static void register_sched_domain_sysctl(void)
92286 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
92287 index ef2b104..69961f6 100644
92288 --- a/kernel/sched/fair.c
92289 +++ b/kernel/sched/fair.c
92290 @@ -1906,7 +1906,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
92291
92292 static void reset_ptenuma_scan(struct task_struct *p)
92293 {
92294 - ACCESS_ONCE(p->mm->numa_scan_seq)++;
92295 + ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
92296 p->mm->numa_scan_offset = 0;
92297 }
92298
92299 @@ -7465,7 +7465,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
92300 * run_rebalance_domains is triggered when needed from the scheduler tick.
92301 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
92302 */
92303 -static void run_rebalance_domains(struct softirq_action *h)
92304 +static __latent_entropy void run_rebalance_domains(void)
92305 {
92306 struct rq *this_rq = this_rq();
92307 enum cpu_idle_type idle = this_rq->idle_balance ?
92308 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
92309 index 2df8ef0..aae070f 100644
92310 --- a/kernel/sched/sched.h
92311 +++ b/kernel/sched/sched.h
92312 @@ -1140,7 +1140,7 @@ struct sched_class {
92313 #ifdef CONFIG_FAIR_GROUP_SCHED
92314 void (*task_move_group) (struct task_struct *p, int on_rq);
92315 #endif
92316 -};
92317 +} __do_const;
92318
92319 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
92320 {
92321 diff --git a/kernel/signal.c b/kernel/signal.c
92322 index 8f0876f..1153a5a 100644
92323 --- a/kernel/signal.c
92324 +++ b/kernel/signal.c
92325 @@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
92326
92327 int print_fatal_signals __read_mostly;
92328
92329 -static void __user *sig_handler(struct task_struct *t, int sig)
92330 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
92331 {
92332 return t->sighand->action[sig - 1].sa.sa_handler;
92333 }
92334
92335 -static int sig_handler_ignored(void __user *handler, int sig)
92336 +static int sig_handler_ignored(__sighandler_t handler, int sig)
92337 {
92338 /* Is it explicitly or implicitly ignored? */
92339 return handler == SIG_IGN ||
92340 @@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
92341
92342 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
92343 {
92344 - void __user *handler;
92345 + __sighandler_t handler;
92346
92347 handler = sig_handler(t, sig);
92348
92349 @@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
92350 atomic_inc(&user->sigpending);
92351 rcu_read_unlock();
92352
92353 + if (!override_rlimit)
92354 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
92355 +
92356 if (override_rlimit ||
92357 atomic_read(&user->sigpending) <=
92358 task_rlimit(t, RLIMIT_SIGPENDING)) {
92359 @@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
92360
92361 int unhandled_signal(struct task_struct *tsk, int sig)
92362 {
92363 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
92364 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
92365 if (is_global_init(tsk))
92366 return 1;
92367 if (handler != SIG_IGN && handler != SIG_DFL)
92368 @@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
92369 }
92370 }
92371
92372 + /* allow glibc communication via tgkill to other threads in our
92373 + thread group */
92374 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
92375 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
92376 + && gr_handle_signal(t, sig))
92377 + return -EPERM;
92378 +
92379 return security_task_kill(t, info, sig, 0);
92380 }
92381
92382 @@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92383 return send_signal(sig, info, p, 1);
92384 }
92385
92386 -static int
92387 +int
92388 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92389 {
92390 return send_signal(sig, info, t, 0);
92391 @@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92392 unsigned long int flags;
92393 int ret, blocked, ignored;
92394 struct k_sigaction *action;
92395 + int is_unhandled = 0;
92396
92397 spin_lock_irqsave(&t->sighand->siglock, flags);
92398 action = &t->sighand->action[sig-1];
92399 @@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92400 }
92401 if (action->sa.sa_handler == SIG_DFL)
92402 t->signal->flags &= ~SIGNAL_UNKILLABLE;
92403 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
92404 + is_unhandled = 1;
92405 ret = specific_send_sig_info(sig, info, t);
92406 spin_unlock_irqrestore(&t->sighand->siglock, flags);
92407
92408 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
92409 + normal operation */
92410 + if (is_unhandled) {
92411 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
92412 + gr_handle_crash(t, sig);
92413 + }
92414 +
92415 return ret;
92416 }
92417
92418 @@ -1300,8 +1320,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92419 ret = check_kill_permission(sig, info, p);
92420 rcu_read_unlock();
92421
92422 - if (!ret && sig)
92423 + if (!ret && sig) {
92424 ret = do_send_sig_info(sig, info, p, true);
92425 + if (!ret)
92426 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
92427 + }
92428
92429 return ret;
92430 }
92431 @@ -2903,7 +2926,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
92432 int error = -ESRCH;
92433
92434 rcu_read_lock();
92435 - p = find_task_by_vpid(pid);
92436 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
92437 + /* allow glibc communication via tgkill to other threads in our
92438 + thread group */
92439 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
92440 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
92441 + p = find_task_by_vpid_unrestricted(pid);
92442 + else
92443 +#endif
92444 + p = find_task_by_vpid(pid);
92445 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
92446 error = check_kill_permission(sig, info, p);
92447 /*
92448 @@ -3236,8 +3267,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
92449 }
92450 seg = get_fs();
92451 set_fs(KERNEL_DS);
92452 - ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
92453 - (stack_t __force __user *) &uoss,
92454 + ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
92455 + (stack_t __force_user *) &uoss,
92456 compat_user_stack_pointer());
92457 set_fs(seg);
92458 if (ret >= 0 && uoss_ptr) {
92459 diff --git a/kernel/smpboot.c b/kernel/smpboot.c
92460 index eb89e18..a4e6792 100644
92461 --- a/kernel/smpboot.c
92462 +++ b/kernel/smpboot.c
92463 @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
92464 }
92465 smpboot_unpark_thread(plug_thread, cpu);
92466 }
92467 - list_add(&plug_thread->list, &hotplug_threads);
92468 + pax_list_add(&plug_thread->list, &hotplug_threads);
92469 out:
92470 mutex_unlock(&smpboot_threads_lock);
92471 return ret;
92472 @@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
92473 {
92474 get_online_cpus();
92475 mutex_lock(&smpboot_threads_lock);
92476 - list_del(&plug_thread->list);
92477 + pax_list_del(&plug_thread->list);
92478 smpboot_destroy_threads(plug_thread);
92479 mutex_unlock(&smpboot_threads_lock);
92480 put_online_cpus();
92481 diff --git a/kernel/softirq.c b/kernel/softirq.c
92482 index 0699add..d365ad8 100644
92483 --- a/kernel/softirq.c
92484 +++ b/kernel/softirq.c
92485 @@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
92486 EXPORT_SYMBOL(irq_stat);
92487 #endif
92488
92489 -static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
92490 +static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
92491
92492 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
92493
92494 @@ -266,7 +266,7 @@ restart:
92495 kstat_incr_softirqs_this_cpu(vec_nr);
92496
92497 trace_softirq_entry(vec_nr);
92498 - h->action(h);
92499 + h->action();
92500 trace_softirq_exit(vec_nr);
92501 if (unlikely(prev_count != preempt_count())) {
92502 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
92503 @@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
92504 or_softirq_pending(1UL << nr);
92505 }
92506
92507 -void open_softirq(int nr, void (*action)(struct softirq_action *))
92508 +void __init open_softirq(int nr, void (*action)(void))
92509 {
92510 softirq_vec[nr].action = action;
92511 }
92512 @@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
92513 }
92514 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
92515
92516 -static void tasklet_action(struct softirq_action *a)
92517 +static void tasklet_action(void)
92518 {
92519 struct tasklet_struct *list;
92520
92521 @@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
92522 }
92523 }
92524
92525 -static void tasklet_hi_action(struct softirq_action *a)
92526 +static __latent_entropy void tasklet_hi_action(void)
92527 {
92528 struct tasklet_struct *list;
92529
92530 @@ -741,7 +741,7 @@ static struct notifier_block cpu_nfb = {
92531 .notifier_call = cpu_callback
92532 };
92533
92534 -static struct smp_hotplug_thread softirq_threads = {
92535 +static struct smp_hotplug_thread softirq_threads __read_only = {
92536 .store = &ksoftirqd,
92537 .thread_should_run = ksoftirqd_should_run,
92538 .thread_fn = run_ksoftirqd,
92539 diff --git a/kernel/sys.c b/kernel/sys.c
92540 index 1eaa2f0..d80d27c 100644
92541 --- a/kernel/sys.c
92542 +++ b/kernel/sys.c
92543 @@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
92544 error = -EACCES;
92545 goto out;
92546 }
92547 +
92548 + if (gr_handle_chroot_setpriority(p, niceval)) {
92549 + error = -EACCES;
92550 + goto out;
92551 + }
92552 +
92553 no_nice = security_task_setnice(p, niceval);
92554 if (no_nice) {
92555 error = no_nice;
92556 @@ -353,6 +359,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
92557 goto error;
92558 }
92559
92560 + if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
92561 + goto error;
92562 +
92563 + if (!gid_eq(new->gid, old->gid)) {
92564 + /* make sure we generate a learn log for what will
92565 + end up being a role transition after a full-learning
92566 + policy is generated
92567 + CAP_SETGID is required to perform a transition
92568 + we may not log a CAP_SETGID check above, e.g.
92569 + in the case where new rgid = old egid
92570 + */
92571 + gr_learn_cap(current, new, CAP_SETGID);
92572 + }
92573 +
92574 if (rgid != (gid_t) -1 ||
92575 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
92576 new->sgid = new->egid;
92577 @@ -388,6 +408,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
92578 old = current_cred();
92579
92580 retval = -EPERM;
92581 +
92582 + if (gr_check_group_change(kgid, kgid, kgid))
92583 + goto error;
92584 +
92585 if (ns_capable(old->user_ns, CAP_SETGID))
92586 new->gid = new->egid = new->sgid = new->fsgid = kgid;
92587 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
92588 @@ -405,7 +429,7 @@ error:
92589 /*
92590 * change the user struct in a credentials set to match the new UID
92591 */
92592 -static int set_user(struct cred *new)
92593 +int set_user(struct cred *new)
92594 {
92595 struct user_struct *new_user;
92596
92597 @@ -485,7 +509,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
92598 goto error;
92599 }
92600
92601 + if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
92602 + goto error;
92603 +
92604 if (!uid_eq(new->uid, old->uid)) {
92605 + /* make sure we generate a learn log for what will
92606 + end up being a role transition after a full-learning
92607 + policy is generated
92608 + CAP_SETUID is required to perform a transition
92609 + we may not log a CAP_SETUID check above, e.g.
92610 + in the case where new ruid = old euid
92611 + */
92612 + gr_learn_cap(current, new, CAP_SETUID);
92613 retval = set_user(new);
92614 if (retval < 0)
92615 goto error;
92616 @@ -535,6 +570,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
92617 old = current_cred();
92618
92619 retval = -EPERM;
92620 +
92621 + if (gr_check_crash_uid(kuid))
92622 + goto error;
92623 + if (gr_check_user_change(kuid, kuid, kuid))
92624 + goto error;
92625 +
92626 if (ns_capable(old->user_ns, CAP_SETUID)) {
92627 new->suid = new->uid = kuid;
92628 if (!uid_eq(kuid, old->uid)) {
92629 @@ -604,6 +645,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
92630 goto error;
92631 }
92632
92633 + if (gr_check_user_change(kruid, keuid, INVALID_UID))
92634 + goto error;
92635 +
92636 if (ruid != (uid_t) -1) {
92637 new->uid = kruid;
92638 if (!uid_eq(kruid, old->uid)) {
92639 @@ -688,6 +732,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
92640 goto error;
92641 }
92642
92643 + if (gr_check_group_change(krgid, kegid, INVALID_GID))
92644 + goto error;
92645 +
92646 if (rgid != (gid_t) -1)
92647 new->gid = krgid;
92648 if (egid != (gid_t) -1)
92649 @@ -752,12 +799,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
92650 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
92651 ns_capable(old->user_ns, CAP_SETUID)) {
92652 if (!uid_eq(kuid, old->fsuid)) {
92653 + if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
92654 + goto error;
92655 +
92656 new->fsuid = kuid;
92657 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
92658 goto change_okay;
92659 }
92660 }
92661
92662 +error:
92663 abort_creds(new);
92664 return old_fsuid;
92665
92666 @@ -790,12 +841,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
92667 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
92668 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
92669 ns_capable(old->user_ns, CAP_SETGID)) {
92670 + if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
92671 + goto error;
92672 +
92673 if (!gid_eq(kgid, old->fsgid)) {
92674 new->fsgid = kgid;
92675 goto change_okay;
92676 }
92677 }
92678
92679 +error:
92680 abort_creds(new);
92681 return old_fsgid;
92682
92683 @@ -1172,19 +1227,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
92684 return -EFAULT;
92685
92686 down_read(&uts_sem);
92687 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
92688 + error = __copy_to_user(name->sysname, &utsname()->sysname,
92689 __OLD_UTS_LEN);
92690 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
92691 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
92692 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
92693 __OLD_UTS_LEN);
92694 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
92695 - error |= __copy_to_user(&name->release, &utsname()->release,
92696 + error |= __copy_to_user(name->release, &utsname()->release,
92697 __OLD_UTS_LEN);
92698 error |= __put_user(0, name->release + __OLD_UTS_LEN);
92699 - error |= __copy_to_user(&name->version, &utsname()->version,
92700 + error |= __copy_to_user(name->version, &utsname()->version,
92701 __OLD_UTS_LEN);
92702 error |= __put_user(0, name->version + __OLD_UTS_LEN);
92703 - error |= __copy_to_user(&name->machine, &utsname()->machine,
92704 + error |= __copy_to_user(name->machine, &utsname()->machine,
92705 __OLD_UTS_LEN);
92706 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
92707 up_read(&uts_sem);
92708 @@ -1385,6 +1440,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
92709 */
92710 new_rlim->rlim_cur = 1;
92711 }
92712 + /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
92713 + is changed to a lower value. Since tasks can be created by the same
92714 + user in between this limit change and an execve by this task, force
92715 + a recheck only for this task by setting PF_NPROC_EXCEEDED
92716 + */
92717 + if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
92718 + tsk->flags |= PF_NPROC_EXCEEDED;
92719 }
92720 if (!retval) {
92721 if (old_rlim)
92722 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
92723 index 15f2511..181b356 100644
92724 --- a/kernel/sysctl.c
92725 +++ b/kernel/sysctl.c
92726 @@ -94,7 +94,6 @@
92727
92728
92729 #if defined(CONFIG_SYSCTL)
92730 -
92731 /* External variables not in a header file. */
92732 extern int max_threads;
92733 extern int suid_dumpable;
92734 @@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
92735
92736 /* Constants used for minimum and maximum */
92737 #ifdef CONFIG_LOCKUP_DETECTOR
92738 -static int sixty = 60;
92739 +static int sixty __read_only = 60;
92740 #endif
92741
92742 -static int __maybe_unused neg_one = -1;
92743 +static int __maybe_unused neg_one __read_only = -1;
92744
92745 -static int zero;
92746 -static int __maybe_unused one = 1;
92747 -static int __maybe_unused two = 2;
92748 -static int __maybe_unused four = 4;
92749 -static unsigned long one_ul = 1;
92750 -static int one_hundred = 100;
92751 +static int zero __read_only = 0;
92752 +static int __maybe_unused one __read_only = 1;
92753 +static int __maybe_unused two __read_only = 2;
92754 +static int __maybe_unused three __read_only = 3;
92755 +static int __maybe_unused four __read_only = 4;
92756 +static unsigned long one_ul __read_only = 1;
92757 +static int one_hundred __read_only = 100;
92758 #ifdef CONFIG_PRINTK
92759 -static int ten_thousand = 10000;
92760 +static int ten_thousand __read_only = 10000;
92761 #endif
92762
92763 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
92764 @@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
92765 void __user *buffer, size_t *lenp, loff_t *ppos);
92766 #endif
92767
92768 -#ifdef CONFIG_PRINTK
92769 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92770 void __user *buffer, size_t *lenp, loff_t *ppos);
92771 -#endif
92772
92773 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
92774 void __user *buffer, size_t *lenp, loff_t *ppos);
92775 @@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
92776
92777 #endif
92778
92779 +extern struct ctl_table grsecurity_table[];
92780 +
92781 static struct ctl_table kern_table[];
92782 static struct ctl_table vm_table[];
92783 static struct ctl_table fs_table[];
92784 @@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
92785 int sysctl_legacy_va_layout;
92786 #endif
92787
92788 +#ifdef CONFIG_PAX_SOFTMODE
92789 +static struct ctl_table pax_table[] = {
92790 + {
92791 + .procname = "softmode",
92792 + .data = &pax_softmode,
92793 + .maxlen = sizeof(unsigned int),
92794 + .mode = 0600,
92795 + .proc_handler = &proc_dointvec,
92796 + },
92797 +
92798 + { }
92799 +};
92800 +#endif
92801 +
92802 /* The default sysctl tables: */
92803
92804 static struct ctl_table sysctl_base_table[] = {
92805 @@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
92806 #endif
92807
92808 static struct ctl_table kern_table[] = {
92809 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
92810 + {
92811 + .procname = "grsecurity",
92812 + .mode = 0500,
92813 + .child = grsecurity_table,
92814 + },
92815 +#endif
92816 +
92817 +#ifdef CONFIG_PAX_SOFTMODE
92818 + {
92819 + .procname = "pax",
92820 + .mode = 0500,
92821 + .child = pax_table,
92822 + },
92823 +#endif
92824 +
92825 {
92826 .procname = "sched_child_runs_first",
92827 .data = &sysctl_sched_child_runs_first,
92828 @@ -642,7 +672,7 @@ static struct ctl_table kern_table[] = {
92829 .data = &modprobe_path,
92830 .maxlen = KMOD_PATH_LEN,
92831 .mode = 0644,
92832 - .proc_handler = proc_dostring,
92833 + .proc_handler = proc_dostring_modpriv,
92834 },
92835 {
92836 .procname = "modules_disabled",
92837 @@ -809,16 +839,20 @@ static struct ctl_table kern_table[] = {
92838 .extra1 = &zero,
92839 .extra2 = &one,
92840 },
92841 +#endif
92842 {
92843 .procname = "kptr_restrict",
92844 .data = &kptr_restrict,
92845 .maxlen = sizeof(int),
92846 .mode = 0644,
92847 .proc_handler = proc_dointvec_minmax_sysadmin,
92848 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92849 + .extra1 = &two,
92850 +#else
92851 .extra1 = &zero,
92852 +#endif
92853 .extra2 = &two,
92854 },
92855 -#endif
92856 {
92857 .procname = "ngroups_max",
92858 .data = &ngroups_max,
92859 @@ -1065,10 +1099,17 @@ static struct ctl_table kern_table[] = {
92860 */
92861 {
92862 .procname = "perf_event_paranoid",
92863 - .data = &sysctl_perf_event_paranoid,
92864 - .maxlen = sizeof(sysctl_perf_event_paranoid),
92865 + .data = &sysctl_perf_event_legitimately_concerned,
92866 + .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
92867 .mode = 0644,
92868 - .proc_handler = proc_dointvec,
92869 + /* go ahead, be a hero */
92870 + .proc_handler = proc_dointvec_minmax_sysadmin,
92871 + .extra1 = &neg_one,
92872 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
92873 + .extra2 = &three,
92874 +#else
92875 + .extra2 = &two,
92876 +#endif
92877 },
92878 {
92879 .procname = "perf_event_mlock_kb",
92880 @@ -1327,6 +1368,13 @@ static struct ctl_table vm_table[] = {
92881 .proc_handler = proc_dointvec_minmax,
92882 .extra1 = &zero,
92883 },
92884 + {
92885 + .procname = "heap_stack_gap",
92886 + .data = &sysctl_heap_stack_gap,
92887 + .maxlen = sizeof(sysctl_heap_stack_gap),
92888 + .mode = 0644,
92889 + .proc_handler = proc_doulongvec_minmax,
92890 + },
92891 #else
92892 {
92893 .procname = "nr_trim_pages",
92894 @@ -1809,6 +1857,16 @@ int proc_dostring(struct ctl_table *table, int write,
92895 (char __user *)buffer, lenp, ppos);
92896 }
92897
92898 +int proc_dostring_modpriv(struct ctl_table *table, int write,
92899 + void __user *buffer, size_t *lenp, loff_t *ppos)
92900 +{
92901 + if (write && !capable(CAP_SYS_MODULE))
92902 + return -EPERM;
92903 +
92904 + return _proc_do_string(table->data, table->maxlen, write,
92905 + buffer, lenp, ppos);
92906 +}
92907 +
92908 static size_t proc_skip_spaces(char **buf)
92909 {
92910 size_t ret;
92911 @@ -1914,6 +1972,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
92912 len = strlen(tmp);
92913 if (len > *size)
92914 len = *size;
92915 + if (len > sizeof(tmp))
92916 + len = sizeof(tmp);
92917 if (copy_to_user(*buf, tmp, len))
92918 return -EFAULT;
92919 *size -= len;
92920 @@ -2091,7 +2151,7 @@ int proc_dointvec(struct ctl_table *table, int write,
92921 static int proc_taint(struct ctl_table *table, int write,
92922 void __user *buffer, size_t *lenp, loff_t *ppos)
92923 {
92924 - struct ctl_table t;
92925 + ctl_table_no_const t;
92926 unsigned long tmptaint = get_taint();
92927 int err;
92928
92929 @@ -2119,7 +2179,6 @@ static int proc_taint(struct ctl_table *table, int write,
92930 return err;
92931 }
92932
92933 -#ifdef CONFIG_PRINTK
92934 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92935 void __user *buffer, size_t *lenp, loff_t *ppos)
92936 {
92937 @@ -2128,7 +2187,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92938
92939 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
92940 }
92941 -#endif
92942
92943 struct do_proc_dointvec_minmax_conv_param {
92944 int *min;
92945 @@ -2688,6 +2746,12 @@ int proc_dostring(struct ctl_table *table, int write,
92946 return -ENOSYS;
92947 }
92948
92949 +int proc_dostring_modpriv(struct ctl_table *table, int write,
92950 + void __user *buffer, size_t *lenp, loff_t *ppos)
92951 +{
92952 + return -ENOSYS;
92953 +}
92954 +
92955 int proc_dointvec(struct ctl_table *table, int write,
92956 void __user *buffer, size_t *lenp, loff_t *ppos)
92957 {
92958 @@ -2744,5 +2808,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
92959 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
92960 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
92961 EXPORT_SYMBOL(proc_dostring);
92962 +EXPORT_SYMBOL(proc_dostring_modpriv);
92963 EXPORT_SYMBOL(proc_doulongvec_minmax);
92964 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
92965 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
92966 index b312fcc7..753d72d 100644
92967 --- a/kernel/taskstats.c
92968 +++ b/kernel/taskstats.c
92969 @@ -28,9 +28,12 @@
92970 #include <linux/fs.h>
92971 #include <linux/file.h>
92972 #include <linux/pid_namespace.h>
92973 +#include <linux/grsecurity.h>
92974 #include <net/genetlink.h>
92975 #include <linux/atomic.h>
92976
92977 +extern int gr_is_taskstats_denied(int pid);
92978 +
92979 /*
92980 * Maximum length of a cpumask that can be specified in
92981 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
92982 @@ -576,6 +579,9 @@ err:
92983
92984 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
92985 {
92986 + if (gr_is_taskstats_denied(current->pid))
92987 + return -EACCES;
92988 +
92989 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
92990 return cmd_attr_register_cpumask(info);
92991 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
92992 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
92993 index a7077d3..dd48a49 100644
92994 --- a/kernel/time/alarmtimer.c
92995 +++ b/kernel/time/alarmtimer.c
92996 @@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
92997 struct platform_device *pdev;
92998 int error = 0;
92999 int i;
93000 - struct k_clock alarm_clock = {
93001 + static struct k_clock alarm_clock = {
93002 .clock_getres = alarm_clock_getres,
93003 .clock_get = alarm_clock_get,
93004 .timer_create = alarm_timer_create,
93005 diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
93006 index 37e50aa..57a9501 100644
93007 --- a/kernel/time/hrtimer.c
93008 +++ b/kernel/time/hrtimer.c
93009 @@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
93010 local_irq_restore(flags);
93011 }
93012
93013 -static void run_hrtimer_softirq(struct softirq_action *h)
93014 +static __latent_entropy void run_hrtimer_softirq(void)
93015 {
93016 hrtimer_peek_ahead_timers();
93017 }
93018 diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
93019 index a16b678..8c5bd9d 100644
93020 --- a/kernel/time/posix-cpu-timers.c
93021 +++ b/kernel/time/posix-cpu-timers.c
93022 @@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
93023
93024 static __init int init_posix_cpu_timers(void)
93025 {
93026 - struct k_clock process = {
93027 + static struct k_clock process = {
93028 .clock_getres = process_cpu_clock_getres,
93029 .clock_get = process_cpu_clock_get,
93030 .timer_create = process_cpu_timer_create,
93031 .nsleep = process_cpu_nsleep,
93032 .nsleep_restart = process_cpu_nsleep_restart,
93033 };
93034 - struct k_clock thread = {
93035 + static struct k_clock thread = {
93036 .clock_getres = thread_cpu_clock_getres,
93037 .clock_get = thread_cpu_clock_get,
93038 .timer_create = thread_cpu_timer_create,
93039 diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
93040 index 31ea01f..7fc61ef 100644
93041 --- a/kernel/time/posix-timers.c
93042 +++ b/kernel/time/posix-timers.c
93043 @@ -43,6 +43,7 @@
93044 #include <linux/hash.h>
93045 #include <linux/posix-clock.h>
93046 #include <linux/posix-timers.h>
93047 +#include <linux/grsecurity.h>
93048 #include <linux/syscalls.h>
93049 #include <linux/wait.h>
93050 #include <linux/workqueue.h>
93051 @@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
93052 * which we beg off on and pass to do_sys_settimeofday().
93053 */
93054
93055 -static struct k_clock posix_clocks[MAX_CLOCKS];
93056 +static struct k_clock *posix_clocks[MAX_CLOCKS];
93057
93058 /*
93059 * These ones are defined below.
93060 @@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
93061 */
93062 static __init int init_posix_timers(void)
93063 {
93064 - struct k_clock clock_realtime = {
93065 + static struct k_clock clock_realtime = {
93066 .clock_getres = hrtimer_get_res,
93067 .clock_get = posix_clock_realtime_get,
93068 .clock_set = posix_clock_realtime_set,
93069 @@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
93070 .timer_get = common_timer_get,
93071 .timer_del = common_timer_del,
93072 };
93073 - struct k_clock clock_monotonic = {
93074 + static struct k_clock clock_monotonic = {
93075 .clock_getres = hrtimer_get_res,
93076 .clock_get = posix_ktime_get_ts,
93077 .nsleep = common_nsleep,
93078 @@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
93079 .timer_get = common_timer_get,
93080 .timer_del = common_timer_del,
93081 };
93082 - struct k_clock clock_monotonic_raw = {
93083 + static struct k_clock clock_monotonic_raw = {
93084 .clock_getres = hrtimer_get_res,
93085 .clock_get = posix_get_monotonic_raw,
93086 };
93087 - struct k_clock clock_realtime_coarse = {
93088 + static struct k_clock clock_realtime_coarse = {
93089 .clock_getres = posix_get_coarse_res,
93090 .clock_get = posix_get_realtime_coarse,
93091 };
93092 - struct k_clock clock_monotonic_coarse = {
93093 + static struct k_clock clock_monotonic_coarse = {
93094 .clock_getres = posix_get_coarse_res,
93095 .clock_get = posix_get_monotonic_coarse,
93096 };
93097 - struct k_clock clock_tai = {
93098 + static struct k_clock clock_tai = {
93099 .clock_getres = hrtimer_get_res,
93100 .clock_get = posix_get_tai,
93101 .nsleep = common_nsleep,
93102 @@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
93103 .timer_get = common_timer_get,
93104 .timer_del = common_timer_del,
93105 };
93106 - struct k_clock clock_boottime = {
93107 + static struct k_clock clock_boottime = {
93108 .clock_getres = hrtimer_get_res,
93109 .clock_get = posix_get_boottime,
93110 .nsleep = common_nsleep,
93111 @@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
93112 return;
93113 }
93114
93115 - posix_clocks[clock_id] = *new_clock;
93116 + posix_clocks[clock_id] = new_clock;
93117 }
93118 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
93119
93120 @@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
93121 return (id & CLOCKFD_MASK) == CLOCKFD ?
93122 &clock_posix_dynamic : &clock_posix_cpu;
93123
93124 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
93125 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
93126 return NULL;
93127 - return &posix_clocks[id];
93128 + return posix_clocks[id];
93129 }
93130
93131 static int common_timer_create(struct k_itimer *new_timer)
93132 @@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
93133 struct k_clock *kc = clockid_to_kclock(which_clock);
93134 struct k_itimer *new_timer;
93135 int error, new_timer_id;
93136 - sigevent_t event;
93137 + sigevent_t event = { };
93138 int it_id_set = IT_ID_NOT_SET;
93139
93140 if (!kc)
93141 @@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
93142 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
93143 return -EFAULT;
93144
93145 + /* only the CLOCK_REALTIME clock can be set, all other clocks
93146 + have their clock_set fptr set to a nosettime dummy function
93147 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
93148 + call common_clock_set, which calls do_sys_settimeofday, which
93149 + we hook
93150 + */
93151 +
93152 return kc->clock_set(which_clock, &new_tp);
93153 }
93154
93155 diff --git a/kernel/time/time.c b/kernel/time/time.c
93156 index a9ae20f..d3fbde7 100644
93157 --- a/kernel/time/time.c
93158 +++ b/kernel/time/time.c
93159 @@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
93160 return error;
93161
93162 if (tz) {
93163 + /* we log in do_settimeofday called below, so don't log twice
93164 + */
93165 + if (!tv)
93166 + gr_log_timechange();
93167 +
93168 sys_tz = *tz;
93169 update_vsyscall_tz();
93170 if (firsttime) {
93171 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
93172 index ec1791f..6a086cd 100644
93173 --- a/kernel/time/timekeeping.c
93174 +++ b/kernel/time/timekeeping.c
93175 @@ -15,6 +15,7 @@
93176 #include <linux/init.h>
93177 #include <linux/mm.h>
93178 #include <linux/sched.h>
93179 +#include <linux/grsecurity.h>
93180 #include <linux/syscore_ops.h>
93181 #include <linux/clocksource.h>
93182 #include <linux/jiffies.h>
93183 @@ -717,6 +718,8 @@ int do_settimeofday(const struct timespec *tv)
93184 if (!timespec_valid_strict(tv))
93185 return -EINVAL;
93186
93187 + gr_log_timechange();
93188 +
93189 raw_spin_lock_irqsave(&timekeeper_lock, flags);
93190 write_seqcount_begin(&tk_core.seq);
93191
93192 diff --git a/kernel/time/timer.c b/kernel/time/timer.c
93193 index 3260ffd..c93cd5e 100644
93194 --- a/kernel/time/timer.c
93195 +++ b/kernel/time/timer.c
93196 @@ -1394,7 +1394,7 @@ void update_process_times(int user_tick)
93197 /*
93198 * This function runs timers and the timer-tq in bottom half context.
93199 */
93200 -static void run_timer_softirq(struct softirq_action *h)
93201 +static __latent_entropy void run_timer_softirq(void)
93202 {
93203 struct tvec_base *base = __this_cpu_read(tvec_bases);
93204
93205 @@ -1457,7 +1457,7 @@ static void process_timeout(unsigned long __data)
93206 *
93207 * In all cases the return value is guaranteed to be non-negative.
93208 */
93209 -signed long __sched schedule_timeout(signed long timeout)
93210 +signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
93211 {
93212 struct timer_list timer;
93213 unsigned long expire;
93214 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
93215 index 61ed862..3b52c65 100644
93216 --- a/kernel/time/timer_list.c
93217 +++ b/kernel/time/timer_list.c
93218 @@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
93219
93220 static void print_name_offset(struct seq_file *m, void *sym)
93221 {
93222 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93223 + SEQ_printf(m, "<%p>", NULL);
93224 +#else
93225 char symname[KSYM_NAME_LEN];
93226
93227 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
93228 SEQ_printf(m, "<%pK>", sym);
93229 else
93230 SEQ_printf(m, "%s", symname);
93231 +#endif
93232 }
93233
93234 static void
93235 @@ -119,7 +123,11 @@ next_one:
93236 static void
93237 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
93238 {
93239 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93240 + SEQ_printf(m, " .base: %p\n", NULL);
93241 +#else
93242 SEQ_printf(m, " .base: %pK\n", base);
93243 +#endif
93244 SEQ_printf(m, " .index: %d\n",
93245 base->index);
93246 SEQ_printf(m, " .resolution: %Lu nsecs\n",
93247 @@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
93248 {
93249 struct proc_dir_entry *pe;
93250
93251 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
93252 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
93253 +#else
93254 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
93255 +#endif
93256 if (!pe)
93257 return -ENOMEM;
93258 return 0;
93259 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
93260 index 1fb08f2..ca4bb1e 100644
93261 --- a/kernel/time/timer_stats.c
93262 +++ b/kernel/time/timer_stats.c
93263 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
93264 static unsigned long nr_entries;
93265 static struct entry entries[MAX_ENTRIES];
93266
93267 -static atomic_t overflow_count;
93268 +static atomic_unchecked_t overflow_count;
93269
93270 /*
93271 * The entries are in a hash-table, for fast lookup:
93272 @@ -140,7 +140,7 @@ static void reset_entries(void)
93273 nr_entries = 0;
93274 memset(entries, 0, sizeof(entries));
93275 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
93276 - atomic_set(&overflow_count, 0);
93277 + atomic_set_unchecked(&overflow_count, 0);
93278 }
93279
93280 static struct entry *alloc_entry(void)
93281 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93282 if (likely(entry))
93283 entry->count++;
93284 else
93285 - atomic_inc(&overflow_count);
93286 + atomic_inc_unchecked(&overflow_count);
93287
93288 out_unlock:
93289 raw_spin_unlock_irqrestore(lock, flags);
93290 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93291
93292 static void print_name_offset(struct seq_file *m, unsigned long addr)
93293 {
93294 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93295 + seq_printf(m, "<%p>", NULL);
93296 +#else
93297 char symname[KSYM_NAME_LEN];
93298
93299 if (lookup_symbol_name(addr, symname) < 0)
93300 - seq_printf(m, "<%p>", (void *)addr);
93301 + seq_printf(m, "<%pK>", (void *)addr);
93302 else
93303 seq_printf(m, "%s", symname);
93304 +#endif
93305 }
93306
93307 static int tstats_show(struct seq_file *m, void *v)
93308 @@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
93309
93310 seq_puts(m, "Timer Stats Version: v0.3\n");
93311 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
93312 - if (atomic_read(&overflow_count))
93313 - seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
93314 + if (atomic_read_unchecked(&overflow_count))
93315 + seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
93316 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
93317
93318 for (i = 0; i < nr_entries; i++) {
93319 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
93320 {
93321 struct proc_dir_entry *pe;
93322
93323 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
93324 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
93325 +#else
93326 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
93327 +#endif
93328 if (!pe)
93329 return -ENOMEM;
93330 return 0;
93331 diff --git a/kernel/torture.c b/kernel/torture.c
93332 index dd70993..0bf694b 100644
93333 --- a/kernel/torture.c
93334 +++ b/kernel/torture.c
93335 @@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
93336 mutex_lock(&fullstop_mutex);
93337 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
93338 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
93339 - ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
93340 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
93341 } else {
93342 pr_warn("Concurrent rmmod and shutdown illegal!\n");
93343 }
93344 @@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
93345 if (!torture_must_stop()) {
93346 if (stutter > 1) {
93347 schedule_timeout_interruptible(stutter - 1);
93348 - ACCESS_ONCE(stutter_pause_test) = 2;
93349 + ACCESS_ONCE_RW(stutter_pause_test) = 2;
93350 }
93351 schedule_timeout_interruptible(1);
93352 - ACCESS_ONCE(stutter_pause_test) = 1;
93353 + ACCESS_ONCE_RW(stutter_pause_test) = 1;
93354 }
93355 if (!torture_must_stop())
93356 schedule_timeout_interruptible(stutter);
93357 - ACCESS_ONCE(stutter_pause_test) = 0;
93358 + ACCESS_ONCE_RW(stutter_pause_test) = 0;
93359 torture_shutdown_absorb("torture_stutter");
93360 } while (!torture_must_stop());
93361 torture_kthread_stopping("torture_stutter");
93362 @@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
93363 schedule_timeout_uninterruptible(10);
93364 return true;
93365 }
93366 - ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
93367 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
93368 mutex_unlock(&fullstop_mutex);
93369 torture_shutdown_cleanup();
93370 torture_shuffle_cleanup();
93371 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
93372 index c1bd4ad..4b861dc 100644
93373 --- a/kernel/trace/blktrace.c
93374 +++ b/kernel/trace/blktrace.c
93375 @@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
93376 struct blk_trace *bt = filp->private_data;
93377 char buf[16];
93378
93379 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
93380 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
93381
93382 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
93383 }
93384 @@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
93385 return 1;
93386
93387 bt = buf->chan->private_data;
93388 - atomic_inc(&bt->dropped);
93389 + atomic_inc_unchecked(&bt->dropped);
93390 return 0;
93391 }
93392
93393 @@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
93394
93395 bt->dir = dir;
93396 bt->dev = dev;
93397 - atomic_set(&bt->dropped, 0);
93398 + atomic_set_unchecked(&bt->dropped, 0);
93399 INIT_LIST_HEAD(&bt->running_list);
93400
93401 ret = -EIO;
93402 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
93403 index 31c90fe..051ce98 100644
93404 --- a/kernel/trace/ftrace.c
93405 +++ b/kernel/trace/ftrace.c
93406 @@ -2183,12 +2183,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
93407 if (unlikely(ftrace_disabled))
93408 return 0;
93409
93410 + ret = ftrace_arch_code_modify_prepare();
93411 + FTRACE_WARN_ON(ret);
93412 + if (ret)
93413 + return 0;
93414 +
93415 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
93416 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
93417 if (ret) {
93418 ftrace_bug(ret, ip);
93419 - return 0;
93420 }
93421 - return 1;
93422 + return ret ? 0 : 1;
93423 }
93424
93425 /*
93426 @@ -4492,8 +4497,10 @@ static int ftrace_process_locs(struct module *mod,
93427 if (!count)
93428 return 0;
93429
93430 + pax_open_kernel();
93431 sort(start, count, sizeof(*start),
93432 ftrace_cmp_ips, ftrace_swap_ips);
93433 + pax_close_kernel();
93434
93435 start_pg = ftrace_allocate_pages(count);
93436 if (!start_pg)
93437 @@ -5340,7 +5347,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
93438
93439 if (t->ret_stack == NULL) {
93440 atomic_set(&t->tracing_graph_pause, 0);
93441 - atomic_set(&t->trace_overrun, 0);
93442 + atomic_set_unchecked(&t->trace_overrun, 0);
93443 t->curr_ret_stack = -1;
93444 /* Make sure the tasks see the -1 first: */
93445 smp_wmb();
93446 @@ -5553,7 +5560,7 @@ static void
93447 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
93448 {
93449 atomic_set(&t->tracing_graph_pause, 0);
93450 - atomic_set(&t->trace_overrun, 0);
93451 + atomic_set_unchecked(&t->trace_overrun, 0);
93452 t->ftrace_timestamp = 0;
93453 /* make curr_ret_stack visible before we add the ret_stack */
93454 smp_wmb();
93455 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
93456 index a56e07c..d46f0ba 100644
93457 --- a/kernel/trace/ring_buffer.c
93458 +++ b/kernel/trace/ring_buffer.c
93459 @@ -352,9 +352,9 @@ struct buffer_data_page {
93460 */
93461 struct buffer_page {
93462 struct list_head list; /* list of buffer pages */
93463 - local_t write; /* index for next write */
93464 + local_unchecked_t write; /* index for next write */
93465 unsigned read; /* index for next read */
93466 - local_t entries; /* entries on this page */
93467 + local_unchecked_t entries; /* entries on this page */
93468 unsigned long real_end; /* real end of data */
93469 struct buffer_data_page *page; /* Actual data page */
93470 };
93471 @@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
93472 unsigned long last_overrun;
93473 local_t entries_bytes;
93474 local_t entries;
93475 - local_t overrun;
93476 - local_t commit_overrun;
93477 + local_unchecked_t overrun;
93478 + local_unchecked_t commit_overrun;
93479 local_t dropped_events;
93480 local_t committing;
93481 local_t commits;
93482 @@ -1032,8 +1032,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93483 *
93484 * We add a counter to the write field to denote this.
93485 */
93486 - old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
93487 - old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
93488 + old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
93489 + old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
93490
93491 /*
93492 * Just make sure we have seen our old_write and synchronize
93493 @@ -1061,8 +1061,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93494 * cmpxchg to only update if an interrupt did not already
93495 * do it for us. If the cmpxchg fails, we don't care.
93496 */
93497 - (void)local_cmpxchg(&next_page->write, old_write, val);
93498 - (void)local_cmpxchg(&next_page->entries, old_entries, eval);
93499 + (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
93500 + (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
93501
93502 /*
93503 * No need to worry about races with clearing out the commit.
93504 @@ -1429,12 +1429,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
93505
93506 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
93507 {
93508 - return local_read(&bpage->entries) & RB_WRITE_MASK;
93509 + return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
93510 }
93511
93512 static inline unsigned long rb_page_write(struct buffer_page *bpage)
93513 {
93514 - return local_read(&bpage->write) & RB_WRITE_MASK;
93515 + return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
93516 }
93517
93518 static int
93519 @@ -1529,7 +1529,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
93520 * bytes consumed in ring buffer from here.
93521 * Increment overrun to account for the lost events.
93522 */
93523 - local_add(page_entries, &cpu_buffer->overrun);
93524 + local_add_unchecked(page_entries, &cpu_buffer->overrun);
93525 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93526 }
93527
93528 @@ -2091,7 +2091,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
93529 * it is our responsibility to update
93530 * the counters.
93531 */
93532 - local_add(entries, &cpu_buffer->overrun);
93533 + local_add_unchecked(entries, &cpu_buffer->overrun);
93534 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93535
93536 /*
93537 @@ -2241,7 +2241,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93538 if (tail == BUF_PAGE_SIZE)
93539 tail_page->real_end = 0;
93540
93541 - local_sub(length, &tail_page->write);
93542 + local_sub_unchecked(length, &tail_page->write);
93543 return;
93544 }
93545
93546 @@ -2276,7 +2276,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93547 rb_event_set_padding(event);
93548
93549 /* Set the write back to the previous setting */
93550 - local_sub(length, &tail_page->write);
93551 + local_sub_unchecked(length, &tail_page->write);
93552 return;
93553 }
93554
93555 @@ -2288,7 +2288,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93556
93557 /* Set write to end of buffer */
93558 length = (tail + length) - BUF_PAGE_SIZE;
93559 - local_sub(length, &tail_page->write);
93560 + local_sub_unchecked(length, &tail_page->write);
93561 }
93562
93563 /*
93564 @@ -2314,7 +2314,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93565 * about it.
93566 */
93567 if (unlikely(next_page == commit_page)) {
93568 - local_inc(&cpu_buffer->commit_overrun);
93569 + local_inc_unchecked(&cpu_buffer->commit_overrun);
93570 goto out_reset;
93571 }
93572
93573 @@ -2370,7 +2370,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93574 cpu_buffer->tail_page) &&
93575 (cpu_buffer->commit_page ==
93576 cpu_buffer->reader_page))) {
93577 - local_inc(&cpu_buffer->commit_overrun);
93578 + local_inc_unchecked(&cpu_buffer->commit_overrun);
93579 goto out_reset;
93580 }
93581 }
93582 @@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93583 length += RB_LEN_TIME_EXTEND;
93584
93585 tail_page = cpu_buffer->tail_page;
93586 - write = local_add_return(length, &tail_page->write);
93587 + write = local_add_return_unchecked(length, &tail_page->write);
93588
93589 /* set write to only the index of the write */
93590 write &= RB_WRITE_MASK;
93591 @@ -2442,7 +2442,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93592 kmemcheck_annotate_bitfield(event, bitfield);
93593 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
93594
93595 - local_inc(&tail_page->entries);
93596 + local_inc_unchecked(&tail_page->entries);
93597
93598 /*
93599 * If this is the first commit on the page, then update
93600 @@ -2475,7 +2475,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93601
93602 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
93603 unsigned long write_mask =
93604 - local_read(&bpage->write) & ~RB_WRITE_MASK;
93605 + local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
93606 unsigned long event_length = rb_event_length(event);
93607 /*
93608 * This is on the tail page. It is possible that
93609 @@ -2485,7 +2485,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93610 */
93611 old_index += write_mask;
93612 new_index += write_mask;
93613 - index = local_cmpxchg(&bpage->write, old_index, new_index);
93614 + index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
93615 if (index == old_index) {
93616 /* update counters */
93617 local_sub(event_length, &cpu_buffer->entries_bytes);
93618 @@ -2877,7 +2877,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93619
93620 /* Do the likely case first */
93621 if (likely(bpage->page == (void *)addr)) {
93622 - local_dec(&bpage->entries);
93623 + local_dec_unchecked(&bpage->entries);
93624 return;
93625 }
93626
93627 @@ -2889,7 +2889,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93628 start = bpage;
93629 do {
93630 if (bpage->page == (void *)addr) {
93631 - local_dec(&bpage->entries);
93632 + local_dec_unchecked(&bpage->entries);
93633 return;
93634 }
93635 rb_inc_page(cpu_buffer, &bpage);
93636 @@ -3173,7 +3173,7 @@ static inline unsigned long
93637 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
93638 {
93639 return local_read(&cpu_buffer->entries) -
93640 - (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
93641 + (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
93642 }
93643
93644 /**
93645 @@ -3262,7 +3262,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
93646 return 0;
93647
93648 cpu_buffer = buffer->buffers[cpu];
93649 - ret = local_read(&cpu_buffer->overrun);
93650 + ret = local_read_unchecked(&cpu_buffer->overrun);
93651
93652 return ret;
93653 }
93654 @@ -3285,7 +3285,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
93655 return 0;
93656
93657 cpu_buffer = buffer->buffers[cpu];
93658 - ret = local_read(&cpu_buffer->commit_overrun);
93659 + ret = local_read_unchecked(&cpu_buffer->commit_overrun);
93660
93661 return ret;
93662 }
93663 @@ -3370,7 +3370,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
93664 /* if you care about this being correct, lock the buffer */
93665 for_each_buffer_cpu(buffer, cpu) {
93666 cpu_buffer = buffer->buffers[cpu];
93667 - overruns += local_read(&cpu_buffer->overrun);
93668 + overruns += local_read_unchecked(&cpu_buffer->overrun);
93669 }
93670
93671 return overruns;
93672 @@ -3541,8 +3541,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93673 /*
93674 * Reset the reader page to size zero.
93675 */
93676 - local_set(&cpu_buffer->reader_page->write, 0);
93677 - local_set(&cpu_buffer->reader_page->entries, 0);
93678 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93679 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93680 local_set(&cpu_buffer->reader_page->page->commit, 0);
93681 cpu_buffer->reader_page->real_end = 0;
93682
93683 @@ -3576,7 +3576,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93684 * want to compare with the last_overrun.
93685 */
93686 smp_mb();
93687 - overwrite = local_read(&(cpu_buffer->overrun));
93688 + overwrite = local_read_unchecked(&(cpu_buffer->overrun));
93689
93690 /*
93691 * Here's the tricky part.
93692 @@ -4148,8 +4148,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93693
93694 cpu_buffer->head_page
93695 = list_entry(cpu_buffer->pages, struct buffer_page, list);
93696 - local_set(&cpu_buffer->head_page->write, 0);
93697 - local_set(&cpu_buffer->head_page->entries, 0);
93698 + local_set_unchecked(&cpu_buffer->head_page->write, 0);
93699 + local_set_unchecked(&cpu_buffer->head_page->entries, 0);
93700 local_set(&cpu_buffer->head_page->page->commit, 0);
93701
93702 cpu_buffer->head_page->read = 0;
93703 @@ -4159,14 +4159,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93704
93705 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
93706 INIT_LIST_HEAD(&cpu_buffer->new_pages);
93707 - local_set(&cpu_buffer->reader_page->write, 0);
93708 - local_set(&cpu_buffer->reader_page->entries, 0);
93709 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93710 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93711 local_set(&cpu_buffer->reader_page->page->commit, 0);
93712 cpu_buffer->reader_page->read = 0;
93713
93714 local_set(&cpu_buffer->entries_bytes, 0);
93715 - local_set(&cpu_buffer->overrun, 0);
93716 - local_set(&cpu_buffer->commit_overrun, 0);
93717 + local_set_unchecked(&cpu_buffer->overrun, 0);
93718 + local_set_unchecked(&cpu_buffer->commit_overrun, 0);
93719 local_set(&cpu_buffer->dropped_events, 0);
93720 local_set(&cpu_buffer->entries, 0);
93721 local_set(&cpu_buffer->committing, 0);
93722 @@ -4571,8 +4571,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
93723 rb_init_page(bpage);
93724 bpage = reader->page;
93725 reader->page = *data_page;
93726 - local_set(&reader->write, 0);
93727 - local_set(&reader->entries, 0);
93728 + local_set_unchecked(&reader->write, 0);
93729 + local_set_unchecked(&reader->entries, 0);
93730 reader->read = 0;
93731 *data_page = bpage;
93732
93733 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
93734 index 426962b..e8e2d9a 100644
93735 --- a/kernel/trace/trace.c
93736 +++ b/kernel/trace/trace.c
93737 @@ -3488,7 +3488,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
93738 return 0;
93739 }
93740
93741 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
93742 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
93743 {
93744 /* do nothing if flag is already set */
93745 if (!!(trace_flags & mask) == !!enabled)
93746 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
93747 index 385391f..8d2250f 100644
93748 --- a/kernel/trace/trace.h
93749 +++ b/kernel/trace/trace.h
93750 @@ -1280,7 +1280,7 @@ extern const char *__stop___tracepoint_str[];
93751 void trace_printk_init_buffers(void);
93752 void trace_printk_start_comm(void);
93753 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
93754 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
93755 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
93756
93757 /*
93758 * Normal trace_printk() and friends allocates special buffers
93759 diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
93760 index 57b67b1..66082a9 100644
93761 --- a/kernel/trace/trace_clock.c
93762 +++ b/kernel/trace/trace_clock.c
93763 @@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
93764 return now;
93765 }
93766
93767 -static atomic64_t trace_counter;
93768 +static atomic64_unchecked_t trace_counter;
93769
93770 /*
93771 * trace_clock_counter(): simply an atomic counter.
93772 @@ -133,5 +133,5 @@ static atomic64_t trace_counter;
93773 */
93774 u64 notrace trace_clock_counter(void)
93775 {
93776 - return atomic64_add_return(1, &trace_counter);
93777 + return atomic64_inc_return_unchecked(&trace_counter);
93778 }
93779 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
93780 index 1b0df1e..4ebb965 100644
93781 --- a/kernel/trace/trace_events.c
93782 +++ b/kernel/trace/trace_events.c
93783 @@ -1720,7 +1720,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
93784 return 0;
93785 }
93786
93787 -struct ftrace_module_file_ops;
93788 static void __add_event_to_tracers(struct ftrace_event_call *call);
93789
93790 /* Add an additional event_call dynamically */
93791 diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
93792 index f0a0c98..3692dc8 100644
93793 --- a/kernel/trace/trace_functions_graph.c
93794 +++ b/kernel/trace/trace_functions_graph.c
93795 @@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
93796
93797 /* The return trace stack is full */
93798 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
93799 - atomic_inc(&current->trace_overrun);
93800 + atomic_inc_unchecked(&current->trace_overrun);
93801 return -EBUSY;
93802 }
93803
93804 @@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
93805 *ret = current->ret_stack[index].ret;
93806 trace->func = current->ret_stack[index].func;
93807 trace->calltime = current->ret_stack[index].calltime;
93808 - trace->overrun = atomic_read(&current->trace_overrun);
93809 + trace->overrun = atomic_read_unchecked(&current->trace_overrun);
93810 trace->depth = index;
93811 }
93812
93813 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
93814 index 0abd9b8..6a663a2 100644
93815 --- a/kernel/trace/trace_mmiotrace.c
93816 +++ b/kernel/trace/trace_mmiotrace.c
93817 @@ -24,7 +24,7 @@ struct header_iter {
93818 static struct trace_array *mmio_trace_array;
93819 static bool overrun_detected;
93820 static unsigned long prev_overruns;
93821 -static atomic_t dropped_count;
93822 +static atomic_unchecked_t dropped_count;
93823
93824 static void mmio_reset_data(struct trace_array *tr)
93825 {
93826 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
93827
93828 static unsigned long count_overruns(struct trace_iterator *iter)
93829 {
93830 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
93831 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
93832 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
93833
93834 if (over > prev_overruns)
93835 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
93836 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
93837 sizeof(*entry), 0, pc);
93838 if (!event) {
93839 - atomic_inc(&dropped_count);
93840 + atomic_inc_unchecked(&dropped_count);
93841 return;
93842 }
93843 entry = ring_buffer_event_data(event);
93844 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
93845 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
93846 sizeof(*entry), 0, pc);
93847 if (!event) {
93848 - atomic_inc(&dropped_count);
93849 + atomic_inc_unchecked(&dropped_count);
93850 return;
93851 }
93852 entry = ring_buffer_event_data(event);
93853 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
93854 index c6977d5..d243785 100644
93855 --- a/kernel/trace/trace_output.c
93856 +++ b/kernel/trace/trace_output.c
93857 @@ -712,14 +712,16 @@ int register_ftrace_event(struct trace_event *event)
93858 goto out;
93859 }
93860
93861 + pax_open_kernel();
93862 if (event->funcs->trace == NULL)
93863 - event->funcs->trace = trace_nop_print;
93864 + *(void **)&event->funcs->trace = trace_nop_print;
93865 if (event->funcs->raw == NULL)
93866 - event->funcs->raw = trace_nop_print;
93867 + *(void **)&event->funcs->raw = trace_nop_print;
93868 if (event->funcs->hex == NULL)
93869 - event->funcs->hex = trace_nop_print;
93870 + *(void **)&event->funcs->hex = trace_nop_print;
93871 if (event->funcs->binary == NULL)
93872 - event->funcs->binary = trace_nop_print;
93873 + *(void **)&event->funcs->binary = trace_nop_print;
93874 + pax_close_kernel();
93875
93876 key = event->type & (EVENT_HASHSIZE - 1);
93877
93878 diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
93879 index 1f24ed9..10407ec 100644
93880 --- a/kernel/trace/trace_seq.c
93881 +++ b/kernel/trace/trace_seq.c
93882 @@ -367,7 +367,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
93883
93884 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
93885 if (!IS_ERR(p)) {
93886 - p = mangle_path(s->buffer + s->len, p, "\n");
93887 + p = mangle_path(s->buffer + s->len, p, "\n\\");
93888 if (p) {
93889 s->len = p - s->buffer;
93890 return 1;
93891 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
93892 index 16eddb3..758b308 100644
93893 --- a/kernel/trace/trace_stack.c
93894 +++ b/kernel/trace/trace_stack.c
93895 @@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
93896 return;
93897
93898 /* we do not handle interrupt stacks yet */
93899 - if (!object_is_on_stack(stack))
93900 + if (!object_starts_on_stack(stack))
93901 return;
93902
93903 local_irq_save(flags);
93904 diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
93905 index 29228c4..301bc8c 100644
93906 --- a/kernel/trace/trace_syscalls.c
93907 +++ b/kernel/trace/trace_syscalls.c
93908 @@ -602,6 +602,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
93909 int num;
93910
93911 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93912 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93913 + return -EINVAL;
93914
93915 mutex_lock(&syscall_trace_lock);
93916 if (!sys_perf_refcount_enter)
93917 @@ -622,6 +624,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
93918 int num;
93919
93920 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93921 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93922 + return;
93923
93924 mutex_lock(&syscall_trace_lock);
93925 sys_perf_refcount_enter--;
93926 @@ -674,6 +678,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
93927 int num;
93928
93929 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93930 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93931 + return -EINVAL;
93932
93933 mutex_lock(&syscall_trace_lock);
93934 if (!sys_perf_refcount_exit)
93935 @@ -694,6 +700,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
93936 int num;
93937
93938 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93939 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93940 + return;
93941
93942 mutex_lock(&syscall_trace_lock);
93943 sys_perf_refcount_exit--;
93944 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
93945 index aa312b0..395f343 100644
93946 --- a/kernel/user_namespace.c
93947 +++ b/kernel/user_namespace.c
93948 @@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
93949 !kgid_has_mapping(parent_ns, group))
93950 return -EPERM;
93951
93952 +#ifdef CONFIG_GRKERNSEC
93953 + /*
93954 + * This doesn't really inspire confidence:
93955 + * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
93956 + * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
93957 + * Increases kernel attack surface in areas developers
93958 + * previously cared little about ("low importance due
93959 + * to requiring "root" capability")
93960 + * To be removed when this code receives *proper* review
93961 + */
93962 + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
93963 + !capable(CAP_SETGID))
93964 + return -EPERM;
93965 +#endif
93966 +
93967 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
93968 if (!ns)
93969 return -ENOMEM;
93970 @@ -872,7 +887,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
93971 if (atomic_read(&current->mm->mm_users) > 1)
93972 return -EINVAL;
93973
93974 - if (current->fs->users != 1)
93975 + if (atomic_read(&current->fs->users) != 1)
93976 return -EINVAL;
93977
93978 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
93979 diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
93980 index c8eac43..4b5f08f 100644
93981 --- a/kernel/utsname_sysctl.c
93982 +++ b/kernel/utsname_sysctl.c
93983 @@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
93984 static int proc_do_uts_string(struct ctl_table *table, int write,
93985 void __user *buffer, size_t *lenp, loff_t *ppos)
93986 {
93987 - struct ctl_table uts_table;
93988 + ctl_table_no_const uts_table;
93989 int r;
93990 memcpy(&uts_table, table, sizeof(uts_table));
93991 uts_table.data = get_uts(table, write);
93992 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
93993 index 70bf118..4be3c37 100644
93994 --- a/kernel/watchdog.c
93995 +++ b/kernel/watchdog.c
93996 @@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
93997 static void watchdog_nmi_disable(unsigned int cpu) { return; }
93998 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
93999
94000 -static struct smp_hotplug_thread watchdog_threads = {
94001 +static struct smp_hotplug_thread watchdog_threads __read_only = {
94002 .store = &softlockup_watchdog,
94003 .thread_should_run = watchdog_should_run,
94004 .thread_fn = watchdog,
94005 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
94006 index 09b685d..d3565e3 100644
94007 --- a/kernel/workqueue.c
94008 +++ b/kernel/workqueue.c
94009 @@ -4508,7 +4508,7 @@ static void rebind_workers(struct worker_pool *pool)
94010 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
94011 worker_flags |= WORKER_REBOUND;
94012 worker_flags &= ~WORKER_UNBOUND;
94013 - ACCESS_ONCE(worker->flags) = worker_flags;
94014 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
94015 }
94016
94017 spin_unlock_irq(&pool->lock);
94018 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
94019 index 4e35a5d..8a1f3f0 100644
94020 --- a/lib/Kconfig.debug
94021 +++ b/lib/Kconfig.debug
94022 @@ -894,7 +894,7 @@ config DEBUG_MUTEXES
94023
94024 config DEBUG_WW_MUTEX_SLOWPATH
94025 bool "Wait/wound mutex debugging: Slowpath testing"
94026 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94027 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94028 select DEBUG_LOCK_ALLOC
94029 select DEBUG_SPINLOCK
94030 select DEBUG_MUTEXES
94031 @@ -911,7 +911,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
94032
94033 config DEBUG_LOCK_ALLOC
94034 bool "Lock debugging: detect incorrect freeing of live locks"
94035 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94036 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94037 select DEBUG_SPINLOCK
94038 select DEBUG_MUTEXES
94039 select LOCKDEP
94040 @@ -925,7 +925,7 @@ config DEBUG_LOCK_ALLOC
94041
94042 config PROVE_LOCKING
94043 bool "Lock debugging: prove locking correctness"
94044 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94045 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94046 select LOCKDEP
94047 select DEBUG_SPINLOCK
94048 select DEBUG_MUTEXES
94049 @@ -976,7 +976,7 @@ config LOCKDEP
94050
94051 config LOCK_STAT
94052 bool "Lock usage statistics"
94053 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94054 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94055 select LOCKDEP
94056 select DEBUG_SPINLOCK
94057 select DEBUG_MUTEXES
94058 @@ -1449,6 +1449,7 @@ config LATENCYTOP
94059 depends on DEBUG_KERNEL
94060 depends on STACKTRACE_SUPPORT
94061 depends on PROC_FS
94062 + depends on !GRKERNSEC_HIDESYM
94063 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
94064 select KALLSYMS
94065 select KALLSYMS_ALL
94066 @@ -1465,7 +1466,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94067 config DEBUG_STRICT_USER_COPY_CHECKS
94068 bool "Strict user copy size checks"
94069 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94070 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
94071 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
94072 help
94073 Enabling this option turns a certain set of sanity checks for user
94074 copy operations into compile time failures.
94075 @@ -1593,7 +1594,7 @@ endmenu # runtime tests
94076
94077 config PROVIDE_OHCI1394_DMA_INIT
94078 bool "Remote debugging over FireWire early on boot"
94079 - depends on PCI && X86
94080 + depends on PCI && X86 && !GRKERNSEC
94081 help
94082 If you want to debug problems which hang or crash the kernel early
94083 on boot and the crashing machine has a FireWire port, you can use
94084 diff --git a/lib/Makefile b/lib/Makefile
94085 index 0211d2b..93f5cc3 100644
94086 --- a/lib/Makefile
94087 +++ b/lib/Makefile
94088 @@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
94089 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
94090 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
94091 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
94092 -obj-$(CONFIG_DEBUG_LIST) += list_debug.o
94093 +obj-y += list_debug.o
94094 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
94095
94096 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
94097 diff --git a/lib/average.c b/lib/average.c
94098 index 114d1be..ab0350c 100644
94099 --- a/lib/average.c
94100 +++ b/lib/average.c
94101 @@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
94102 {
94103 unsigned long internal = ACCESS_ONCE(avg->internal);
94104
94105 - ACCESS_ONCE(avg->internal) = internal ?
94106 + ACCESS_ONCE_RW(avg->internal) = internal ?
94107 (((internal << avg->weight) - internal) +
94108 (val << avg->factor)) >> avg->weight :
94109 (val << avg->factor);
94110 diff --git a/lib/bitmap.c b/lib/bitmap.c
94111 index b499ab6..fbdb76c 100644
94112 --- a/lib/bitmap.c
94113 +++ b/lib/bitmap.c
94114 @@ -433,7 +433,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
94115 {
94116 int c, old_c, totaldigits, ndigits, nchunks, nbits;
94117 u32 chunk;
94118 - const char __user __force *ubuf = (const char __user __force *)buf;
94119 + const char __user *ubuf = (const char __force_user *)buf;
94120
94121 bitmap_zero(maskp, nmaskbits);
94122
94123 @@ -518,7 +518,7 @@ int bitmap_parse_user(const char __user *ubuf,
94124 {
94125 if (!access_ok(VERIFY_READ, ubuf, ulen))
94126 return -EFAULT;
94127 - return __bitmap_parse((const char __force *)ubuf,
94128 + return __bitmap_parse((const char __force_kernel *)ubuf,
94129 ulen, 1, maskp, nmaskbits);
94130
94131 }
94132 @@ -609,7 +609,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
94133 {
94134 unsigned a, b;
94135 int c, old_c, totaldigits;
94136 - const char __user __force *ubuf = (const char __user __force *)buf;
94137 + const char __user *ubuf = (const char __force_user *)buf;
94138 int exp_digit, in_range;
94139
94140 totaldigits = c = 0;
94141 @@ -704,7 +704,7 @@ int bitmap_parselist_user(const char __user *ubuf,
94142 {
94143 if (!access_ok(VERIFY_READ, ubuf, ulen))
94144 return -EFAULT;
94145 - return __bitmap_parselist((const char __force *)ubuf,
94146 + return __bitmap_parselist((const char __force_kernel *)ubuf,
94147 ulen, 1, maskp, nmaskbits);
94148 }
94149 EXPORT_SYMBOL(bitmap_parselist_user);
94150 diff --git a/lib/bug.c b/lib/bug.c
94151 index d1d7c78..b354235 100644
94152 --- a/lib/bug.c
94153 +++ b/lib/bug.c
94154 @@ -137,6 +137,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
94155 return BUG_TRAP_TYPE_NONE;
94156
94157 bug = find_bug(bugaddr);
94158 + if (!bug)
94159 + return BUG_TRAP_TYPE_NONE;
94160
94161 file = NULL;
94162 line = 0;
94163 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
94164 index 547f7f9..a6d4ba0 100644
94165 --- a/lib/debugobjects.c
94166 +++ b/lib/debugobjects.c
94167 @@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
94168 if (limit > 4)
94169 return;
94170
94171 - is_on_stack = object_is_on_stack(addr);
94172 + is_on_stack = object_starts_on_stack(addr);
94173 if (is_on_stack == onstack)
94174 return;
94175
94176 diff --git a/lib/div64.c b/lib/div64.c
94177 index 4382ad7..08aa558 100644
94178 --- a/lib/div64.c
94179 +++ b/lib/div64.c
94180 @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
94181 EXPORT_SYMBOL(__div64_32);
94182
94183 #ifndef div_s64_rem
94184 -s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94185 +s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94186 {
94187 u64 quotient;
94188
94189 @@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
94190 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
94191 */
94192 #ifndef div64_u64
94193 -u64 div64_u64(u64 dividend, u64 divisor)
94194 +u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
94195 {
94196 u32 high = divisor >> 32;
94197 u64 quot;
94198 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
94199 index add80cc..0d27550 100644
94200 --- a/lib/dma-debug.c
94201 +++ b/lib/dma-debug.c
94202 @@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
94203
94204 void dma_debug_add_bus(struct bus_type *bus)
94205 {
94206 - struct notifier_block *nb;
94207 + notifier_block_no_const *nb;
94208
94209 if (global_disable)
94210 return;
94211 @@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
94212
94213 static void check_for_stack(struct device *dev, void *addr)
94214 {
94215 - if (object_is_on_stack(addr))
94216 + if (object_starts_on_stack(addr))
94217 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
94218 "stack [addr=%p]\n", addr);
94219 }
94220 diff --git a/lib/hash.c b/lib/hash.c
94221 index fea973f..386626f 100644
94222 --- a/lib/hash.c
94223 +++ b/lib/hash.c
94224 @@ -14,7 +14,7 @@
94225 #include <linux/hash.h>
94226 #include <linux/cache.h>
94227
94228 -static struct fast_hash_ops arch_hash_ops __read_mostly = {
94229 +static struct fast_hash_ops arch_hash_ops __read_only = {
94230 .hash = jhash,
94231 .hash2 = jhash2,
94232 };
94233 diff --git a/lib/inflate.c b/lib/inflate.c
94234 index 013a761..c28f3fc 100644
94235 --- a/lib/inflate.c
94236 +++ b/lib/inflate.c
94237 @@ -269,7 +269,7 @@ static void free(void *where)
94238 malloc_ptr = free_mem_ptr;
94239 }
94240 #else
94241 -#define malloc(a) kmalloc(a, GFP_KERNEL)
94242 +#define malloc(a) kmalloc((a), GFP_KERNEL)
94243 #define free(a) kfree(a)
94244 #endif
94245
94246 diff --git a/lib/ioremap.c b/lib/ioremap.c
94247 index 0c9216c..863bd89 100644
94248 --- a/lib/ioremap.c
94249 +++ b/lib/ioremap.c
94250 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
94251 unsigned long next;
94252
94253 phys_addr -= addr;
94254 - pmd = pmd_alloc(&init_mm, pud, addr);
94255 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
94256 if (!pmd)
94257 return -ENOMEM;
94258 do {
94259 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
94260 unsigned long next;
94261
94262 phys_addr -= addr;
94263 - pud = pud_alloc(&init_mm, pgd, addr);
94264 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
94265 if (!pud)
94266 return -ENOMEM;
94267 do {
94268 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
94269 index bd2bea9..6b3c95e 100644
94270 --- a/lib/is_single_threaded.c
94271 +++ b/lib/is_single_threaded.c
94272 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
94273 struct task_struct *p, *t;
94274 bool ret;
94275
94276 + if (!mm)
94277 + return true;
94278 +
94279 if (atomic_read(&task->signal->live) != 1)
94280 return false;
94281
94282 diff --git a/lib/kobject.c b/lib/kobject.c
94283 index 58751bb..93a1853 100644
94284 --- a/lib/kobject.c
94285 +++ b/lib/kobject.c
94286 @@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
94287
94288
94289 static DEFINE_SPINLOCK(kobj_ns_type_lock);
94290 -static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
94291 +static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
94292
94293 -int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94294 +int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94295 {
94296 enum kobj_ns_type type = ops->type;
94297 int error;
94298 diff --git a/lib/list_debug.c b/lib/list_debug.c
94299 index c24c2f7..f0296f4 100644
94300 --- a/lib/list_debug.c
94301 +++ b/lib/list_debug.c
94302 @@ -11,7 +11,9 @@
94303 #include <linux/bug.h>
94304 #include <linux/kernel.h>
94305 #include <linux/rculist.h>
94306 +#include <linux/mm.h>
94307
94308 +#ifdef CONFIG_DEBUG_LIST
94309 /*
94310 * Insert a new entry between two known consecutive entries.
94311 *
94312 @@ -19,21 +21,40 @@
94313 * the prev/next entries already!
94314 */
94315
94316 +static bool __list_add_debug(struct list_head *new,
94317 + struct list_head *prev,
94318 + struct list_head *next)
94319 +{
94320 + if (unlikely(next->prev != prev)) {
94321 + printk(KERN_ERR "list_add corruption. next->prev should be "
94322 + "prev (%p), but was %p. (next=%p).\n",
94323 + prev, next->prev, next);
94324 + BUG();
94325 + return false;
94326 + }
94327 + if (unlikely(prev->next != next)) {
94328 + printk(KERN_ERR "list_add corruption. prev->next should be "
94329 + "next (%p), but was %p. (prev=%p).\n",
94330 + next, prev->next, prev);
94331 + BUG();
94332 + return false;
94333 + }
94334 + if (unlikely(new == prev || new == next)) {
94335 + printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
94336 + new, prev, next);
94337 + BUG();
94338 + return false;
94339 + }
94340 + return true;
94341 +}
94342 +
94343 void __list_add(struct list_head *new,
94344 - struct list_head *prev,
94345 - struct list_head *next)
94346 + struct list_head *prev,
94347 + struct list_head *next)
94348 {
94349 - WARN(next->prev != prev,
94350 - "list_add corruption. next->prev should be "
94351 - "prev (%p), but was %p. (next=%p).\n",
94352 - prev, next->prev, next);
94353 - WARN(prev->next != next,
94354 - "list_add corruption. prev->next should be "
94355 - "next (%p), but was %p. (prev=%p).\n",
94356 - next, prev->next, prev);
94357 - WARN(new == prev || new == next,
94358 - "list_add double add: new=%p, prev=%p, next=%p.\n",
94359 - new, prev, next);
94360 + if (!__list_add_debug(new, prev, next))
94361 + return;
94362 +
94363 next->prev = new;
94364 new->next = next;
94365 new->prev = prev;
94366 @@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
94367 }
94368 EXPORT_SYMBOL(__list_add);
94369
94370 -void __list_del_entry(struct list_head *entry)
94371 +static bool __list_del_entry_debug(struct list_head *entry)
94372 {
94373 struct list_head *prev, *next;
94374
94375 prev = entry->prev;
94376 next = entry->next;
94377
94378 - if (WARN(next == LIST_POISON1,
94379 - "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94380 - entry, LIST_POISON1) ||
94381 - WARN(prev == LIST_POISON2,
94382 - "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94383 - entry, LIST_POISON2) ||
94384 - WARN(prev->next != entry,
94385 - "list_del corruption. prev->next should be %p, "
94386 - "but was %p\n", entry, prev->next) ||
94387 - WARN(next->prev != entry,
94388 - "list_del corruption. next->prev should be %p, "
94389 - "but was %p\n", entry, next->prev))
94390 + if (unlikely(next == LIST_POISON1)) {
94391 + printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94392 + entry, LIST_POISON1);
94393 + BUG();
94394 + return false;
94395 + }
94396 + if (unlikely(prev == LIST_POISON2)) {
94397 + printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94398 + entry, LIST_POISON2);
94399 + BUG();
94400 + return false;
94401 + }
94402 + if (unlikely(entry->prev->next != entry)) {
94403 + printk(KERN_ERR "list_del corruption. prev->next should be %p, "
94404 + "but was %p\n", entry, prev->next);
94405 + BUG();
94406 + return false;
94407 + }
94408 + if (unlikely(entry->next->prev != entry)) {
94409 + printk(KERN_ERR "list_del corruption. next->prev should be %p, "
94410 + "but was %p\n", entry, next->prev);
94411 + BUG();
94412 + return false;
94413 + }
94414 + return true;
94415 +}
94416 +
94417 +void __list_del_entry(struct list_head *entry)
94418 +{
94419 + if (!__list_del_entry_debug(entry))
94420 return;
94421
94422 - __list_del(prev, next);
94423 + __list_del(entry->prev, entry->next);
94424 }
94425 EXPORT_SYMBOL(__list_del_entry);
94426
94427 @@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
94428 void __list_add_rcu(struct list_head *new,
94429 struct list_head *prev, struct list_head *next)
94430 {
94431 - WARN(next->prev != prev,
94432 - "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
94433 - prev, next->prev, next);
94434 - WARN(prev->next != next,
94435 - "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
94436 - next, prev->next, prev);
94437 + if (!__list_add_debug(new, prev, next))
94438 + return;
94439 +
94440 new->next = next;
94441 new->prev = prev;
94442 rcu_assign_pointer(list_next_rcu(prev), new);
94443 next->prev = new;
94444 }
94445 EXPORT_SYMBOL(__list_add_rcu);
94446 +#endif
94447 +
94448 +void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
94449 +{
94450 +#ifdef CONFIG_DEBUG_LIST
94451 + if (!__list_add_debug(new, prev, next))
94452 + return;
94453 +#endif
94454 +
94455 + pax_open_kernel();
94456 + next->prev = new;
94457 + new->next = next;
94458 + new->prev = prev;
94459 + prev->next = new;
94460 + pax_close_kernel();
94461 +}
94462 +EXPORT_SYMBOL(__pax_list_add);
94463 +
94464 +void pax_list_del(struct list_head *entry)
94465 +{
94466 +#ifdef CONFIG_DEBUG_LIST
94467 + if (!__list_del_entry_debug(entry))
94468 + return;
94469 +#endif
94470 +
94471 + pax_open_kernel();
94472 + __list_del(entry->prev, entry->next);
94473 + entry->next = LIST_POISON1;
94474 + entry->prev = LIST_POISON2;
94475 + pax_close_kernel();
94476 +}
94477 +EXPORT_SYMBOL(pax_list_del);
94478 +
94479 +void pax_list_del_init(struct list_head *entry)
94480 +{
94481 + pax_open_kernel();
94482 + __list_del(entry->prev, entry->next);
94483 + INIT_LIST_HEAD(entry);
94484 + pax_close_kernel();
94485 +}
94486 +EXPORT_SYMBOL(pax_list_del_init);
94487 +
94488 +void __pax_list_add_rcu(struct list_head *new,
94489 + struct list_head *prev, struct list_head *next)
94490 +{
94491 +#ifdef CONFIG_DEBUG_LIST
94492 + if (!__list_add_debug(new, prev, next))
94493 + return;
94494 +#endif
94495 +
94496 + pax_open_kernel();
94497 + new->next = next;
94498 + new->prev = prev;
94499 + rcu_assign_pointer(list_next_rcu(prev), new);
94500 + next->prev = new;
94501 + pax_close_kernel();
94502 +}
94503 +EXPORT_SYMBOL(__pax_list_add_rcu);
94504 +
94505 +void pax_list_del_rcu(struct list_head *entry)
94506 +{
94507 +#ifdef CONFIG_DEBUG_LIST
94508 + if (!__list_del_entry_debug(entry))
94509 + return;
94510 +#endif
94511 +
94512 + pax_open_kernel();
94513 + __list_del(entry->prev, entry->next);
94514 + entry->next = LIST_POISON1;
94515 + entry->prev = LIST_POISON2;
94516 + pax_close_kernel();
94517 +}
94518 +EXPORT_SYMBOL(pax_list_del_rcu);
94519 diff --git a/lib/lockref.c b/lib/lockref.c
94520 index d2233de..fa1a2f6 100644
94521 --- a/lib/lockref.c
94522 +++ b/lib/lockref.c
94523 @@ -48,13 +48,13 @@
94524 void lockref_get(struct lockref *lockref)
94525 {
94526 CMPXCHG_LOOP(
94527 - new.count++;
94528 + __lockref_inc(&new);
94529 ,
94530 return;
94531 );
94532
94533 spin_lock(&lockref->lock);
94534 - lockref->count++;
94535 + __lockref_inc(lockref);
94536 spin_unlock(&lockref->lock);
94537 }
94538 EXPORT_SYMBOL(lockref_get);
94539 @@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94540 int retval;
94541
94542 CMPXCHG_LOOP(
94543 - new.count++;
94544 + __lockref_inc(&new);
94545 if (!old.count)
94546 return 0;
94547 ,
94548 @@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94549 spin_lock(&lockref->lock);
94550 retval = 0;
94551 if (lockref->count) {
94552 - lockref->count++;
94553 + __lockref_inc(lockref);
94554 retval = 1;
94555 }
94556 spin_unlock(&lockref->lock);
94557 @@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
94558 int lockref_get_or_lock(struct lockref *lockref)
94559 {
94560 CMPXCHG_LOOP(
94561 - new.count++;
94562 + __lockref_inc(&new);
94563 if (!old.count)
94564 break;
94565 ,
94566 @@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
94567 spin_lock(&lockref->lock);
94568 if (!lockref->count)
94569 return 0;
94570 - lockref->count++;
94571 + __lockref_inc(lockref);
94572 spin_unlock(&lockref->lock);
94573 return 1;
94574 }
94575 @@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
94576 int lockref_put_or_lock(struct lockref *lockref)
94577 {
94578 CMPXCHG_LOOP(
94579 - new.count--;
94580 + __lockref_dec(&new);
94581 if (old.count <= 1)
94582 break;
94583 ,
94584 @@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
94585 spin_lock(&lockref->lock);
94586 if (lockref->count <= 1)
94587 return 0;
94588 - lockref->count--;
94589 + __lockref_dec(lockref);
94590 spin_unlock(&lockref->lock);
94591 return 1;
94592 }
94593 @@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94594 int retval;
94595
94596 CMPXCHG_LOOP(
94597 - new.count++;
94598 + __lockref_inc(&new);
94599 if ((int)old.count < 0)
94600 return 0;
94601 ,
94602 @@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94603 spin_lock(&lockref->lock);
94604 retval = 0;
94605 if ((int) lockref->count >= 0) {
94606 - lockref->count++;
94607 + __lockref_inc(lockref);
94608 retval = 1;
94609 }
94610 spin_unlock(&lockref->lock);
94611 diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
94612 index 6111bcb..02e816b 100644
94613 --- a/lib/percpu-refcount.c
94614 +++ b/lib/percpu-refcount.c
94615 @@ -31,7 +31,7 @@
94616 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
94617 */
94618
94619 -#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
94620 +#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
94621
94622 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
94623
94624 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
94625 index 3291a8e..346a91e 100644
94626 --- a/lib/radix-tree.c
94627 +++ b/lib/radix-tree.c
94628 @@ -67,7 +67,7 @@ struct radix_tree_preload {
94629 int nr;
94630 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
94631 };
94632 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
94633 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
94634
94635 static inline void *ptr_to_indirect(void *ptr)
94636 {
94637 diff --git a/lib/random32.c b/lib/random32.c
94638 index 0bee183..526f12f 100644
94639 --- a/lib/random32.c
94640 +++ b/lib/random32.c
94641 @@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
94642 }
94643 #endif
94644
94645 -static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
94646 +static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
94647
94648 /**
94649 * prandom_u32_state - seeded pseudo-random number generator.
94650 diff --git a/lib/rbtree.c b/lib/rbtree.c
94651 index c16c81a..4dcbda1 100644
94652 --- a/lib/rbtree.c
94653 +++ b/lib/rbtree.c
94654 @@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
94655 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
94656
94657 static const struct rb_augment_callbacks dummy_callbacks = {
94658 - dummy_propagate, dummy_copy, dummy_rotate
94659 + .propagate = dummy_propagate,
94660 + .copy = dummy_copy,
94661 + .rotate = dummy_rotate
94662 };
94663
94664 void rb_insert_color(struct rb_node *node, struct rb_root *root)
94665 diff --git a/lib/show_mem.c b/lib/show_mem.c
94666 index 5e25627..3ed9d7f 100644
94667 --- a/lib/show_mem.c
94668 +++ b/lib/show_mem.c
94669 @@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
94670 quicklist_total_size());
94671 #endif
94672 #ifdef CONFIG_MEMORY_FAILURE
94673 - printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
94674 + printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
94675 #endif
94676 }
94677 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
94678 index bb2b201..46abaf9 100644
94679 --- a/lib/strncpy_from_user.c
94680 +++ b/lib/strncpy_from_user.c
94681 @@ -21,7 +21,7 @@
94682 */
94683 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
94684 {
94685 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94686 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94687 long res = 0;
94688
94689 /*
94690 diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
94691 index a28df52..3d55877 100644
94692 --- a/lib/strnlen_user.c
94693 +++ b/lib/strnlen_user.c
94694 @@ -26,7 +26,7 @@
94695 */
94696 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
94697 {
94698 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94699 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94700 long align, res = 0;
94701 unsigned long c;
94702
94703 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
94704 index 4abda07..b9d3765 100644
94705 --- a/lib/swiotlb.c
94706 +++ b/lib/swiotlb.c
94707 @@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
94708
94709 void
94710 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
94711 - dma_addr_t dev_addr)
94712 + dma_addr_t dev_addr, struct dma_attrs *attrs)
94713 {
94714 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
94715
94716 diff --git a/lib/usercopy.c b/lib/usercopy.c
94717 index 4f5b1dd..7cab418 100644
94718 --- a/lib/usercopy.c
94719 +++ b/lib/usercopy.c
94720 @@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
94721 WARN(1, "Buffer overflow detected!\n");
94722 }
94723 EXPORT_SYMBOL(copy_from_user_overflow);
94724 +
94725 +void copy_to_user_overflow(void)
94726 +{
94727 + WARN(1, "Buffer overflow detected!\n");
94728 +}
94729 +EXPORT_SYMBOL(copy_to_user_overflow);
94730 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
94731 index ec337f6..8484eb2 100644
94732 --- a/lib/vsprintf.c
94733 +++ b/lib/vsprintf.c
94734 @@ -16,6 +16,9 @@
94735 * - scnprintf and vscnprintf
94736 */
94737
94738 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94739 +#define __INCLUDED_BY_HIDESYM 1
94740 +#endif
94741 #include <stdarg.h>
94742 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
94743 #include <linux/types.h>
94744 @@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
94745 #ifdef CONFIG_KALLSYMS
94746 if (*fmt == 'B')
94747 sprint_backtrace(sym, value);
94748 - else if (*fmt != 'f' && *fmt != 's')
94749 + else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
94750 sprint_symbol(sym, value);
94751 else
94752 sprint_symbol_no_offset(sym, value);
94753 @@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
94754 return number(buf, end, num, spec);
94755 }
94756
94757 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94758 +int kptr_restrict __read_mostly = 2;
94759 +#else
94760 int kptr_restrict __read_mostly;
94761 +#endif
94762
94763 /*
94764 * Show a '%p' thing. A kernel extension is that the '%p' is followed
94765 @@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
94766 *
94767 * - 'F' For symbolic function descriptor pointers with offset
94768 * - 'f' For simple symbolic function names without offset
94769 + * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
94770 * - 'S' For symbolic direct pointers with offset
94771 * - 's' For symbolic direct pointers without offset
94772 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
94773 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
94774 * - 'B' For backtraced symbolic direct pointers with offset
94775 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
94776 @@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94777
94778 if (!ptr && *fmt != 'K') {
94779 /*
94780 - * Print (null) with the same width as a pointer so it makes
94781 + * Print (nil) with the same width as a pointer so it makes
94782 * tabular output look nice.
94783 */
94784 if (spec.field_width == -1)
94785 spec.field_width = default_width;
94786 - return string(buf, end, "(null)", spec);
94787 + return string(buf, end, "(nil)", spec);
94788 }
94789
94790 switch (*fmt) {
94791 @@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94792 /* Fallthrough */
94793 case 'S':
94794 case 's':
94795 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94796 + break;
94797 +#else
94798 + return symbol_string(buf, end, ptr, spec, fmt);
94799 +#endif
94800 + case 'X':
94801 + ptr = dereference_function_descriptor(ptr);
94802 + case 'A':
94803 case 'B':
94804 return symbol_string(buf, end, ptr, spec, fmt);
94805 case 'R':
94806 @@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94807 va_end(va);
94808 return buf;
94809 }
94810 + case 'P':
94811 + break;
94812 case 'K':
94813 /*
94814 * %pK cannot be used in IRQ context because its test
94815 @@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94816 ((const struct file *)ptr)->f_path.dentry,
94817 spec, fmt);
94818 }
94819 +
94820 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94821 + /* 'P' = approved pointers to copy to userland,
94822 + as in the /proc/kallsyms case, as we make it display nothing
94823 + for non-root users, and the real contents for root users
94824 + 'X' = approved simple symbols
94825 + Also ignore 'K' pointers, since we force their NULLing for non-root users
94826 + above
94827 + */
94828 + if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
94829 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
94830 + dump_stack();
94831 + ptr = NULL;
94832 + }
94833 +#endif
94834 +
94835 spec.flags |= SMALL;
94836 if (spec.field_width == -1) {
94837 spec.field_width = default_width;
94838 @@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94839 typeof(type) value; \
94840 if (sizeof(type) == 8) { \
94841 args = PTR_ALIGN(args, sizeof(u32)); \
94842 - *(u32 *)&value = *(u32 *)args; \
94843 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
94844 + *(u32 *)&value = *(const u32 *)args; \
94845 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
94846 } else { \
94847 args = PTR_ALIGN(args, sizeof(type)); \
94848 - value = *(typeof(type) *)args; \
94849 + value = *(const typeof(type) *)args; \
94850 } \
94851 args += sizeof(type); \
94852 value; \
94853 @@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94854 case FORMAT_TYPE_STR: {
94855 const char *str_arg = args;
94856 args += strlen(str_arg) + 1;
94857 - str = string(str, end, (char *)str_arg, spec);
94858 + str = string(str, end, str_arg, spec);
94859 break;
94860 }
94861
94862 diff --git a/localversion-grsec b/localversion-grsec
94863 new file mode 100644
94864 index 0000000..7cd6065
94865 --- /dev/null
94866 +++ b/localversion-grsec
94867 @@ -0,0 +1 @@
94868 +-grsec
94869 diff --git a/mm/Kconfig b/mm/Kconfig
94870 index 1d1ae6b..0f05885 100644
94871 --- a/mm/Kconfig
94872 +++ b/mm/Kconfig
94873 @@ -341,10 +341,11 @@ config KSM
94874 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
94875
94876 config DEFAULT_MMAP_MIN_ADDR
94877 - int "Low address space to protect from user allocation"
94878 + int "Low address space to protect from user allocation"
94879 depends on MMU
94880 - default 4096
94881 - help
94882 + default 32768 if ALPHA || ARM || PARISC || SPARC32
94883 + default 65536
94884 + help
94885 This is the portion of low virtual memory which should be protected
94886 from userspace allocation. Keeping a user from writing to low pages
94887 can help reduce the impact of kernel NULL pointer bugs.
94888 @@ -375,7 +376,7 @@ config MEMORY_FAILURE
94889
94890 config HWPOISON_INJECT
94891 tristate "HWPoison pages injector"
94892 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
94893 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
94894 select PROC_PAGE_MONITOR
94895
94896 config NOMMU_INITIAL_TRIM_EXCESS
94897 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
94898 index 0ae0df5..82ac56b 100644
94899 --- a/mm/backing-dev.c
94900 +++ b/mm/backing-dev.c
94901 @@ -12,7 +12,7 @@
94902 #include <linux/device.h>
94903 #include <trace/events/writeback.h>
94904
94905 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
94906 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
94907
94908 struct backing_dev_info default_backing_dev_info = {
94909 .name = "default",
94910 @@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
94911 return err;
94912
94913 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
94914 - atomic_long_inc_return(&bdi_seq));
94915 + atomic_long_inc_return_unchecked(&bdi_seq));
94916 if (err) {
94917 bdi_destroy(bdi);
94918 return err;
94919 diff --git a/mm/filemap.c b/mm/filemap.c
94920 index 14b4642..d71ba82 100644
94921 --- a/mm/filemap.c
94922 +++ b/mm/filemap.c
94923 @@ -2101,7 +2101,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
94924 struct address_space *mapping = file->f_mapping;
94925
94926 if (!mapping->a_ops->readpage)
94927 - return -ENOEXEC;
94928 + return -ENODEV;
94929 file_accessed(file);
94930 vma->vm_ops = &generic_file_vm_ops;
94931 return 0;
94932 @@ -2279,6 +2279,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
94933 *pos = i_size_read(inode);
94934
94935 if (limit != RLIM_INFINITY) {
94936 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
94937 if (*pos >= limit) {
94938 send_sig(SIGXFSZ, current, 0);
94939 return -EFBIG;
94940 diff --git a/mm/fremap.c b/mm/fremap.c
94941 index 72b8fa3..c5b39f1 100644
94942 --- a/mm/fremap.c
94943 +++ b/mm/fremap.c
94944 @@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
94945 retry:
94946 vma = find_vma(mm, start);
94947
94948 +#ifdef CONFIG_PAX_SEGMEXEC
94949 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
94950 + goto out;
94951 +#endif
94952 +
94953 /*
94954 * Make sure the vma is shared, that it supports prefaulting,
94955 * and that the remapped range is valid and fully within
94956 diff --git a/mm/gup.c b/mm/gup.c
94957 index cd62c8c..3bb2053 100644
94958 --- a/mm/gup.c
94959 +++ b/mm/gup.c
94960 @@ -274,11 +274,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
94961 unsigned int fault_flags = 0;
94962 int ret;
94963
94964 - /* For mlock, just skip the stack guard page. */
94965 - if ((*flags & FOLL_MLOCK) &&
94966 - (stack_guard_page_start(vma, address) ||
94967 - stack_guard_page_end(vma, address + PAGE_SIZE)))
94968 - return -ENOENT;
94969 if (*flags & FOLL_WRITE)
94970 fault_flags |= FAULT_FLAG_WRITE;
94971 if (nonblocking)
94972 @@ -444,14 +439,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
94973 if (!(gup_flags & FOLL_FORCE))
94974 gup_flags |= FOLL_NUMA;
94975
94976 - do {
94977 + while (nr_pages) {
94978 struct page *page;
94979 unsigned int foll_flags = gup_flags;
94980 unsigned int page_increm;
94981
94982 /* first iteration or cross vma bound */
94983 if (!vma || start >= vma->vm_end) {
94984 - vma = find_extend_vma(mm, start);
94985 + vma = find_vma(mm, start);
94986 if (!vma && in_gate_area(mm, start)) {
94987 int ret;
94988 ret = get_gate_page(mm, start & PAGE_MASK,
94989 @@ -463,7 +458,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
94990 goto next_page;
94991 }
94992
94993 - if (!vma || check_vma_flags(vma, gup_flags))
94994 + if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
94995 return i ? : -EFAULT;
94996 if (is_vm_hugetlb_page(vma)) {
94997 i = follow_hugetlb_page(mm, vma, pages, vmas,
94998 @@ -518,7 +513,7 @@ next_page:
94999 i += page_increm;
95000 start += page_increm * PAGE_SIZE;
95001 nr_pages -= page_increm;
95002 - } while (nr_pages);
95003 + }
95004 return i;
95005 }
95006 EXPORT_SYMBOL(__get_user_pages);
95007 diff --git a/mm/highmem.c b/mm/highmem.c
95008 index 123bcd3..0de52ba 100644
95009 --- a/mm/highmem.c
95010 +++ b/mm/highmem.c
95011 @@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
95012 * So no dangers, even with speculative execution.
95013 */
95014 page = pte_page(pkmap_page_table[i]);
95015 + pax_open_kernel();
95016 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
95017 -
95018 + pax_close_kernel();
95019 set_page_address(page, NULL);
95020 need_flush = 1;
95021 }
95022 @@ -259,9 +260,11 @@ start:
95023 }
95024 }
95025 vaddr = PKMAP_ADDR(last_pkmap_nr);
95026 +
95027 + pax_open_kernel();
95028 set_pte_at(&init_mm, vaddr,
95029 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
95030 -
95031 + pax_close_kernel();
95032 pkmap_count[last_pkmap_nr] = 1;
95033 set_page_address(page, (void *)vaddr);
95034
95035 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
95036 index 9fd7227..5628939 100644
95037 --- a/mm/hugetlb.c
95038 +++ b/mm/hugetlb.c
95039 @@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95040 struct ctl_table *table, int write,
95041 void __user *buffer, size_t *length, loff_t *ppos)
95042 {
95043 + ctl_table_no_const t;
95044 struct hstate *h = &default_hstate;
95045 unsigned long tmp = h->max_huge_pages;
95046 int ret;
95047 @@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95048 if (!hugepages_supported())
95049 return -ENOTSUPP;
95050
95051 - table->data = &tmp;
95052 - table->maxlen = sizeof(unsigned long);
95053 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95054 + t = *table;
95055 + t.data = &tmp;
95056 + t.maxlen = sizeof(unsigned long);
95057 + ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
95058 if (ret)
95059 goto out;
95060
95061 @@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95062 struct hstate *h = &default_hstate;
95063 unsigned long tmp;
95064 int ret;
95065 + ctl_table_no_const hugetlb_table;
95066
95067 if (!hugepages_supported())
95068 return -ENOTSUPP;
95069 @@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95070 if (write && hstate_is_gigantic(h))
95071 return -EINVAL;
95072
95073 - table->data = &tmp;
95074 - table->maxlen = sizeof(unsigned long);
95075 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95076 + hugetlb_table = *table;
95077 + hugetlb_table.data = &tmp;
95078 + hugetlb_table.maxlen = sizeof(unsigned long);
95079 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
95080 if (ret)
95081 goto out;
95082
95083 @@ -2792,6 +2796,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
95084 mutex_unlock(&mapping->i_mmap_mutex);
95085 }
95086
95087 +#ifdef CONFIG_PAX_SEGMEXEC
95088 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
95089 +{
95090 + struct mm_struct *mm = vma->vm_mm;
95091 + struct vm_area_struct *vma_m;
95092 + unsigned long address_m;
95093 + pte_t *ptep_m;
95094 +
95095 + vma_m = pax_find_mirror_vma(vma);
95096 + if (!vma_m)
95097 + return;
95098 +
95099 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95100 + address_m = address + SEGMEXEC_TASK_SIZE;
95101 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
95102 + get_page(page_m);
95103 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
95104 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
95105 +}
95106 +#endif
95107 +
95108 /*
95109 * Hugetlb_cow() should be called with page lock of the original hugepage held.
95110 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
95111 @@ -2903,6 +2928,11 @@ retry_avoidcopy:
95112 make_huge_pte(vma, new_page, 1));
95113 page_remove_rmap(old_page);
95114 hugepage_add_new_anon_rmap(new_page, vma, address);
95115 +
95116 +#ifdef CONFIG_PAX_SEGMEXEC
95117 + pax_mirror_huge_pte(vma, address, new_page);
95118 +#endif
95119 +
95120 /* Make the old page be freed below */
95121 new_page = old_page;
95122 }
95123 @@ -3063,6 +3093,10 @@ retry:
95124 && (vma->vm_flags & VM_SHARED)));
95125 set_huge_pte_at(mm, address, ptep, new_pte);
95126
95127 +#ifdef CONFIG_PAX_SEGMEXEC
95128 + pax_mirror_huge_pte(vma, address, page);
95129 +#endif
95130 +
95131 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
95132 /* Optimization, do the COW without a second fault */
95133 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
95134 @@ -3129,6 +3163,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95135 struct hstate *h = hstate_vma(vma);
95136 struct address_space *mapping;
95137
95138 +#ifdef CONFIG_PAX_SEGMEXEC
95139 + struct vm_area_struct *vma_m;
95140 +#endif
95141 +
95142 address &= huge_page_mask(h);
95143
95144 ptep = huge_pte_offset(mm, address);
95145 @@ -3142,6 +3180,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95146 VM_FAULT_SET_HINDEX(hstate_index(h));
95147 }
95148
95149 +#ifdef CONFIG_PAX_SEGMEXEC
95150 + vma_m = pax_find_mirror_vma(vma);
95151 + if (vma_m) {
95152 + unsigned long address_m;
95153 +
95154 + if (vma->vm_start > vma_m->vm_start) {
95155 + address_m = address;
95156 + address -= SEGMEXEC_TASK_SIZE;
95157 + vma = vma_m;
95158 + h = hstate_vma(vma);
95159 + } else
95160 + address_m = address + SEGMEXEC_TASK_SIZE;
95161 +
95162 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
95163 + return VM_FAULT_OOM;
95164 + address_m &= HPAGE_MASK;
95165 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
95166 + }
95167 +#endif
95168 +
95169 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
95170 if (!ptep)
95171 return VM_FAULT_OOM;
95172 diff --git a/mm/internal.h b/mm/internal.h
95173 index a4f90ba..fbdc32b 100644
95174 --- a/mm/internal.h
95175 +++ b/mm/internal.h
95176 @@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
95177
95178 extern int __isolate_free_page(struct page *page, unsigned int order);
95179 extern void __free_pages_bootmem(struct page *page, unsigned int order);
95180 +extern void free_compound_page(struct page *page);
95181 extern void prep_compound_page(struct page *page, unsigned long order);
95182 #ifdef CONFIG_MEMORY_FAILURE
95183 extern bool is_free_buddy_page(struct page *page);
95184 @@ -390,7 +391,7 @@ extern u32 hwpoison_filter_enable;
95185
95186 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
95187 unsigned long, unsigned long,
95188 - unsigned long, unsigned long);
95189 + unsigned long, unsigned long) __intentional_overflow(-1);
95190
95191 extern void set_pageblock_order(void);
95192 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
95193 diff --git a/mm/iov_iter.c b/mm/iov_iter.c
95194 index e34a3cb..a810efe 100644
95195 --- a/mm/iov_iter.c
95196 +++ b/mm/iov_iter.c
95197 @@ -307,7 +307,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
95198
95199 while (bytes) {
95200 char __user *buf = iov->iov_base + base;
95201 - int copy = min(bytes, iov->iov_len - base);
95202 + size_t copy = min(bytes, iov->iov_len - base);
95203
95204 base = 0;
95205 left = __copy_from_user_inatomic(vaddr, buf, copy);
95206 @@ -335,7 +335,7 @@ static size_t copy_from_user_atomic_iovec(struct page *page,
95207
95208 kaddr = kmap_atomic(page);
95209 if (likely(i->nr_segs == 1)) {
95210 - int left;
95211 + size_t left;
95212 char __user *buf = i->iov->iov_base + i->iov_offset;
95213 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
95214 copied = bytes - left;
95215 @@ -365,7 +365,7 @@ static void advance_iovec(struct iov_iter *i, size_t bytes)
95216 * zero-length segments (without overruning the iovec).
95217 */
95218 while (bytes || unlikely(i->count && !iov->iov_len)) {
95219 - int copy;
95220 + size_t copy;
95221
95222 copy = min(bytes, iov->iov_len - base);
95223 BUG_ON(!i->count || i->count < copy);
95224 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
95225 index 3cda50c..032ba634 100644
95226 --- a/mm/kmemleak.c
95227 +++ b/mm/kmemleak.c
95228 @@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
95229
95230 for (i = 0; i < object->trace_len; i++) {
95231 void *ptr = (void *)object->trace[i];
95232 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
95233 + seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
95234 }
95235 }
95236
95237 @@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
95238 return -ENOMEM;
95239 }
95240
95241 - dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
95242 + dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
95243 &kmemleak_fops);
95244 if (!dentry)
95245 pr_warning("Failed to create the debugfs kmemleak file\n");
95246 diff --git a/mm/maccess.c b/mm/maccess.c
95247 index d53adf9..03a24bf 100644
95248 --- a/mm/maccess.c
95249 +++ b/mm/maccess.c
95250 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
95251 set_fs(KERNEL_DS);
95252 pagefault_disable();
95253 ret = __copy_from_user_inatomic(dst,
95254 - (__force const void __user *)src, size);
95255 + (const void __force_user *)src, size);
95256 pagefault_enable();
95257 set_fs(old_fs);
95258
95259 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
95260
95261 set_fs(KERNEL_DS);
95262 pagefault_disable();
95263 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
95264 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
95265 pagefault_enable();
95266 set_fs(old_fs);
95267
95268 diff --git a/mm/madvise.c b/mm/madvise.c
95269 index 0938b30..199abe8 100644
95270 --- a/mm/madvise.c
95271 +++ b/mm/madvise.c
95272 @@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
95273 pgoff_t pgoff;
95274 unsigned long new_flags = vma->vm_flags;
95275
95276 +#ifdef CONFIG_PAX_SEGMEXEC
95277 + struct vm_area_struct *vma_m;
95278 +#endif
95279 +
95280 switch (behavior) {
95281 case MADV_NORMAL:
95282 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
95283 @@ -126,6 +130,13 @@ success:
95284 /*
95285 * vm_flags is protected by the mmap_sem held in write mode.
95286 */
95287 +
95288 +#ifdef CONFIG_PAX_SEGMEXEC
95289 + vma_m = pax_find_mirror_vma(vma);
95290 + if (vma_m)
95291 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
95292 +#endif
95293 +
95294 vma->vm_flags = new_flags;
95295
95296 out:
95297 @@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95298 struct vm_area_struct **prev,
95299 unsigned long start, unsigned long end)
95300 {
95301 +
95302 +#ifdef CONFIG_PAX_SEGMEXEC
95303 + struct vm_area_struct *vma_m;
95304 +#endif
95305 +
95306 *prev = vma;
95307 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
95308 return -EINVAL;
95309 @@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95310 zap_page_range(vma, start, end - start, &details);
95311 } else
95312 zap_page_range(vma, start, end - start, NULL);
95313 +
95314 +#ifdef CONFIG_PAX_SEGMEXEC
95315 + vma_m = pax_find_mirror_vma(vma);
95316 + if (vma_m) {
95317 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
95318 + struct zap_details details = {
95319 + .nonlinear_vma = vma_m,
95320 + .last_index = ULONG_MAX,
95321 + };
95322 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
95323 + } else
95324 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
95325 + }
95326 +#endif
95327 +
95328 return 0;
95329 }
95330
95331 @@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
95332 if (end < start)
95333 return error;
95334
95335 +#ifdef CONFIG_PAX_SEGMEXEC
95336 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95337 + if (end > SEGMEXEC_TASK_SIZE)
95338 + return error;
95339 + } else
95340 +#endif
95341 +
95342 + if (end > TASK_SIZE)
95343 + return error;
95344 +
95345 error = 0;
95346 if (end == start)
95347 return error;
95348 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
95349 index 8639f6b..b623882a 100644
95350 --- a/mm/memory-failure.c
95351 +++ b/mm/memory-failure.c
95352 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
95353
95354 int sysctl_memory_failure_recovery __read_mostly = 1;
95355
95356 -atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95357 +atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95358
95359 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
95360
95361 @@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
95362 pfn, t->comm, t->pid);
95363 si.si_signo = SIGBUS;
95364 si.si_errno = 0;
95365 - si.si_addr = (void *)addr;
95366 + si.si_addr = (void __user *)addr;
95367 #ifdef __ARCH_SI_TRAPNO
95368 si.si_trapno = trapno;
95369 #endif
95370 @@ -791,7 +791,7 @@ static struct page_state {
95371 unsigned long res;
95372 char *msg;
95373 int (*action)(struct page *p, unsigned long pfn);
95374 -} error_states[] = {
95375 +} __do_const error_states[] = {
95376 { reserved, reserved, "reserved kernel", me_kernel },
95377 /*
95378 * free pages are specially detected outside this table:
95379 @@ -1099,7 +1099,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95380 nr_pages = 1 << compound_order(hpage);
95381 else /* normal page or thp */
95382 nr_pages = 1;
95383 - atomic_long_add(nr_pages, &num_poisoned_pages);
95384 + atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
95385
95386 /*
95387 * We need/can do nothing about count=0 pages.
95388 @@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95389 if (PageHWPoison(hpage)) {
95390 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
95391 || (p != hpage && TestSetPageHWPoison(hpage))) {
95392 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95393 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95394 unlock_page(hpage);
95395 return 0;
95396 }
95397 @@ -1196,14 +1196,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95398 */
95399 if (!PageHWPoison(p)) {
95400 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
95401 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95402 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95403 put_page(hpage);
95404 res = 0;
95405 goto out;
95406 }
95407 if (hwpoison_filter(p)) {
95408 if (TestClearPageHWPoison(p))
95409 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95410 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95411 unlock_page(hpage);
95412 put_page(hpage);
95413 return 0;
95414 @@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
95415 return 0;
95416 }
95417 if (TestClearPageHWPoison(p))
95418 - atomic_long_dec(&num_poisoned_pages);
95419 + atomic_long_dec_unchecked(&num_poisoned_pages);
95420 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
95421 return 0;
95422 }
95423 @@ -1447,7 +1447,7 @@ int unpoison_memory(unsigned long pfn)
95424 */
95425 if (TestClearPageHWPoison(page)) {
95426 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
95427 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95428 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95429 freeit = 1;
95430 if (PageHuge(page))
95431 clear_page_hwpoison_huge_page(page);
95432 @@ -1572,11 +1572,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
95433 if (PageHuge(page)) {
95434 set_page_hwpoison_huge_page(hpage);
95435 dequeue_hwpoisoned_huge_page(hpage);
95436 - atomic_long_add(1 << compound_order(hpage),
95437 + atomic_long_add_unchecked(1 << compound_order(hpage),
95438 &num_poisoned_pages);
95439 } else {
95440 SetPageHWPoison(page);
95441 - atomic_long_inc(&num_poisoned_pages);
95442 + atomic_long_inc_unchecked(&num_poisoned_pages);
95443 }
95444 }
95445 return ret;
95446 @@ -1615,7 +1615,7 @@ static int __soft_offline_page(struct page *page, int flags)
95447 put_page(page);
95448 pr_info("soft_offline: %#lx: invalidated\n", pfn);
95449 SetPageHWPoison(page);
95450 - atomic_long_inc(&num_poisoned_pages);
95451 + atomic_long_inc_unchecked(&num_poisoned_pages);
95452 return 0;
95453 }
95454
95455 @@ -1666,7 +1666,7 @@ static int __soft_offline_page(struct page *page, int flags)
95456 if (!is_free_buddy_page(page))
95457 pr_info("soft offline: %#lx: page leaked\n",
95458 pfn);
95459 - atomic_long_inc(&num_poisoned_pages);
95460 + atomic_long_inc_unchecked(&num_poisoned_pages);
95461 }
95462 } else {
95463 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
95464 @@ -1736,11 +1736,11 @@ int soft_offline_page(struct page *page, int flags)
95465 if (PageHuge(page)) {
95466 set_page_hwpoison_huge_page(hpage);
95467 dequeue_hwpoisoned_huge_page(hpage);
95468 - atomic_long_add(1 << compound_order(hpage),
95469 + atomic_long_add_unchecked(1 << compound_order(hpage),
95470 &num_poisoned_pages);
95471 } else {
95472 SetPageHWPoison(page);
95473 - atomic_long_inc(&num_poisoned_pages);
95474 + atomic_long_inc_unchecked(&num_poisoned_pages);
95475 }
95476 }
95477 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
95478 diff --git a/mm/memory.c b/mm/memory.c
95479 index d5f2ae9..4d678b2 100644
95480 --- a/mm/memory.c
95481 +++ b/mm/memory.c
95482 @@ -415,6 +415,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95483 free_pte_range(tlb, pmd, addr);
95484 } while (pmd++, addr = next, addr != end);
95485
95486 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
95487 start &= PUD_MASK;
95488 if (start < floor)
95489 return;
95490 @@ -429,6 +430,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95491 pmd = pmd_offset(pud, start);
95492 pud_clear(pud);
95493 pmd_free_tlb(tlb, pmd, start);
95494 +#endif
95495 +
95496 }
95497
95498 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95499 @@ -448,6 +451,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95500 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
95501 } while (pud++, addr = next, addr != end);
95502
95503 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
95504 start &= PGDIR_MASK;
95505 if (start < floor)
95506 return;
95507 @@ -462,6 +466,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95508 pud = pud_offset(pgd, start);
95509 pgd_clear(pgd);
95510 pud_free_tlb(tlb, pud, start);
95511 +#endif
95512 +
95513 }
95514
95515 /*
95516 @@ -691,10 +697,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
95517 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
95518 */
95519 if (vma->vm_ops)
95520 - printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
95521 + printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
95522 vma->vm_ops->fault);
95523 if (vma->vm_file)
95524 - printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
95525 + printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
95526 vma->vm_file->f_op->mmap);
95527 dump_stack();
95528 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
95529 @@ -1501,6 +1507,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
95530 page_add_file_rmap(page);
95531 set_pte_at(mm, addr, pte, mk_pte(page, prot));
95532
95533 +#ifdef CONFIG_PAX_SEGMEXEC
95534 + pax_mirror_file_pte(vma, addr, page, ptl);
95535 +#endif
95536 +
95537 retval = 0;
95538 pte_unmap_unlock(pte, ptl);
95539 return retval;
95540 @@ -1545,9 +1555,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
95541 if (!page_count(page))
95542 return -EINVAL;
95543 if (!(vma->vm_flags & VM_MIXEDMAP)) {
95544 +
95545 +#ifdef CONFIG_PAX_SEGMEXEC
95546 + struct vm_area_struct *vma_m;
95547 +#endif
95548 +
95549 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
95550 BUG_ON(vma->vm_flags & VM_PFNMAP);
95551 vma->vm_flags |= VM_MIXEDMAP;
95552 +
95553 +#ifdef CONFIG_PAX_SEGMEXEC
95554 + vma_m = pax_find_mirror_vma(vma);
95555 + if (vma_m)
95556 + vma_m->vm_flags |= VM_MIXEDMAP;
95557 +#endif
95558 +
95559 }
95560 return insert_page(vma, addr, page, vma->vm_page_prot);
95561 }
95562 @@ -1630,6 +1652,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
95563 unsigned long pfn)
95564 {
95565 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
95566 + BUG_ON(vma->vm_mirror);
95567
95568 if (addr < vma->vm_start || addr >= vma->vm_end)
95569 return -EFAULT;
95570 @@ -1877,7 +1900,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
95571
95572 BUG_ON(pud_huge(*pud));
95573
95574 - pmd = pmd_alloc(mm, pud, addr);
95575 + pmd = (mm == &init_mm) ?
95576 + pmd_alloc_kernel(mm, pud, addr) :
95577 + pmd_alloc(mm, pud, addr);
95578 if (!pmd)
95579 return -ENOMEM;
95580 do {
95581 @@ -1897,7 +1922,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
95582 unsigned long next;
95583 int err;
95584
95585 - pud = pud_alloc(mm, pgd, addr);
95586 + pud = (mm == &init_mm) ?
95587 + pud_alloc_kernel(mm, pgd, addr) :
95588 + pud_alloc(mm, pgd, addr);
95589 if (!pud)
95590 return -ENOMEM;
95591 do {
95592 @@ -2019,6 +2046,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
95593 return ret;
95594 }
95595
95596 +#ifdef CONFIG_PAX_SEGMEXEC
95597 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
95598 +{
95599 + struct mm_struct *mm = vma->vm_mm;
95600 + spinlock_t *ptl;
95601 + pte_t *pte, entry;
95602 +
95603 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
95604 + entry = *pte;
95605 + if (!pte_present(entry)) {
95606 + if (!pte_none(entry)) {
95607 + BUG_ON(pte_file(entry));
95608 + free_swap_and_cache(pte_to_swp_entry(entry));
95609 + pte_clear_not_present_full(mm, address, pte, 0);
95610 + }
95611 + } else {
95612 + struct page *page;
95613 +
95614 + flush_cache_page(vma, address, pte_pfn(entry));
95615 + entry = ptep_clear_flush(vma, address, pte);
95616 + BUG_ON(pte_dirty(entry));
95617 + page = vm_normal_page(vma, address, entry);
95618 + if (page) {
95619 + update_hiwater_rss(mm);
95620 + if (PageAnon(page))
95621 + dec_mm_counter_fast(mm, MM_ANONPAGES);
95622 + else
95623 + dec_mm_counter_fast(mm, MM_FILEPAGES);
95624 + page_remove_rmap(page);
95625 + page_cache_release(page);
95626 + }
95627 + }
95628 + pte_unmap_unlock(pte, ptl);
95629 +}
95630 +
95631 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
95632 + *
95633 + * the ptl of the lower mapped page is held on entry and is not released on exit
95634 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
95635 + */
95636 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95637 +{
95638 + struct mm_struct *mm = vma->vm_mm;
95639 + unsigned long address_m;
95640 + spinlock_t *ptl_m;
95641 + struct vm_area_struct *vma_m;
95642 + pmd_t *pmd_m;
95643 + pte_t *pte_m, entry_m;
95644 +
95645 + BUG_ON(!page_m || !PageAnon(page_m));
95646 +
95647 + vma_m = pax_find_mirror_vma(vma);
95648 + if (!vma_m)
95649 + return;
95650 +
95651 + BUG_ON(!PageLocked(page_m));
95652 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95653 + address_m = address + SEGMEXEC_TASK_SIZE;
95654 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95655 + pte_m = pte_offset_map(pmd_m, address_m);
95656 + ptl_m = pte_lockptr(mm, pmd_m);
95657 + if (ptl != ptl_m) {
95658 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95659 + if (!pte_none(*pte_m))
95660 + goto out;
95661 + }
95662 +
95663 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95664 + page_cache_get(page_m);
95665 + page_add_anon_rmap(page_m, vma_m, address_m);
95666 + inc_mm_counter_fast(mm, MM_ANONPAGES);
95667 + set_pte_at(mm, address_m, pte_m, entry_m);
95668 + update_mmu_cache(vma_m, address_m, pte_m);
95669 +out:
95670 + if (ptl != ptl_m)
95671 + spin_unlock(ptl_m);
95672 + pte_unmap(pte_m);
95673 + unlock_page(page_m);
95674 +}
95675 +
95676 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95677 +{
95678 + struct mm_struct *mm = vma->vm_mm;
95679 + unsigned long address_m;
95680 + spinlock_t *ptl_m;
95681 + struct vm_area_struct *vma_m;
95682 + pmd_t *pmd_m;
95683 + pte_t *pte_m, entry_m;
95684 +
95685 + BUG_ON(!page_m || PageAnon(page_m));
95686 +
95687 + vma_m = pax_find_mirror_vma(vma);
95688 + if (!vma_m)
95689 + return;
95690 +
95691 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95692 + address_m = address + SEGMEXEC_TASK_SIZE;
95693 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95694 + pte_m = pte_offset_map(pmd_m, address_m);
95695 + ptl_m = pte_lockptr(mm, pmd_m);
95696 + if (ptl != ptl_m) {
95697 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95698 + if (!pte_none(*pte_m))
95699 + goto out;
95700 + }
95701 +
95702 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95703 + page_cache_get(page_m);
95704 + page_add_file_rmap(page_m);
95705 + inc_mm_counter_fast(mm, MM_FILEPAGES);
95706 + set_pte_at(mm, address_m, pte_m, entry_m);
95707 + update_mmu_cache(vma_m, address_m, pte_m);
95708 +out:
95709 + if (ptl != ptl_m)
95710 + spin_unlock(ptl_m);
95711 + pte_unmap(pte_m);
95712 +}
95713 +
95714 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
95715 +{
95716 + struct mm_struct *mm = vma->vm_mm;
95717 + unsigned long address_m;
95718 + spinlock_t *ptl_m;
95719 + struct vm_area_struct *vma_m;
95720 + pmd_t *pmd_m;
95721 + pte_t *pte_m, entry_m;
95722 +
95723 + vma_m = pax_find_mirror_vma(vma);
95724 + if (!vma_m)
95725 + return;
95726 +
95727 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95728 + address_m = address + SEGMEXEC_TASK_SIZE;
95729 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95730 + pte_m = pte_offset_map(pmd_m, address_m);
95731 + ptl_m = pte_lockptr(mm, pmd_m);
95732 + if (ptl != ptl_m) {
95733 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95734 + if (!pte_none(*pte_m))
95735 + goto out;
95736 + }
95737 +
95738 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
95739 + set_pte_at(mm, address_m, pte_m, entry_m);
95740 +out:
95741 + if (ptl != ptl_m)
95742 + spin_unlock(ptl_m);
95743 + pte_unmap(pte_m);
95744 +}
95745 +
95746 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
95747 +{
95748 + struct page *page_m;
95749 + pte_t entry;
95750 +
95751 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
95752 + goto out;
95753 +
95754 + entry = *pte;
95755 + page_m = vm_normal_page(vma, address, entry);
95756 + if (!page_m)
95757 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
95758 + else if (PageAnon(page_m)) {
95759 + if (pax_find_mirror_vma(vma)) {
95760 + pte_unmap_unlock(pte, ptl);
95761 + lock_page(page_m);
95762 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
95763 + if (pte_same(entry, *pte))
95764 + pax_mirror_anon_pte(vma, address, page_m, ptl);
95765 + else
95766 + unlock_page(page_m);
95767 + }
95768 + } else
95769 + pax_mirror_file_pte(vma, address, page_m, ptl);
95770 +
95771 +out:
95772 + pte_unmap_unlock(pte, ptl);
95773 +}
95774 +#endif
95775 +
95776 /*
95777 * This routine handles present pages, when users try to write
95778 * to a shared page. It is done by copying the page to a new address
95779 @@ -2218,6 +2425,12 @@ gotten:
95780 */
95781 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95782 if (likely(pte_same(*page_table, orig_pte))) {
95783 +
95784 +#ifdef CONFIG_PAX_SEGMEXEC
95785 + if (pax_find_mirror_vma(vma))
95786 + BUG_ON(!trylock_page(new_page));
95787 +#endif
95788 +
95789 if (old_page) {
95790 if (!PageAnon(old_page)) {
95791 dec_mm_counter_fast(mm, MM_FILEPAGES);
95792 @@ -2271,6 +2484,10 @@ gotten:
95793 page_remove_rmap(old_page);
95794 }
95795
95796 +#ifdef CONFIG_PAX_SEGMEXEC
95797 + pax_mirror_anon_pte(vma, address, new_page, ptl);
95798 +#endif
95799 +
95800 /* Free the old page.. */
95801 new_page = old_page;
95802 ret |= VM_FAULT_WRITE;
95803 @@ -2545,6 +2762,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95804 swap_free(entry);
95805 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
95806 try_to_free_swap(page);
95807 +
95808 +#ifdef CONFIG_PAX_SEGMEXEC
95809 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
95810 +#endif
95811 +
95812 unlock_page(page);
95813 if (page != swapcache) {
95814 /*
95815 @@ -2568,6 +2790,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95816
95817 /* No need to invalidate - it was non-present before */
95818 update_mmu_cache(vma, address, page_table);
95819 +
95820 +#ifdef CONFIG_PAX_SEGMEXEC
95821 + pax_mirror_anon_pte(vma, address, page, ptl);
95822 +#endif
95823 +
95824 unlock:
95825 pte_unmap_unlock(page_table, ptl);
95826 out:
95827 @@ -2587,40 +2814,6 @@ out_release:
95828 }
95829
95830 /*
95831 - * This is like a special single-page "expand_{down|up}wards()",
95832 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
95833 - * doesn't hit another vma.
95834 - */
95835 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
95836 -{
95837 - address &= PAGE_MASK;
95838 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
95839 - struct vm_area_struct *prev = vma->vm_prev;
95840 -
95841 - /*
95842 - * Is there a mapping abutting this one below?
95843 - *
95844 - * That's only ok if it's the same stack mapping
95845 - * that has gotten split..
95846 - */
95847 - if (prev && prev->vm_end == address)
95848 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
95849 -
95850 - expand_downwards(vma, address - PAGE_SIZE);
95851 - }
95852 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
95853 - struct vm_area_struct *next = vma->vm_next;
95854 -
95855 - /* As VM_GROWSDOWN but s/below/above/ */
95856 - if (next && next->vm_start == address + PAGE_SIZE)
95857 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
95858 -
95859 - expand_upwards(vma, address + PAGE_SIZE);
95860 - }
95861 - return 0;
95862 -}
95863 -
95864 -/*
95865 * We enter with non-exclusive mmap_sem (to exclude vma changes,
95866 * but allow concurrent faults), and pte mapped but not yet locked.
95867 * We return with mmap_sem still held, but pte unmapped and unlocked.
95868 @@ -2630,27 +2823,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95869 unsigned int flags)
95870 {
95871 struct mem_cgroup *memcg;
95872 - struct page *page;
95873 + struct page *page = NULL;
95874 spinlock_t *ptl;
95875 pte_t entry;
95876
95877 - pte_unmap(page_table);
95878 -
95879 - /* Check if we need to add a guard page to the stack */
95880 - if (check_stack_guard_page(vma, address) < 0)
95881 - return VM_FAULT_SIGBUS;
95882 -
95883 - /* Use the zero-page for reads */
95884 if (!(flags & FAULT_FLAG_WRITE)) {
95885 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
95886 vma->vm_page_prot));
95887 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95888 + ptl = pte_lockptr(mm, pmd);
95889 + spin_lock(ptl);
95890 if (!pte_none(*page_table))
95891 goto unlock;
95892 goto setpte;
95893 }
95894
95895 /* Allocate our own private page. */
95896 + pte_unmap(page_table);
95897 +
95898 if (unlikely(anon_vma_prepare(vma)))
95899 goto oom;
95900 page = alloc_zeroed_user_highpage_movable(vma, address);
95901 @@ -2674,6 +2863,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95902 if (!pte_none(*page_table))
95903 goto release;
95904
95905 +#ifdef CONFIG_PAX_SEGMEXEC
95906 + if (pax_find_mirror_vma(vma))
95907 + BUG_ON(!trylock_page(page));
95908 +#endif
95909 +
95910 inc_mm_counter_fast(mm, MM_ANONPAGES);
95911 page_add_new_anon_rmap(page, vma, address);
95912 mem_cgroup_commit_charge(page, memcg, false);
95913 @@ -2683,6 +2877,12 @@ setpte:
95914
95915 /* No need to invalidate - it was non-present before */
95916 update_mmu_cache(vma, address, page_table);
95917 +
95918 +#ifdef CONFIG_PAX_SEGMEXEC
95919 + if (page)
95920 + pax_mirror_anon_pte(vma, address, page, ptl);
95921 +#endif
95922 +
95923 unlock:
95924 pte_unmap_unlock(page_table, ptl);
95925 return 0;
95926 @@ -2913,6 +3113,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95927 return ret;
95928 }
95929 do_set_pte(vma, address, fault_page, pte, false, false);
95930 +
95931 +#ifdef CONFIG_PAX_SEGMEXEC
95932 + pax_mirror_file_pte(vma, address, fault_page, ptl);
95933 +#endif
95934 +
95935 unlock_page(fault_page);
95936 unlock_out:
95937 pte_unmap_unlock(pte, ptl);
95938 @@ -2955,7 +3160,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95939 page_cache_release(fault_page);
95940 goto uncharge_out;
95941 }
95942 +
95943 +#ifdef CONFIG_PAX_SEGMEXEC
95944 + if (pax_find_mirror_vma(vma))
95945 + BUG_ON(!trylock_page(new_page));
95946 +#endif
95947 +
95948 do_set_pte(vma, address, new_page, pte, true, true);
95949 +
95950 +#ifdef CONFIG_PAX_SEGMEXEC
95951 + pax_mirror_anon_pte(vma, address, new_page, ptl);
95952 +#endif
95953 +
95954 mem_cgroup_commit_charge(new_page, memcg, false);
95955 lru_cache_add_active_or_unevictable(new_page, vma);
95956 pte_unmap_unlock(pte, ptl);
95957 @@ -3005,6 +3221,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95958 return ret;
95959 }
95960 do_set_pte(vma, address, fault_page, pte, true, false);
95961 +
95962 +#ifdef CONFIG_PAX_SEGMEXEC
95963 + pax_mirror_file_pte(vma, address, fault_page, ptl);
95964 +#endif
95965 +
95966 pte_unmap_unlock(pte, ptl);
95967
95968 if (set_page_dirty(fault_page))
95969 @@ -3246,6 +3467,12 @@ static int handle_pte_fault(struct mm_struct *mm,
95970 if (flags & FAULT_FLAG_WRITE)
95971 flush_tlb_fix_spurious_fault(vma, address);
95972 }
95973 +
95974 +#ifdef CONFIG_PAX_SEGMEXEC
95975 + pax_mirror_pte(vma, address, pte, pmd, ptl);
95976 + return 0;
95977 +#endif
95978 +
95979 unlock:
95980 pte_unmap_unlock(pte, ptl);
95981 return 0;
95982 @@ -3265,9 +3492,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95983 pmd_t *pmd;
95984 pte_t *pte;
95985
95986 +#ifdef CONFIG_PAX_SEGMEXEC
95987 + struct vm_area_struct *vma_m;
95988 +#endif
95989 +
95990 if (unlikely(is_vm_hugetlb_page(vma)))
95991 return hugetlb_fault(mm, vma, address, flags);
95992
95993 +#ifdef CONFIG_PAX_SEGMEXEC
95994 + vma_m = pax_find_mirror_vma(vma);
95995 + if (vma_m) {
95996 + unsigned long address_m;
95997 + pgd_t *pgd_m;
95998 + pud_t *pud_m;
95999 + pmd_t *pmd_m;
96000 +
96001 + if (vma->vm_start > vma_m->vm_start) {
96002 + address_m = address;
96003 + address -= SEGMEXEC_TASK_SIZE;
96004 + vma = vma_m;
96005 + } else
96006 + address_m = address + SEGMEXEC_TASK_SIZE;
96007 +
96008 + pgd_m = pgd_offset(mm, address_m);
96009 + pud_m = pud_alloc(mm, pgd_m, address_m);
96010 + if (!pud_m)
96011 + return VM_FAULT_OOM;
96012 + pmd_m = pmd_alloc(mm, pud_m, address_m);
96013 + if (!pmd_m)
96014 + return VM_FAULT_OOM;
96015 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
96016 + return VM_FAULT_OOM;
96017 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
96018 + }
96019 +#endif
96020 +
96021 pgd = pgd_offset(mm, address);
96022 pud = pud_alloc(mm, pgd, address);
96023 if (!pud)
96024 @@ -3401,6 +3660,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96025 spin_unlock(&mm->page_table_lock);
96026 return 0;
96027 }
96028 +
96029 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96030 +{
96031 + pud_t *new = pud_alloc_one(mm, address);
96032 + if (!new)
96033 + return -ENOMEM;
96034 +
96035 + smp_wmb(); /* See comment in __pte_alloc */
96036 +
96037 + spin_lock(&mm->page_table_lock);
96038 + if (pgd_present(*pgd)) /* Another has populated it */
96039 + pud_free(mm, new);
96040 + else
96041 + pgd_populate_kernel(mm, pgd, new);
96042 + spin_unlock(&mm->page_table_lock);
96043 + return 0;
96044 +}
96045 #endif /* __PAGETABLE_PUD_FOLDED */
96046
96047 #ifndef __PAGETABLE_PMD_FOLDED
96048 @@ -3431,6 +3707,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
96049 spin_unlock(&mm->page_table_lock);
96050 return 0;
96051 }
96052 +
96053 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
96054 +{
96055 + pmd_t *new = pmd_alloc_one(mm, address);
96056 + if (!new)
96057 + return -ENOMEM;
96058 +
96059 + smp_wmb(); /* See comment in __pte_alloc */
96060 +
96061 + spin_lock(&mm->page_table_lock);
96062 +#ifndef __ARCH_HAS_4LEVEL_HACK
96063 + if (pud_present(*pud)) /* Another has populated it */
96064 + pmd_free(mm, new);
96065 + else
96066 + pud_populate_kernel(mm, pud, new);
96067 +#else
96068 + if (pgd_present(*pud)) /* Another has populated it */
96069 + pmd_free(mm, new);
96070 + else
96071 + pgd_populate_kernel(mm, pud, new);
96072 +#endif /* __ARCH_HAS_4LEVEL_HACK */
96073 + spin_unlock(&mm->page_table_lock);
96074 + return 0;
96075 +}
96076 #endif /* __PAGETABLE_PMD_FOLDED */
96077
96078 static int __follow_pte(struct mm_struct *mm, unsigned long address,
96079 @@ -3540,8 +3840,8 @@ out:
96080 return ret;
96081 }
96082
96083 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96084 - void *buf, int len, int write)
96085 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96086 + void *buf, size_t len, int write)
96087 {
96088 resource_size_t phys_addr;
96089 unsigned long prot = 0;
96090 @@ -3567,8 +3867,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
96091 * Access another process' address space as given in mm. If non-NULL, use the
96092 * given task for page fault accounting.
96093 */
96094 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96095 - unsigned long addr, void *buf, int len, int write)
96096 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96097 + unsigned long addr, void *buf, size_t len, int write)
96098 {
96099 struct vm_area_struct *vma;
96100 void *old_buf = buf;
96101 @@ -3576,7 +3876,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96102 down_read(&mm->mmap_sem);
96103 /* ignore errors, just check how much was successfully transferred */
96104 while (len) {
96105 - int bytes, ret, offset;
96106 + ssize_t bytes, ret, offset;
96107 void *maddr;
96108 struct page *page = NULL;
96109
96110 @@ -3637,8 +3937,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96111 *
96112 * The caller must hold a reference on @mm.
96113 */
96114 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96115 - void *buf, int len, int write)
96116 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
96117 + void *buf, size_t len, int write)
96118 {
96119 return __access_remote_vm(NULL, mm, addr, buf, len, write);
96120 }
96121 @@ -3648,11 +3948,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96122 * Source/target buffer must be kernel space,
96123 * Do not walk the page table directly, use get_user_pages
96124 */
96125 -int access_process_vm(struct task_struct *tsk, unsigned long addr,
96126 - void *buf, int len, int write)
96127 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
96128 + void *buf, size_t len, int write)
96129 {
96130 struct mm_struct *mm;
96131 - int ret;
96132 + ssize_t ret;
96133
96134 mm = get_task_mm(tsk);
96135 if (!mm)
96136 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
96137 index e58725a..e0be017 100644
96138 --- a/mm/mempolicy.c
96139 +++ b/mm/mempolicy.c
96140 @@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96141 unsigned long vmstart;
96142 unsigned long vmend;
96143
96144 +#ifdef CONFIG_PAX_SEGMEXEC
96145 + struct vm_area_struct *vma_m;
96146 +#endif
96147 +
96148 vma = find_vma(mm, start);
96149 if (!vma || vma->vm_start > start)
96150 return -EFAULT;
96151 @@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96152 err = vma_replace_policy(vma, new_pol);
96153 if (err)
96154 goto out;
96155 +
96156 +#ifdef CONFIG_PAX_SEGMEXEC
96157 + vma_m = pax_find_mirror_vma(vma);
96158 + if (vma_m) {
96159 + err = vma_replace_policy(vma_m, new_pol);
96160 + if (err)
96161 + goto out;
96162 + }
96163 +#endif
96164 +
96165 }
96166
96167 out:
96168 @@ -1212,6 +1226,17 @@ static long do_mbind(unsigned long start, unsigned long len,
96169
96170 if (end < start)
96171 return -EINVAL;
96172 +
96173 +#ifdef CONFIG_PAX_SEGMEXEC
96174 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
96175 + if (end > SEGMEXEC_TASK_SIZE)
96176 + return -EINVAL;
96177 + } else
96178 +#endif
96179 +
96180 + if (end > TASK_SIZE)
96181 + return -EINVAL;
96182 +
96183 if (end == start)
96184 return 0;
96185
96186 @@ -1437,8 +1462,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96187 */
96188 tcred = __task_cred(task);
96189 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96190 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96191 - !capable(CAP_SYS_NICE)) {
96192 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96193 rcu_read_unlock();
96194 err = -EPERM;
96195 goto out_put;
96196 @@ -1469,6 +1493,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96197 goto out;
96198 }
96199
96200 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96201 + if (mm != current->mm &&
96202 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
96203 + mmput(mm);
96204 + err = -EPERM;
96205 + goto out;
96206 + }
96207 +#endif
96208 +
96209 err = do_migrate_pages(mm, old, new,
96210 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
96211
96212 diff --git a/mm/migrate.c b/mm/migrate.c
96213 index 0143995..b294728 100644
96214 --- a/mm/migrate.c
96215 +++ b/mm/migrate.c
96216 @@ -1495,8 +1495,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
96217 */
96218 tcred = __task_cred(task);
96219 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96220 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96221 - !capable(CAP_SYS_NICE)) {
96222 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96223 rcu_read_unlock();
96224 err = -EPERM;
96225 goto out;
96226 diff --git a/mm/mlock.c b/mm/mlock.c
96227 index 73cf098..ab547c7 100644
96228 --- a/mm/mlock.c
96229 +++ b/mm/mlock.c
96230 @@ -14,6 +14,7 @@
96231 #include <linux/pagevec.h>
96232 #include <linux/mempolicy.h>
96233 #include <linux/syscalls.h>
96234 +#include <linux/security.h>
96235 #include <linux/sched.h>
96236 #include <linux/export.h>
96237 #include <linux/rmap.h>
96238 @@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
96239 {
96240 unsigned long nstart, end, tmp;
96241 struct vm_area_struct * vma, * prev;
96242 - int error;
96243 + int error = 0;
96244
96245 VM_BUG_ON(start & ~PAGE_MASK);
96246 VM_BUG_ON(len != PAGE_ALIGN(len));
96247 @@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
96248 return -EINVAL;
96249 if (end == start)
96250 return 0;
96251 + if (end > TASK_SIZE)
96252 + return -EINVAL;
96253 +
96254 vma = find_vma(current->mm, start);
96255 if (!vma || vma->vm_start > start)
96256 return -ENOMEM;
96257 @@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
96258 for (nstart = start ; ; ) {
96259 vm_flags_t newflags;
96260
96261 +#ifdef CONFIG_PAX_SEGMEXEC
96262 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96263 + break;
96264 +#endif
96265 +
96266 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
96267
96268 newflags = vma->vm_flags & ~VM_LOCKED;
96269 @@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
96270 locked += current->mm->locked_vm;
96271
96272 /* check against resource limits */
96273 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
96274 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
96275 error = do_mlock(start, len, 1);
96276
96277 @@ -783,6 +793,11 @@ static int do_mlockall(int flags)
96278 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
96279 vm_flags_t newflags;
96280
96281 +#ifdef CONFIG_PAX_SEGMEXEC
96282 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96283 + break;
96284 +#endif
96285 +
96286 newflags = vma->vm_flags & ~VM_LOCKED;
96287 if (flags & MCL_CURRENT)
96288 newflags |= VM_LOCKED;
96289 @@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
96290 lock_limit >>= PAGE_SHIFT;
96291
96292 ret = -ENOMEM;
96293 +
96294 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
96295 +
96296 down_write(&current->mm->mmap_sem);
96297 -
96298 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
96299 capable(CAP_IPC_LOCK))
96300 ret = do_mlockall(flags);
96301 diff --git a/mm/mmap.c b/mm/mmap.c
96302 index ae91989..d8308c7 100644
96303 --- a/mm/mmap.c
96304 +++ b/mm/mmap.c
96305 @@ -41,6 +41,7 @@
96306 #include <linux/notifier.h>
96307 #include <linux/memory.h>
96308 #include <linux/printk.h>
96309 +#include <linux/random.h>
96310
96311 #include <asm/uaccess.h>
96312 #include <asm/cacheflush.h>
96313 @@ -57,6 +58,16 @@
96314 #define arch_rebalance_pgtables(addr, len) (addr)
96315 #endif
96316
96317 +static inline void verify_mm_writelocked(struct mm_struct *mm)
96318 +{
96319 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
96320 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
96321 + up_read(&mm->mmap_sem);
96322 + BUG();
96323 + }
96324 +#endif
96325 +}
96326 +
96327 static void unmap_region(struct mm_struct *mm,
96328 struct vm_area_struct *vma, struct vm_area_struct *prev,
96329 unsigned long start, unsigned long end);
96330 @@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
96331 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
96332 *
96333 */
96334 -pgprot_t protection_map[16] = {
96335 +pgprot_t protection_map[16] __read_only = {
96336 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
96337 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
96338 };
96339
96340 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
96341 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
96342 {
96343 - return __pgprot(pgprot_val(protection_map[vm_flags &
96344 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
96345 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
96346 pgprot_val(arch_vm_get_page_prot(vm_flags)));
96347 +
96348 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96349 + if (!(__supported_pte_mask & _PAGE_NX) &&
96350 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
96351 + (vm_flags & (VM_READ | VM_WRITE)))
96352 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
96353 +#endif
96354 +
96355 + return prot;
96356 }
96357 EXPORT_SYMBOL(vm_get_page_prot);
96358
96359 @@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
96360 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
96361 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
96362 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
96363 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
96364 /*
96365 * Make sure vm_committed_as in one cacheline and not cacheline shared with
96366 * other variables. It can be updated by several CPUs frequently.
96367 @@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
96368 struct vm_area_struct *next = vma->vm_next;
96369
96370 might_sleep();
96371 + BUG_ON(vma->vm_mirror);
96372 if (vma->vm_ops && vma->vm_ops->close)
96373 vma->vm_ops->close(vma);
96374 if (vma->vm_file)
96375 @@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
96376
96377 SYSCALL_DEFINE1(brk, unsigned long, brk)
96378 {
96379 + unsigned long rlim;
96380 unsigned long retval;
96381 unsigned long newbrk, oldbrk;
96382 struct mm_struct *mm = current->mm;
96383 @@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
96384 * segment grow beyond its set limit the in case where the limit is
96385 * not page aligned -Ram Gupta
96386 */
96387 - if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
96388 + rlim = rlimit(RLIMIT_DATA);
96389 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96390 + /* force a minimum 16MB brk heap on setuid/setgid binaries */
96391 + if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
96392 + rlim = 4096 * PAGE_SIZE;
96393 +#endif
96394 + if (check_data_rlimit(rlim, brk, mm->start_brk,
96395 mm->end_data, mm->start_data))
96396 goto out;
96397
96398 @@ -976,6 +1005,12 @@ static int
96399 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
96400 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96401 {
96402 +
96403 +#ifdef CONFIG_PAX_SEGMEXEC
96404 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
96405 + return 0;
96406 +#endif
96407 +
96408 if (is_mergeable_vma(vma, file, vm_flags) &&
96409 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96410 if (vma->vm_pgoff == vm_pgoff)
96411 @@ -995,6 +1030,12 @@ static int
96412 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
96413 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96414 {
96415 +
96416 +#ifdef CONFIG_PAX_SEGMEXEC
96417 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
96418 + return 0;
96419 +#endif
96420 +
96421 if (is_mergeable_vma(vma, file, vm_flags) &&
96422 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96423 pgoff_t vm_pglen;
96424 @@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96425 struct vm_area_struct *area, *next;
96426 int err;
96427
96428 +#ifdef CONFIG_PAX_SEGMEXEC
96429 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
96430 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
96431 +
96432 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
96433 +#endif
96434 +
96435 /*
96436 * We later require that vma->vm_flags == vm_flags,
96437 * so this tests vma->vm_flags & VM_SPECIAL, too.
96438 @@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96439 if (next && next->vm_end == end) /* cases 6, 7, 8 */
96440 next = next->vm_next;
96441
96442 +#ifdef CONFIG_PAX_SEGMEXEC
96443 + if (prev)
96444 + prev_m = pax_find_mirror_vma(prev);
96445 + if (area)
96446 + area_m = pax_find_mirror_vma(area);
96447 + if (next)
96448 + next_m = pax_find_mirror_vma(next);
96449 +#endif
96450 +
96451 /*
96452 * Can it merge with the predecessor?
96453 */
96454 @@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96455 /* cases 1, 6 */
96456 err = vma_adjust(prev, prev->vm_start,
96457 next->vm_end, prev->vm_pgoff, NULL);
96458 - } else /* cases 2, 5, 7 */
96459 +
96460 +#ifdef CONFIG_PAX_SEGMEXEC
96461 + if (!err && prev_m)
96462 + err = vma_adjust(prev_m, prev_m->vm_start,
96463 + next_m->vm_end, prev_m->vm_pgoff, NULL);
96464 +#endif
96465 +
96466 + } else { /* cases 2, 5, 7 */
96467 err = vma_adjust(prev, prev->vm_start,
96468 end, prev->vm_pgoff, NULL);
96469 +
96470 +#ifdef CONFIG_PAX_SEGMEXEC
96471 + if (!err && prev_m)
96472 + err = vma_adjust(prev_m, prev_m->vm_start,
96473 + end_m, prev_m->vm_pgoff, NULL);
96474 +#endif
96475 +
96476 + }
96477 if (err)
96478 return NULL;
96479 khugepaged_enter_vma_merge(prev, vm_flags);
96480 @@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96481 mpol_equal(policy, vma_policy(next)) &&
96482 can_vma_merge_before(next, vm_flags,
96483 anon_vma, file, pgoff+pglen)) {
96484 - if (prev && addr < prev->vm_end) /* case 4 */
96485 + if (prev && addr < prev->vm_end) { /* case 4 */
96486 err = vma_adjust(prev, prev->vm_start,
96487 addr, prev->vm_pgoff, NULL);
96488 - else /* cases 3, 8 */
96489 +
96490 +#ifdef CONFIG_PAX_SEGMEXEC
96491 + if (!err && prev_m)
96492 + err = vma_adjust(prev_m, prev_m->vm_start,
96493 + addr_m, prev_m->vm_pgoff, NULL);
96494 +#endif
96495 +
96496 + } else { /* cases 3, 8 */
96497 err = vma_adjust(area, addr, next->vm_end,
96498 next->vm_pgoff - pglen, NULL);
96499 +
96500 +#ifdef CONFIG_PAX_SEGMEXEC
96501 + if (!err && area_m)
96502 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
96503 + next_m->vm_pgoff - pglen, NULL);
96504 +#endif
96505 +
96506 + }
96507 if (err)
96508 return NULL;
96509 khugepaged_enter_vma_merge(area, vm_flags);
96510 @@ -1208,8 +1295,10 @@ none:
96511 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96512 struct file *file, long pages)
96513 {
96514 - const unsigned long stack_flags
96515 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
96516 +
96517 +#ifdef CONFIG_PAX_RANDMMAP
96518 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96519 +#endif
96520
96521 mm->total_vm += pages;
96522
96523 @@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96524 mm->shared_vm += pages;
96525 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
96526 mm->exec_vm += pages;
96527 - } else if (flags & stack_flags)
96528 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
96529 mm->stack_vm += pages;
96530 }
96531 #endif /* CONFIG_PROC_FS */
96532 @@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
96533 locked += mm->locked_vm;
96534 lock_limit = rlimit(RLIMIT_MEMLOCK);
96535 lock_limit >>= PAGE_SHIFT;
96536 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96537 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
96538 return -EAGAIN;
96539 }
96540 @@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96541 * (the exception is when the underlying filesystem is noexec
96542 * mounted, in which case we dont add PROT_EXEC.)
96543 */
96544 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
96545 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
96546 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
96547 prot |= PROT_EXEC;
96548
96549 @@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96550 /* Obtain the address to map to. we verify (or select) it and ensure
96551 * that it represents a valid section of the address space.
96552 */
96553 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
96554 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
96555 if (addr & ~PAGE_MASK)
96556 return addr;
96557
96558 @@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96559 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
96560 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
96561
96562 +#ifdef CONFIG_PAX_MPROTECT
96563 + if (mm->pax_flags & MF_PAX_MPROTECT) {
96564 +
96565 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
96566 + if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
96567 + mm->binfmt->handle_mmap)
96568 + mm->binfmt->handle_mmap(file);
96569 +#endif
96570 +
96571 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
96572 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
96573 + gr_log_rwxmmap(file);
96574 +
96575 +#ifdef CONFIG_PAX_EMUPLT
96576 + vm_flags &= ~VM_EXEC;
96577 +#else
96578 + return -EPERM;
96579 +#endif
96580 +
96581 + }
96582 +
96583 + if (!(vm_flags & VM_EXEC))
96584 + vm_flags &= ~VM_MAYEXEC;
96585 +#else
96586 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
96587 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
96588 +#endif
96589 + else
96590 + vm_flags &= ~VM_MAYWRITE;
96591 + }
96592 +#endif
96593 +
96594 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96595 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
96596 + vm_flags &= ~VM_PAGEEXEC;
96597 +#endif
96598 +
96599 if (flags & MAP_LOCKED)
96600 if (!can_do_mlock())
96601 return -EPERM;
96602 @@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96603 vm_flags |= VM_NORESERVE;
96604 }
96605
96606 + if (!gr_acl_handle_mmap(file, prot))
96607 + return -EACCES;
96608 +
96609 addr = mmap_region(file, addr, len, vm_flags, pgoff);
96610 if (!IS_ERR_VALUE(addr) &&
96611 ((vm_flags & VM_LOCKED) ||
96612 @@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
96613 vm_flags_t vm_flags = vma->vm_flags;
96614
96615 /* If it was private or non-writable, the write bit is already clear */
96616 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
96617 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
96618 return 0;
96619
96620 /* The backer wishes to know when pages are first written to? */
96621 @@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96622 struct rb_node **rb_link, *rb_parent;
96623 unsigned long charged = 0;
96624
96625 +#ifdef CONFIG_PAX_SEGMEXEC
96626 + struct vm_area_struct *vma_m = NULL;
96627 +#endif
96628 +
96629 + /*
96630 + * mm->mmap_sem is required to protect against another thread
96631 + * changing the mappings in case we sleep.
96632 + */
96633 + verify_mm_writelocked(mm);
96634 +
96635 /* Check against address space limit. */
96636 +
96637 +#ifdef CONFIG_PAX_RANDMMAP
96638 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96639 +#endif
96640 +
96641 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
96642 unsigned long nr_pages;
96643
96644 @@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96645
96646 /* Clear old maps */
96647 error = -ENOMEM;
96648 -munmap_back:
96649 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
96650 if (do_munmap(mm, addr, len))
96651 return -ENOMEM;
96652 - goto munmap_back;
96653 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
96654 }
96655
96656 /*
96657 @@ -1595,6 +1739,16 @@ munmap_back:
96658 goto unacct_error;
96659 }
96660
96661 +#ifdef CONFIG_PAX_SEGMEXEC
96662 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
96663 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
96664 + if (!vma_m) {
96665 + error = -ENOMEM;
96666 + goto free_vma;
96667 + }
96668 + }
96669 +#endif
96670 +
96671 vma->vm_mm = mm;
96672 vma->vm_start = addr;
96673 vma->vm_end = addr + len;
96674 @@ -1625,6 +1779,13 @@ munmap_back:
96675 if (error)
96676 goto unmap_and_free_vma;
96677
96678 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96679 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
96680 + vma->vm_flags |= VM_PAGEEXEC;
96681 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
96682 + }
96683 +#endif
96684 +
96685 /* Can addr have changed??
96686 *
96687 * Answer: Yes, several device drivers can do it in their
96688 @@ -1643,6 +1804,12 @@ munmap_back:
96689 }
96690
96691 vma_link(mm, vma, prev, rb_link, rb_parent);
96692 +
96693 +#ifdef CONFIG_PAX_SEGMEXEC
96694 + if (vma_m)
96695 + BUG_ON(pax_mirror_vma(vma_m, vma));
96696 +#endif
96697 +
96698 /* Once vma denies write, undo our temporary denial count */
96699 if (file) {
96700 if (vm_flags & VM_SHARED)
96701 @@ -1655,6 +1822,7 @@ out:
96702 perf_event_mmap(vma);
96703
96704 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
96705 + track_exec_limit(mm, addr, addr + len, vm_flags);
96706 if (vm_flags & VM_LOCKED) {
96707 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
96708 vma == get_gate_vma(current->mm)))
96709 @@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
96710 if (vm_flags & VM_DENYWRITE)
96711 allow_write_access(file);
96712 free_vma:
96713 +
96714 +#ifdef CONFIG_PAX_SEGMEXEC
96715 + if (vma_m)
96716 + kmem_cache_free(vm_area_cachep, vma_m);
96717 +#endif
96718 +
96719 kmem_cache_free(vm_area_cachep, vma);
96720 unacct_error:
96721 if (charged)
96722 @@ -1699,7 +1873,63 @@ unacct_error:
96723 return error;
96724 }
96725
96726 -unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96727 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
96728 +unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
96729 +{
96730 + if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
96731 + return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
96732 +
96733 + return 0;
96734 +}
96735 +#endif
96736 +
96737 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
96738 +{
96739 + if (!vma) {
96740 +#ifdef CONFIG_STACK_GROWSUP
96741 + if (addr > sysctl_heap_stack_gap)
96742 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
96743 + else
96744 + vma = find_vma(current->mm, 0);
96745 + if (vma && (vma->vm_flags & VM_GROWSUP))
96746 + return false;
96747 +#endif
96748 + return true;
96749 + }
96750 +
96751 + if (addr + len > vma->vm_start)
96752 + return false;
96753 +
96754 + if (vma->vm_flags & VM_GROWSDOWN)
96755 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
96756 +#ifdef CONFIG_STACK_GROWSUP
96757 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
96758 + return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
96759 +#endif
96760 + else if (offset)
96761 + return offset <= vma->vm_start - addr - len;
96762 +
96763 + return true;
96764 +}
96765 +
96766 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
96767 +{
96768 + if (vma->vm_start < len)
96769 + return -ENOMEM;
96770 +
96771 + if (!(vma->vm_flags & VM_GROWSDOWN)) {
96772 + if (offset <= vma->vm_start - len)
96773 + return vma->vm_start - len - offset;
96774 + else
96775 + return -ENOMEM;
96776 + }
96777 +
96778 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
96779 + return vma->vm_start - len - sysctl_heap_stack_gap;
96780 + return -ENOMEM;
96781 +}
96782 +
96783 +unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
96784 {
96785 /*
96786 * We implement the search by looking for an rbtree node that
96787 @@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96788 }
96789 }
96790
96791 - gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
96792 + gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
96793 check_current:
96794 /* Check if current node has a suitable gap */
96795 if (gap_start > high_limit)
96796 return -ENOMEM;
96797 +
96798 + if (gap_end - gap_start > info->threadstack_offset)
96799 + gap_start += info->threadstack_offset;
96800 + else
96801 + gap_start = gap_end;
96802 +
96803 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96804 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96805 + gap_start += sysctl_heap_stack_gap;
96806 + else
96807 + gap_start = gap_end;
96808 + }
96809 + if (vma->vm_flags & VM_GROWSDOWN) {
96810 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96811 + gap_end -= sysctl_heap_stack_gap;
96812 + else
96813 + gap_end = gap_start;
96814 + }
96815 if (gap_end >= low_limit && gap_end - gap_start >= length)
96816 goto found;
96817
96818 @@ -1801,7 +2049,7 @@ found:
96819 return gap_start;
96820 }
96821
96822 -unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
96823 +unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
96824 {
96825 struct mm_struct *mm = current->mm;
96826 struct vm_area_struct *vma;
96827 @@ -1855,6 +2103,24 @@ check_current:
96828 gap_end = vma->vm_start;
96829 if (gap_end < low_limit)
96830 return -ENOMEM;
96831 +
96832 + if (gap_end - gap_start > info->threadstack_offset)
96833 + gap_end -= info->threadstack_offset;
96834 + else
96835 + gap_end = gap_start;
96836 +
96837 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96838 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96839 + gap_start += sysctl_heap_stack_gap;
96840 + else
96841 + gap_start = gap_end;
96842 + }
96843 + if (vma->vm_flags & VM_GROWSDOWN) {
96844 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96845 + gap_end -= sysctl_heap_stack_gap;
96846 + else
96847 + gap_end = gap_start;
96848 + }
96849 if (gap_start <= high_limit && gap_end - gap_start >= length)
96850 goto found;
96851
96852 @@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96853 struct mm_struct *mm = current->mm;
96854 struct vm_area_struct *vma;
96855 struct vm_unmapped_area_info info;
96856 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96857
96858 if (len > TASK_SIZE - mmap_min_addr)
96859 return -ENOMEM;
96860 @@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96861 if (flags & MAP_FIXED)
96862 return addr;
96863
96864 +#ifdef CONFIG_PAX_RANDMMAP
96865 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96866 +#endif
96867 +
96868 if (addr) {
96869 addr = PAGE_ALIGN(addr);
96870 vma = find_vma(mm, addr);
96871 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96872 - (!vma || addr + len <= vma->vm_start))
96873 + check_heap_stack_gap(vma, addr, len, offset))
96874 return addr;
96875 }
96876
96877 @@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96878 info.low_limit = mm->mmap_base;
96879 info.high_limit = TASK_SIZE;
96880 info.align_mask = 0;
96881 + info.threadstack_offset = offset;
96882 return vm_unmapped_area(&info);
96883 }
96884 #endif
96885 @@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96886 struct mm_struct *mm = current->mm;
96887 unsigned long addr = addr0;
96888 struct vm_unmapped_area_info info;
96889 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96890
96891 /* requested length too big for entire address space */
96892 if (len > TASK_SIZE - mmap_min_addr)
96893 @@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96894 if (flags & MAP_FIXED)
96895 return addr;
96896
96897 +#ifdef CONFIG_PAX_RANDMMAP
96898 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96899 +#endif
96900 +
96901 /* requesting a specific address */
96902 if (addr) {
96903 addr = PAGE_ALIGN(addr);
96904 vma = find_vma(mm, addr);
96905 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96906 - (!vma || addr + len <= vma->vm_start))
96907 + check_heap_stack_gap(vma, addr, len, offset))
96908 return addr;
96909 }
96910
96911 @@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96912 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
96913 info.high_limit = mm->mmap_base;
96914 info.align_mask = 0;
96915 + info.threadstack_offset = offset;
96916 addr = vm_unmapped_area(&info);
96917
96918 /*
96919 @@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96920 VM_BUG_ON(addr != -ENOMEM);
96921 info.flags = 0;
96922 info.low_limit = TASK_UNMAPPED_BASE;
96923 +
96924 +#ifdef CONFIG_PAX_RANDMMAP
96925 + if (mm->pax_flags & MF_PAX_RANDMMAP)
96926 + info.low_limit += mm->delta_mmap;
96927 +#endif
96928 +
96929 info.high_limit = TASK_SIZE;
96930 addr = vm_unmapped_area(&info);
96931 }
96932 @@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
96933 return vma;
96934 }
96935
96936 +#ifdef CONFIG_PAX_SEGMEXEC
96937 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
96938 +{
96939 + struct vm_area_struct *vma_m;
96940 +
96941 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
96942 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
96943 + BUG_ON(vma->vm_mirror);
96944 + return NULL;
96945 + }
96946 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
96947 + vma_m = vma->vm_mirror;
96948 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
96949 + BUG_ON(vma->vm_file != vma_m->vm_file);
96950 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
96951 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
96952 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
96953 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
96954 + return vma_m;
96955 +}
96956 +#endif
96957 +
96958 /*
96959 * Verify that the stack growth is acceptable and
96960 * update accounting. This is shared with both the
96961 @@ -2106,6 +2412,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96962 return -ENOMEM;
96963
96964 /* Stack limit test */
96965 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
96966 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
96967 return -ENOMEM;
96968
96969 @@ -2116,6 +2423,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96970 locked = mm->locked_vm + grow;
96971 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
96972 limit >>= PAGE_SHIFT;
96973 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96974 if (locked > limit && !capable(CAP_IPC_LOCK))
96975 return -ENOMEM;
96976 }
96977 @@ -2145,37 +2453,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96978 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
96979 * vma is the last one with address > vma->vm_end. Have to extend vma.
96980 */
96981 +#ifndef CONFIG_IA64
96982 +static
96983 +#endif
96984 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
96985 {
96986 int error;
96987 + bool locknext;
96988
96989 if (!(vma->vm_flags & VM_GROWSUP))
96990 return -EFAULT;
96991
96992 + /* Also guard against wrapping around to address 0. */
96993 + if (address < PAGE_ALIGN(address+1))
96994 + address = PAGE_ALIGN(address+1);
96995 + else
96996 + return -ENOMEM;
96997 +
96998 /*
96999 * We must make sure the anon_vma is allocated
97000 * so that the anon_vma locking is not a noop.
97001 */
97002 if (unlikely(anon_vma_prepare(vma)))
97003 return -ENOMEM;
97004 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
97005 + if (locknext && anon_vma_prepare(vma->vm_next))
97006 + return -ENOMEM;
97007 vma_lock_anon_vma(vma);
97008 + if (locknext)
97009 + vma_lock_anon_vma(vma->vm_next);
97010
97011 /*
97012 * vma->vm_start/vm_end cannot change under us because the caller
97013 * is required to hold the mmap_sem in read mode. We need the
97014 - * anon_vma lock to serialize against concurrent expand_stacks.
97015 - * Also guard against wrapping around to address 0.
97016 + * anon_vma locks to serialize against concurrent expand_stacks
97017 + * and expand_upwards.
97018 */
97019 - if (address < PAGE_ALIGN(address+4))
97020 - address = PAGE_ALIGN(address+4);
97021 - else {
97022 - vma_unlock_anon_vma(vma);
97023 - return -ENOMEM;
97024 - }
97025 error = 0;
97026
97027 /* Somebody else might have raced and expanded it already */
97028 - if (address > vma->vm_end) {
97029 + 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)
97030 + error = -ENOMEM;
97031 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
97032 unsigned long size, grow;
97033
97034 size = address - vma->vm_start;
97035 @@ -2210,6 +2529,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
97036 }
97037 }
97038 }
97039 + if (locknext)
97040 + vma_unlock_anon_vma(vma->vm_next);
97041 vma_unlock_anon_vma(vma);
97042 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97043 validate_mm(vma->vm_mm);
97044 @@ -2224,6 +2545,8 @@ int expand_downwards(struct vm_area_struct *vma,
97045 unsigned long address)
97046 {
97047 int error;
97048 + bool lockprev = false;
97049 + struct vm_area_struct *prev;
97050
97051 /*
97052 * We must make sure the anon_vma is allocated
97053 @@ -2237,6 +2560,15 @@ int expand_downwards(struct vm_area_struct *vma,
97054 if (error)
97055 return error;
97056
97057 + prev = vma->vm_prev;
97058 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
97059 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
97060 +#endif
97061 + if (lockprev && anon_vma_prepare(prev))
97062 + return -ENOMEM;
97063 + if (lockprev)
97064 + vma_lock_anon_vma(prev);
97065 +
97066 vma_lock_anon_vma(vma);
97067
97068 /*
97069 @@ -2246,9 +2578,17 @@ int expand_downwards(struct vm_area_struct *vma,
97070 */
97071
97072 /* Somebody else might have raced and expanded it already */
97073 - if (address < vma->vm_start) {
97074 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
97075 + error = -ENOMEM;
97076 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
97077 unsigned long size, grow;
97078
97079 +#ifdef CONFIG_PAX_SEGMEXEC
97080 + struct vm_area_struct *vma_m;
97081 +
97082 + vma_m = pax_find_mirror_vma(vma);
97083 +#endif
97084 +
97085 size = vma->vm_end - address;
97086 grow = (vma->vm_start - address) >> PAGE_SHIFT;
97087
97088 @@ -2273,13 +2613,27 @@ int expand_downwards(struct vm_area_struct *vma,
97089 vma->vm_pgoff -= grow;
97090 anon_vma_interval_tree_post_update_vma(vma);
97091 vma_gap_update(vma);
97092 +
97093 +#ifdef CONFIG_PAX_SEGMEXEC
97094 + if (vma_m) {
97095 + anon_vma_interval_tree_pre_update_vma(vma_m);
97096 + vma_m->vm_start -= grow << PAGE_SHIFT;
97097 + vma_m->vm_pgoff -= grow;
97098 + anon_vma_interval_tree_post_update_vma(vma_m);
97099 + vma_gap_update(vma_m);
97100 + }
97101 +#endif
97102 +
97103 spin_unlock(&vma->vm_mm->page_table_lock);
97104
97105 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
97106 perf_event_mmap(vma);
97107 }
97108 }
97109 }
97110 vma_unlock_anon_vma(vma);
97111 + if (lockprev)
97112 + vma_unlock_anon_vma(prev);
97113 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97114 validate_mm(vma->vm_mm);
97115 return error;
97116 @@ -2377,6 +2731,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
97117 do {
97118 long nrpages = vma_pages(vma);
97119
97120 +#ifdef CONFIG_PAX_SEGMEXEC
97121 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
97122 + vma = remove_vma(vma);
97123 + continue;
97124 + }
97125 +#endif
97126 +
97127 if (vma->vm_flags & VM_ACCOUNT)
97128 nr_accounted += nrpages;
97129 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
97130 @@ -2421,6 +2782,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
97131 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
97132 vma->vm_prev = NULL;
97133 do {
97134 +
97135 +#ifdef CONFIG_PAX_SEGMEXEC
97136 + if (vma->vm_mirror) {
97137 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
97138 + vma->vm_mirror->vm_mirror = NULL;
97139 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
97140 + vma->vm_mirror = NULL;
97141 + }
97142 +#endif
97143 +
97144 vma_rb_erase(vma, &mm->mm_rb);
97145 mm->map_count--;
97146 tail_vma = vma;
97147 @@ -2448,14 +2819,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97148 struct vm_area_struct *new;
97149 int err = -ENOMEM;
97150
97151 +#ifdef CONFIG_PAX_SEGMEXEC
97152 + struct vm_area_struct *vma_m, *new_m = NULL;
97153 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
97154 +#endif
97155 +
97156 if (is_vm_hugetlb_page(vma) && (addr &
97157 ~(huge_page_mask(hstate_vma(vma)))))
97158 return -EINVAL;
97159
97160 +#ifdef CONFIG_PAX_SEGMEXEC
97161 + vma_m = pax_find_mirror_vma(vma);
97162 +#endif
97163 +
97164 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97165 if (!new)
97166 goto out_err;
97167
97168 +#ifdef CONFIG_PAX_SEGMEXEC
97169 + if (vma_m) {
97170 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97171 + if (!new_m) {
97172 + kmem_cache_free(vm_area_cachep, new);
97173 + goto out_err;
97174 + }
97175 + }
97176 +#endif
97177 +
97178 /* most fields are the same, copy all, and then fixup */
97179 *new = *vma;
97180
97181 @@ -2468,6 +2858,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97182 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
97183 }
97184
97185 +#ifdef CONFIG_PAX_SEGMEXEC
97186 + if (vma_m) {
97187 + *new_m = *vma_m;
97188 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
97189 + new_m->vm_mirror = new;
97190 + new->vm_mirror = new_m;
97191 +
97192 + if (new_below)
97193 + new_m->vm_end = addr_m;
97194 + else {
97195 + new_m->vm_start = addr_m;
97196 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
97197 + }
97198 + }
97199 +#endif
97200 +
97201 err = vma_dup_policy(vma, new);
97202 if (err)
97203 goto out_free_vma;
97204 @@ -2488,6 +2894,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97205 else
97206 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
97207
97208 +#ifdef CONFIG_PAX_SEGMEXEC
97209 + if (!err && vma_m) {
97210 + struct mempolicy *pol = vma_policy(new);
97211 +
97212 + if (anon_vma_clone(new_m, vma_m))
97213 + goto out_free_mpol;
97214 +
97215 + mpol_get(pol);
97216 + set_vma_policy(new_m, pol);
97217 +
97218 + if (new_m->vm_file)
97219 + get_file(new_m->vm_file);
97220 +
97221 + if (new_m->vm_ops && new_m->vm_ops->open)
97222 + new_m->vm_ops->open(new_m);
97223 +
97224 + if (new_below)
97225 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
97226 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
97227 + else
97228 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
97229 +
97230 + if (err) {
97231 + if (new_m->vm_ops && new_m->vm_ops->close)
97232 + new_m->vm_ops->close(new_m);
97233 + if (new_m->vm_file)
97234 + fput(new_m->vm_file);
97235 + mpol_put(pol);
97236 + }
97237 + }
97238 +#endif
97239 +
97240 /* Success. */
97241 if (!err)
97242 return 0;
97243 @@ -2497,10 +2935,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97244 new->vm_ops->close(new);
97245 if (new->vm_file)
97246 fput(new->vm_file);
97247 - unlink_anon_vmas(new);
97248 out_free_mpol:
97249 mpol_put(vma_policy(new));
97250 out_free_vma:
97251 +
97252 +#ifdef CONFIG_PAX_SEGMEXEC
97253 + if (new_m) {
97254 + unlink_anon_vmas(new_m);
97255 + kmem_cache_free(vm_area_cachep, new_m);
97256 + }
97257 +#endif
97258 +
97259 + unlink_anon_vmas(new);
97260 kmem_cache_free(vm_area_cachep, new);
97261 out_err:
97262 return err;
97263 @@ -2513,6 +2959,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97264 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97265 unsigned long addr, int new_below)
97266 {
97267 +
97268 +#ifdef CONFIG_PAX_SEGMEXEC
97269 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97270 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
97271 + if (mm->map_count >= sysctl_max_map_count-1)
97272 + return -ENOMEM;
97273 + } else
97274 +#endif
97275 +
97276 if (mm->map_count >= sysctl_max_map_count)
97277 return -ENOMEM;
97278
97279 @@ -2524,11 +2979,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97280 * work. This now handles partial unmappings.
97281 * Jeremy Fitzhardinge <jeremy@goop.org>
97282 */
97283 +#ifdef CONFIG_PAX_SEGMEXEC
97284 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97285 {
97286 + int ret = __do_munmap(mm, start, len);
97287 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
97288 + return ret;
97289 +
97290 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
97291 +}
97292 +
97293 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97294 +#else
97295 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97296 +#endif
97297 +{
97298 unsigned long end;
97299 struct vm_area_struct *vma, *prev, *last;
97300
97301 + /*
97302 + * mm->mmap_sem is required to protect against another thread
97303 + * changing the mappings in case we sleep.
97304 + */
97305 + verify_mm_writelocked(mm);
97306 +
97307 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
97308 return -EINVAL;
97309
97310 @@ -2604,6 +3078,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97311 /* Fix up all other VM information */
97312 remove_vma_list(mm, vma);
97313
97314 + track_exec_limit(mm, start, end, 0UL);
97315 +
97316 return 0;
97317 }
97318
97319 @@ -2612,6 +3088,13 @@ int vm_munmap(unsigned long start, size_t len)
97320 int ret;
97321 struct mm_struct *mm = current->mm;
97322
97323 +
97324 +#ifdef CONFIG_PAX_SEGMEXEC
97325 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
97326 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
97327 + return -EINVAL;
97328 +#endif
97329 +
97330 down_write(&mm->mmap_sem);
97331 ret = do_munmap(mm, start, len);
97332 up_write(&mm->mmap_sem);
97333 @@ -2625,16 +3108,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
97334 return vm_munmap(addr, len);
97335 }
97336
97337 -static inline void verify_mm_writelocked(struct mm_struct *mm)
97338 -{
97339 -#ifdef CONFIG_DEBUG_VM
97340 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97341 - WARN_ON(1);
97342 - up_read(&mm->mmap_sem);
97343 - }
97344 -#endif
97345 -}
97346 -
97347 /*
97348 * this is really a simplified "do_mmap". it only handles
97349 * anonymous maps. eventually we may be able to do some
97350 @@ -2648,6 +3121,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97351 struct rb_node **rb_link, *rb_parent;
97352 pgoff_t pgoff = addr >> PAGE_SHIFT;
97353 int error;
97354 + unsigned long charged;
97355
97356 len = PAGE_ALIGN(len);
97357 if (!len)
97358 @@ -2655,10 +3129,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97359
97360 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
97361
97362 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
97363 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
97364 + flags &= ~VM_EXEC;
97365 +
97366 +#ifdef CONFIG_PAX_MPROTECT
97367 + if (mm->pax_flags & MF_PAX_MPROTECT)
97368 + flags &= ~VM_MAYEXEC;
97369 +#endif
97370 +
97371 + }
97372 +#endif
97373 +
97374 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
97375 if (error & ~PAGE_MASK)
97376 return error;
97377
97378 + charged = len >> PAGE_SHIFT;
97379 +
97380 error = mlock_future_check(mm, mm->def_flags, len);
97381 if (error)
97382 return error;
97383 @@ -2672,21 +3160,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97384 /*
97385 * Clear old maps. this also does some error checking for us
97386 */
97387 - munmap_back:
97388 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97389 if (do_munmap(mm, addr, len))
97390 return -ENOMEM;
97391 - goto munmap_back;
97392 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97393 }
97394
97395 /* Check against address space limits *after* clearing old maps... */
97396 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
97397 + if (!may_expand_vm(mm, charged))
97398 return -ENOMEM;
97399
97400 if (mm->map_count > sysctl_max_map_count)
97401 return -ENOMEM;
97402
97403 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
97404 + if (security_vm_enough_memory_mm(mm, charged))
97405 return -ENOMEM;
97406
97407 /* Can we just expand an old private anonymous mapping? */
97408 @@ -2700,7 +3187,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97409 */
97410 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97411 if (!vma) {
97412 - vm_unacct_memory(len >> PAGE_SHIFT);
97413 + vm_unacct_memory(charged);
97414 return -ENOMEM;
97415 }
97416
97417 @@ -2714,10 +3201,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97418 vma_link(mm, vma, prev, rb_link, rb_parent);
97419 out:
97420 perf_event_mmap(vma);
97421 - mm->total_vm += len >> PAGE_SHIFT;
97422 + mm->total_vm += charged;
97423 if (flags & VM_LOCKED)
97424 - mm->locked_vm += (len >> PAGE_SHIFT);
97425 + mm->locked_vm += charged;
97426 vma->vm_flags |= VM_SOFTDIRTY;
97427 + track_exec_limit(mm, addr, addr + len, flags);
97428 return addr;
97429 }
97430
97431 @@ -2779,6 +3267,7 @@ void exit_mmap(struct mm_struct *mm)
97432 while (vma) {
97433 if (vma->vm_flags & VM_ACCOUNT)
97434 nr_accounted += vma_pages(vma);
97435 + vma->vm_mirror = NULL;
97436 vma = remove_vma(vma);
97437 }
97438 vm_unacct_memory(nr_accounted);
97439 @@ -2796,6 +3285,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97440 struct vm_area_struct *prev;
97441 struct rb_node **rb_link, *rb_parent;
97442
97443 +#ifdef CONFIG_PAX_SEGMEXEC
97444 + struct vm_area_struct *vma_m = NULL;
97445 +#endif
97446 +
97447 + if (security_mmap_addr(vma->vm_start))
97448 + return -EPERM;
97449 +
97450 /*
97451 * The vm_pgoff of a purely anonymous vma should be irrelevant
97452 * until its first write fault, when page's anon_vma and index
97453 @@ -2819,7 +3315,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97454 security_vm_enough_memory_mm(mm, vma_pages(vma)))
97455 return -ENOMEM;
97456
97457 +#ifdef CONFIG_PAX_SEGMEXEC
97458 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
97459 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97460 + if (!vma_m)
97461 + return -ENOMEM;
97462 + }
97463 +#endif
97464 +
97465 vma_link(mm, vma, prev, rb_link, rb_parent);
97466 +
97467 +#ifdef CONFIG_PAX_SEGMEXEC
97468 + if (vma_m)
97469 + BUG_ON(pax_mirror_vma(vma_m, vma));
97470 +#endif
97471 +
97472 return 0;
97473 }
97474
97475 @@ -2838,6 +3348,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97476 struct rb_node **rb_link, *rb_parent;
97477 bool faulted_in_anon_vma = true;
97478
97479 + BUG_ON(vma->vm_mirror);
97480 +
97481 /*
97482 * If anonymous vma has not yet been faulted, update new pgoff
97483 * to match new location, to increase its chance of merging.
97484 @@ -2902,6 +3414,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97485 return NULL;
97486 }
97487
97488 +#ifdef CONFIG_PAX_SEGMEXEC
97489 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
97490 +{
97491 + struct vm_area_struct *prev_m;
97492 + struct rb_node **rb_link_m, *rb_parent_m;
97493 + struct mempolicy *pol_m;
97494 +
97495 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
97496 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
97497 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
97498 + *vma_m = *vma;
97499 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
97500 + if (anon_vma_clone(vma_m, vma))
97501 + return -ENOMEM;
97502 + pol_m = vma_policy(vma_m);
97503 + mpol_get(pol_m);
97504 + set_vma_policy(vma_m, pol_m);
97505 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
97506 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
97507 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
97508 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
97509 + if (vma_m->vm_file)
97510 + get_file(vma_m->vm_file);
97511 + if (vma_m->vm_ops && vma_m->vm_ops->open)
97512 + vma_m->vm_ops->open(vma_m);
97513 + BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
97514 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
97515 + vma_m->vm_mirror = vma;
97516 + vma->vm_mirror = vma_m;
97517 + return 0;
97518 +}
97519 +#endif
97520 +
97521 /*
97522 * Return true if the calling process may expand its vm space by the passed
97523 * number of pages
97524 @@ -2913,6 +3458,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
97525
97526 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
97527
97528 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
97529 if (cur + npages > lim)
97530 return 0;
97531 return 1;
97532 @@ -2995,6 +3541,22 @@ static struct vm_area_struct *__install_special_mapping(
97533 vma->vm_start = addr;
97534 vma->vm_end = addr + len;
97535
97536 +#ifdef CONFIG_PAX_MPROTECT
97537 + if (mm->pax_flags & MF_PAX_MPROTECT) {
97538 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
97539 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
97540 + return ERR_PTR(-EPERM);
97541 + if (!(vm_flags & VM_EXEC))
97542 + vm_flags &= ~VM_MAYEXEC;
97543 +#else
97544 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97545 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97546 +#endif
97547 + else
97548 + vm_flags &= ~VM_MAYWRITE;
97549 + }
97550 +#endif
97551 +
97552 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
97553 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97554
97555 diff --git a/mm/mprotect.c b/mm/mprotect.c
97556 index ace9345..63320dc 100644
97557 --- a/mm/mprotect.c
97558 +++ b/mm/mprotect.c
97559 @@ -24,10 +24,18 @@
97560 #include <linux/migrate.h>
97561 #include <linux/perf_event.h>
97562 #include <linux/ksm.h>
97563 +#include <linux/sched/sysctl.h>
97564 +
97565 +#ifdef CONFIG_PAX_MPROTECT
97566 +#include <linux/elf.h>
97567 +#include <linux/binfmts.h>
97568 +#endif
97569 +
97570 #include <asm/uaccess.h>
97571 #include <asm/pgtable.h>
97572 #include <asm/cacheflush.h>
97573 #include <asm/tlbflush.h>
97574 +#include <asm/mmu_context.h>
97575
97576 /*
97577 * For a prot_numa update we only hold mmap_sem for read so there is a
97578 @@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
97579 return pages;
97580 }
97581
97582 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97583 +/* called while holding the mmap semaphor for writing except stack expansion */
97584 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
97585 +{
97586 + unsigned long oldlimit, newlimit = 0UL;
97587 +
97588 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
97589 + return;
97590 +
97591 + spin_lock(&mm->page_table_lock);
97592 + oldlimit = mm->context.user_cs_limit;
97593 + if ((prot & VM_EXEC) && oldlimit < end)
97594 + /* USER_CS limit moved up */
97595 + newlimit = end;
97596 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
97597 + /* USER_CS limit moved down */
97598 + newlimit = start;
97599 +
97600 + if (newlimit) {
97601 + mm->context.user_cs_limit = newlimit;
97602 +
97603 +#ifdef CONFIG_SMP
97604 + wmb();
97605 + cpus_clear(mm->context.cpu_user_cs_mask);
97606 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
97607 +#endif
97608 +
97609 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
97610 + }
97611 + spin_unlock(&mm->page_table_lock);
97612 + if (newlimit == end) {
97613 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
97614 +
97615 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
97616 + if (is_vm_hugetlb_page(vma))
97617 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
97618 + else
97619 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
97620 + }
97621 +}
97622 +#endif
97623 +
97624 int
97625 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97626 unsigned long start, unsigned long end, unsigned long newflags)
97627 @@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97628 int error;
97629 int dirty_accountable = 0;
97630
97631 +#ifdef CONFIG_PAX_SEGMEXEC
97632 + struct vm_area_struct *vma_m = NULL;
97633 + unsigned long start_m, end_m;
97634 +
97635 + start_m = start + SEGMEXEC_TASK_SIZE;
97636 + end_m = end + SEGMEXEC_TASK_SIZE;
97637 +#endif
97638 +
97639 if (newflags == oldflags) {
97640 *pprev = vma;
97641 return 0;
97642 }
97643
97644 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
97645 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
97646 +
97647 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
97648 + return -ENOMEM;
97649 +
97650 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
97651 + return -ENOMEM;
97652 + }
97653 +
97654 /*
97655 * If we make a private mapping writable we increase our commit;
97656 * but (without finer accounting) cannot reduce our commit if we
97657 @@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97658 }
97659 }
97660
97661 +#ifdef CONFIG_PAX_SEGMEXEC
97662 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
97663 + if (start != vma->vm_start) {
97664 + error = split_vma(mm, vma, start, 1);
97665 + if (error)
97666 + goto fail;
97667 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
97668 + *pprev = (*pprev)->vm_next;
97669 + }
97670 +
97671 + if (end != vma->vm_end) {
97672 + error = split_vma(mm, vma, end, 0);
97673 + if (error)
97674 + goto fail;
97675 + }
97676 +
97677 + if (pax_find_mirror_vma(vma)) {
97678 + error = __do_munmap(mm, start_m, end_m - start_m);
97679 + if (error)
97680 + goto fail;
97681 + } else {
97682 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97683 + if (!vma_m) {
97684 + error = -ENOMEM;
97685 + goto fail;
97686 + }
97687 + vma->vm_flags = newflags;
97688 + error = pax_mirror_vma(vma_m, vma);
97689 + if (error) {
97690 + vma->vm_flags = oldflags;
97691 + goto fail;
97692 + }
97693 + }
97694 + }
97695 +#endif
97696 +
97697 /*
97698 * First try to merge with previous and/or next vma.
97699 */
97700 @@ -314,7 +418,19 @@ success:
97701 * vm_flags and vm_page_prot are protected by the mmap_sem
97702 * held in write mode.
97703 */
97704 +
97705 +#ifdef CONFIG_PAX_SEGMEXEC
97706 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
97707 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
97708 +#endif
97709 +
97710 vma->vm_flags = newflags;
97711 +
97712 +#ifdef CONFIG_PAX_MPROTECT
97713 + if (mm->binfmt && mm->binfmt->handle_mprotect)
97714 + mm->binfmt->handle_mprotect(vma, newflags);
97715 +#endif
97716 +
97717 dirty_accountable = vma_wants_writenotify(vma);
97718 vma_set_page_prot(vma);
97719
97720 @@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97721 end = start + len;
97722 if (end <= start)
97723 return -ENOMEM;
97724 +
97725 +#ifdef CONFIG_PAX_SEGMEXEC
97726 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
97727 + if (end > SEGMEXEC_TASK_SIZE)
97728 + return -EINVAL;
97729 + } else
97730 +#endif
97731 +
97732 + if (end > TASK_SIZE)
97733 + return -EINVAL;
97734 +
97735 if (!arch_validate_prot(prot))
97736 return -EINVAL;
97737
97738 @@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97739 /*
97740 * Does the application expect PROT_READ to imply PROT_EXEC:
97741 */
97742 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
97743 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
97744 prot |= PROT_EXEC;
97745
97746 vm_flags = calc_vm_prot_bits(prot);
97747 @@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97748 if (start > vma->vm_start)
97749 prev = vma;
97750
97751 +#ifdef CONFIG_PAX_MPROTECT
97752 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
97753 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
97754 +#endif
97755 +
97756 for (nstart = start ; ; ) {
97757 unsigned long newflags;
97758
97759 @@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97760
97761 /* newflags >> 4 shift VM_MAY% in place of VM_% */
97762 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
97763 + if (prot & (PROT_WRITE | PROT_EXEC))
97764 + gr_log_rwxmprotect(vma);
97765 +
97766 + error = -EACCES;
97767 + goto out;
97768 + }
97769 +
97770 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
97771 error = -EACCES;
97772 goto out;
97773 }
97774 @@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97775 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
97776 if (error)
97777 goto out;
97778 +
97779 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
97780 +
97781 nstart = tmp;
97782
97783 if (nstart < prev->vm_end)
97784 diff --git a/mm/mremap.c b/mm/mremap.c
97785 index b147f66..98a695a 100644
97786 --- a/mm/mremap.c
97787 +++ b/mm/mremap.c
97788 @@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
97789 continue;
97790 pte = ptep_get_and_clear(mm, old_addr, old_pte);
97791 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
97792 +
97793 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97794 + if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
97795 + pte = pte_exprotect(pte);
97796 +#endif
97797 +
97798 pte = move_soft_dirty_pte(pte);
97799 set_pte_at(mm, new_addr, new_pte, pte);
97800 }
97801 @@ -345,6 +351,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
97802 if (is_vm_hugetlb_page(vma))
97803 goto Einval;
97804
97805 +#ifdef CONFIG_PAX_SEGMEXEC
97806 + if (pax_find_mirror_vma(vma))
97807 + goto Einval;
97808 +#endif
97809 +
97810 /* We can't remap across vm area boundaries */
97811 if (old_len > vma->vm_end - addr)
97812 goto Efault;
97813 @@ -400,20 +411,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
97814 unsigned long ret = -EINVAL;
97815 unsigned long charged = 0;
97816 unsigned long map_flags;
97817 + unsigned long pax_task_size = TASK_SIZE;
97818
97819 if (new_addr & ~PAGE_MASK)
97820 goto out;
97821
97822 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
97823 +#ifdef CONFIG_PAX_SEGMEXEC
97824 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
97825 + pax_task_size = SEGMEXEC_TASK_SIZE;
97826 +#endif
97827 +
97828 + pax_task_size -= PAGE_SIZE;
97829 +
97830 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
97831 goto out;
97832
97833 /* Check if the location we're moving into overlaps the
97834 * old location at all, and fail if it does.
97835 */
97836 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
97837 - goto out;
97838 -
97839 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
97840 + if (addr + old_len > new_addr && new_addr + new_len > addr)
97841 goto out;
97842
97843 ret = do_munmap(mm, new_addr, new_len);
97844 @@ -482,6 +498,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97845 unsigned long ret = -EINVAL;
97846 unsigned long charged = 0;
97847 bool locked = false;
97848 + unsigned long pax_task_size = TASK_SIZE;
97849
97850 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
97851 return ret;
97852 @@ -503,6 +520,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97853 if (!new_len)
97854 return ret;
97855
97856 +#ifdef CONFIG_PAX_SEGMEXEC
97857 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
97858 + pax_task_size = SEGMEXEC_TASK_SIZE;
97859 +#endif
97860 +
97861 + pax_task_size -= PAGE_SIZE;
97862 +
97863 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
97864 + old_len > pax_task_size || addr > pax_task_size-old_len)
97865 + return ret;
97866 +
97867 down_write(&current->mm->mmap_sem);
97868
97869 if (flags & MREMAP_FIXED) {
97870 @@ -553,6 +581,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97871 new_addr = addr;
97872 }
97873 ret = addr;
97874 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
97875 goto out;
97876 }
97877 }
97878 @@ -576,7 +605,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97879 goto out;
97880 }
97881
97882 + map_flags = vma->vm_flags;
97883 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
97884 + if (!(ret & ~PAGE_MASK)) {
97885 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
97886 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
97887 + }
97888 }
97889 out:
97890 if (ret & ~PAGE_MASK)
97891 diff --git a/mm/nommu.c b/mm/nommu.c
97892 index bd1808e..b63d87c 100644
97893 --- a/mm/nommu.c
97894 +++ b/mm/nommu.c
97895 @@ -70,7 +70,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
97896 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
97897 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
97898 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
97899 -int heap_stack_gap = 0;
97900
97901 atomic_long_t mmap_pages_allocated;
97902
97903 @@ -857,15 +856,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
97904 EXPORT_SYMBOL(find_vma);
97905
97906 /*
97907 - * find a VMA
97908 - * - we don't extend stack VMAs under NOMMU conditions
97909 - */
97910 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
97911 -{
97912 - return find_vma(mm, addr);
97913 -}
97914 -
97915 -/*
97916 * expand a stack to a given address
97917 * - not supported under NOMMU conditions
97918 */
97919 @@ -1572,6 +1562,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97920
97921 /* most fields are the same, copy all, and then fixup */
97922 *new = *vma;
97923 + INIT_LIST_HEAD(&new->anon_vma_chain);
97924 *region = *vma->vm_region;
97925 new->vm_region = region;
97926
97927 @@ -2002,8 +1993,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
97928 }
97929 EXPORT_SYMBOL(generic_file_remap_pages);
97930
97931 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97932 - unsigned long addr, void *buf, int len, int write)
97933 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97934 + unsigned long addr, void *buf, size_t len, int write)
97935 {
97936 struct vm_area_struct *vma;
97937
97938 @@ -2044,8 +2035,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97939 *
97940 * The caller must hold a reference on @mm.
97941 */
97942 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97943 - void *buf, int len, int write)
97944 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97945 + void *buf, size_t len, int write)
97946 {
97947 return __access_remote_vm(NULL, mm, addr, buf, len, write);
97948 }
97949 @@ -2054,7 +2045,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97950 * Access another process' address space.
97951 * - source/target buffer must be kernel space
97952 */
97953 -int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
97954 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
97955 {
97956 struct mm_struct *mm;
97957
97958 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
97959 index 19ceae8..70848ee 100644
97960 --- a/mm/page-writeback.c
97961 +++ b/mm/page-writeback.c
97962 @@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
97963 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
97964 * - the bdi dirty thresh drops quickly due to change of JBOD workload
97965 */
97966 -static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
97967 +static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
97968 unsigned long thresh,
97969 unsigned long bg_thresh,
97970 unsigned long dirty,
97971 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
97972 index 616a2c9..0e755f6 100644
97973 --- a/mm/page_alloc.c
97974 +++ b/mm/page_alloc.c
97975 @@ -59,6 +59,7 @@
97976 #include <linux/page-debug-flags.h>
97977 #include <linux/hugetlb.h>
97978 #include <linux/sched/rt.h>
97979 +#include <linux/random.h>
97980
97981 #include <asm/sections.h>
97982 #include <asm/tlbflush.h>
97983 @@ -356,7 +357,7 @@ out:
97984 * This usage means that zero-order pages may not be compound.
97985 */
97986
97987 -static void free_compound_page(struct page *page)
97988 +void free_compound_page(struct page *page)
97989 {
97990 __free_pages_ok(page, compound_order(page));
97991 }
97992 @@ -741,6 +742,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
97993 int i;
97994 int bad = 0;
97995
97996 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
97997 + unsigned long index = 1UL << order;
97998 +#endif
97999 +
98000 trace_mm_page_free(page, order);
98001 kmemcheck_free_shadow(page, order);
98002
98003 @@ -757,6 +762,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
98004 debug_check_no_obj_freed(page_address(page),
98005 PAGE_SIZE << order);
98006 }
98007 +
98008 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98009 + for (; index; --index)
98010 + sanitize_highpage(page + index - 1);
98011 +#endif
98012 +
98013 arch_free_page(page, order);
98014 kernel_map_pages(page, 1 << order, 0);
98015
98016 @@ -780,6 +791,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
98017 local_irq_restore(flags);
98018 }
98019
98020 +#ifdef CONFIG_PAX_LATENT_ENTROPY
98021 +bool __meminitdata extra_latent_entropy;
98022 +
98023 +static int __init setup_pax_extra_latent_entropy(char *str)
98024 +{
98025 + extra_latent_entropy = true;
98026 + return 0;
98027 +}
98028 +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
98029 +
98030 +volatile u64 latent_entropy __latent_entropy;
98031 +EXPORT_SYMBOL(latent_entropy);
98032 +#endif
98033 +
98034 void __init __free_pages_bootmem(struct page *page, unsigned int order)
98035 {
98036 unsigned int nr_pages = 1 << order;
98037 @@ -795,6 +820,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
98038 __ClearPageReserved(p);
98039 set_page_count(p, 0);
98040
98041 +#ifdef CONFIG_PAX_LATENT_ENTROPY
98042 + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
98043 + u64 hash = 0;
98044 + size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
98045 + const u64 *data = lowmem_page_address(page);
98046 +
98047 + for (index = 0; index < end; index++)
98048 + hash ^= hash + data[index];
98049 + latent_entropy ^= hash;
98050 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
98051 + }
98052 +#endif
98053 +
98054 page_zone(page)->managed_pages += nr_pages;
98055 set_page_refcounted(page);
98056 __free_pages(page, order);
98057 @@ -923,8 +961,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
98058 arch_alloc_page(page, order);
98059 kernel_map_pages(page, 1 << order, 1);
98060
98061 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
98062 if (gfp_flags & __GFP_ZERO)
98063 prep_zero_page(page, order, gfp_flags);
98064 +#endif
98065
98066 if (order && (gfp_flags & __GFP_COMP))
98067 prep_compound_page(page, order);
98068 @@ -1602,7 +1642,7 @@ again:
98069 }
98070
98071 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
98072 - if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98073 + if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98074 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
98075 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98076
98077 @@ -1923,7 +1963,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
98078 do {
98079 mod_zone_page_state(zone, NR_ALLOC_BATCH,
98080 high_wmark_pages(zone) - low_wmark_pages(zone) -
98081 - atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98082 + atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98083 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98084 } while (zone++ != preferred_zone);
98085 }
98086 @@ -5698,7 +5738,7 @@ static void __setup_per_zone_wmarks(void)
98087
98088 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
98089 high_wmark_pages(zone) - low_wmark_pages(zone) -
98090 - atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98091 + atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98092
98093 setup_zone_migrate_reserve(zone);
98094 spin_unlock_irqrestore(&zone->lock, flags);
98095 diff --git a/mm/percpu.c b/mm/percpu.c
98096 index 014bab6..db5a76f 100644
98097 --- a/mm/percpu.c
98098 +++ b/mm/percpu.c
98099 @@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
98100 static unsigned int pcpu_high_unit_cpu __read_mostly;
98101
98102 /* the address of the first chunk which starts with the kernel static area */
98103 -void *pcpu_base_addr __read_mostly;
98104 +void *pcpu_base_addr __read_only;
98105 EXPORT_SYMBOL_GPL(pcpu_base_addr);
98106
98107 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
98108 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
98109 index 5077afc..846c9ef 100644
98110 --- a/mm/process_vm_access.c
98111 +++ b/mm/process_vm_access.c
98112 @@ -13,6 +13,7 @@
98113 #include <linux/uio.h>
98114 #include <linux/sched.h>
98115 #include <linux/highmem.h>
98116 +#include <linux/security.h>
98117 #include <linux/ptrace.h>
98118 #include <linux/slab.h>
98119 #include <linux/syscalls.h>
98120 @@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98121 ssize_t iov_len;
98122 size_t total_len = iov_iter_count(iter);
98123
98124 + return -ENOSYS; // PaX: until properly audited
98125 +
98126 /*
98127 * Work out how many pages of struct pages we're going to need
98128 * when eventually calling get_user_pages
98129 */
98130 for (i = 0; i < riovcnt; i++) {
98131 iov_len = rvec[i].iov_len;
98132 - if (iov_len > 0) {
98133 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
98134 - + iov_len)
98135 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
98136 - / PAGE_SIZE + 1;
98137 - nr_pages = max(nr_pages, nr_pages_iov);
98138 - }
98139 + if (iov_len <= 0)
98140 + continue;
98141 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
98142 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
98143 + nr_pages = max(nr_pages, nr_pages_iov);
98144 }
98145
98146 if (nr_pages == 0)
98147 @@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98148 goto free_proc_pages;
98149 }
98150
98151 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
98152 + rc = -EPERM;
98153 + goto put_task_struct;
98154 + }
98155 +
98156 mm = mm_access(task, PTRACE_MODE_ATTACH);
98157 if (!mm || IS_ERR(mm)) {
98158 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
98159 diff --git a/mm/rmap.c b/mm/rmap.c
98160 index 3e4c721..a5e3e39 100644
98161 --- a/mm/rmap.c
98162 +++ b/mm/rmap.c
98163 @@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98164 struct anon_vma *anon_vma = vma->anon_vma;
98165 struct anon_vma_chain *avc;
98166
98167 +#ifdef CONFIG_PAX_SEGMEXEC
98168 + struct anon_vma_chain *avc_m = NULL;
98169 +#endif
98170 +
98171 might_sleep();
98172 if (unlikely(!anon_vma)) {
98173 struct mm_struct *mm = vma->vm_mm;
98174 @@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98175 if (!avc)
98176 goto out_enomem;
98177
98178 +#ifdef CONFIG_PAX_SEGMEXEC
98179 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
98180 + if (!avc_m)
98181 + goto out_enomem_free_avc;
98182 +#endif
98183 +
98184 anon_vma = find_mergeable_anon_vma(vma);
98185 allocated = NULL;
98186 if (!anon_vma) {
98187 @@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98188 /* page_table_lock to protect against threads */
98189 spin_lock(&mm->page_table_lock);
98190 if (likely(!vma->anon_vma)) {
98191 +
98192 +#ifdef CONFIG_PAX_SEGMEXEC
98193 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
98194 +
98195 + if (vma_m) {
98196 + BUG_ON(vma_m->anon_vma);
98197 + vma_m->anon_vma = anon_vma;
98198 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
98199 + avc_m = NULL;
98200 + }
98201 +#endif
98202 +
98203 vma->anon_vma = anon_vma;
98204 anon_vma_chain_link(vma, avc, anon_vma);
98205 allocated = NULL;
98206 @@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98207
98208 if (unlikely(allocated))
98209 put_anon_vma(allocated);
98210 +
98211 +#ifdef CONFIG_PAX_SEGMEXEC
98212 + if (unlikely(avc_m))
98213 + anon_vma_chain_free(avc_m);
98214 +#endif
98215 +
98216 if (unlikely(avc))
98217 anon_vma_chain_free(avc);
98218 }
98219 return 0;
98220
98221 out_enomem_free_avc:
98222 +
98223 +#ifdef CONFIG_PAX_SEGMEXEC
98224 + if (avc_m)
98225 + anon_vma_chain_free(avc_m);
98226 +#endif
98227 +
98228 anon_vma_chain_free(avc);
98229 out_enomem:
98230 return -ENOMEM;
98231 @@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
98232 * Attach the anon_vmas from src to dst.
98233 * Returns 0 on success, -ENOMEM on failure.
98234 */
98235 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98236 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
98237 {
98238 struct anon_vma_chain *avc, *pavc;
98239 struct anon_vma *root = NULL;
98240 @@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98241 * the corresponding VMA in the parent process is attached to.
98242 * Returns 0 on success, non-zero on failure.
98243 */
98244 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
98245 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
98246 {
98247 struct anon_vma_chain *avc;
98248 struct anon_vma *anon_vma;
98249 @@ -376,8 +410,10 @@ static void anon_vma_ctor(void *data)
98250 void __init anon_vma_init(void)
98251 {
98252 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
98253 - 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
98254 - anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
98255 + 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
98256 + anon_vma_ctor);
98257 + anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
98258 + SLAB_PANIC|SLAB_NO_SANITIZE);
98259 }
98260
98261 /*
98262 diff --git a/mm/shmem.c b/mm/shmem.c
98263 index 185836b..d7255a1 100644
98264 --- a/mm/shmem.c
98265 +++ b/mm/shmem.c
98266 @@ -33,7 +33,7 @@
98267 #include <linux/swap.h>
98268 #include <linux/aio.h>
98269
98270 -static struct vfsmount *shm_mnt;
98271 +struct vfsmount *shm_mnt;
98272
98273 #ifdef CONFIG_SHMEM
98274 /*
98275 @@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
98276 #define BOGO_DIRENT_SIZE 20
98277
98278 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
98279 -#define SHORT_SYMLINK_LEN 128
98280 +#define SHORT_SYMLINK_LEN 64
98281
98282 /*
98283 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
98284 @@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
98285 static int shmem_xattr_validate(const char *name)
98286 {
98287 struct { const char *prefix; size_t len; } arr[] = {
98288 +
98289 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98290 + { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
98291 +#endif
98292 +
98293 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
98294 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
98295 };
98296 @@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
98297 if (err)
98298 return err;
98299
98300 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98301 + if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
98302 + if (strcmp(name, XATTR_NAME_PAX_FLAGS))
98303 + return -EOPNOTSUPP;
98304 + if (size > 8)
98305 + return -EINVAL;
98306 + }
98307 +#endif
98308 +
98309 return simple_xattr_set(&info->xattrs, name, value, size, flags);
98310 }
98311
98312 @@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
98313 int err = -ENOMEM;
98314
98315 /* Round up to L1_CACHE_BYTES to resist false sharing */
98316 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
98317 - L1_CACHE_BYTES), GFP_KERNEL);
98318 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
98319 if (!sbinfo)
98320 return -ENOMEM;
98321
98322 diff --git a/mm/slab.c b/mm/slab.c
98323 index f34e053..78a3839 100644
98324 --- a/mm/slab.c
98325 +++ b/mm/slab.c
98326 @@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98327 if ((x)->max_freeable < i) \
98328 (x)->max_freeable = i; \
98329 } while (0)
98330 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
98331 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
98332 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
98333 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
98334 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
98335 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
98336 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
98337 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
98338 +#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
98339 +#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
98340 #else
98341 #define STATS_INC_ACTIVE(x) do { } while (0)
98342 #define STATS_DEC_ACTIVE(x) do { } while (0)
98343 @@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98344 #define STATS_INC_ALLOCMISS(x) do { } while (0)
98345 #define STATS_INC_FREEHIT(x) do { } while (0)
98346 #define STATS_INC_FREEMISS(x) do { } while (0)
98347 +#define STATS_INC_SANITIZED(x) do { } while (0)
98348 +#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
98349 #endif
98350
98351 #if DEBUG
98352 @@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
98353 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
98354 */
98355 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
98356 - const struct page *page, void *obj)
98357 + const struct page *page, const void *obj)
98358 {
98359 u32 offset = (obj - page->s_mem);
98360 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
98361 @@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
98362 * structures first. Without this, further allocations will bug.
98363 */
98364 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
98365 - kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
98366 + kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
98367 slab_state = PARTIAL_NODE;
98368
98369 slab_early_init = 0;
98370 @@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
98371
98372 cachep = find_mergeable(size, align, flags, name, ctor);
98373 if (cachep) {
98374 - cachep->refcount++;
98375 + atomic_inc(&cachep->refcount);
98376
98377 /*
98378 * Adjust the object sizes so that we clear
98379 @@ -3352,6 +3356,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
98380 struct array_cache *ac = cpu_cache_get(cachep);
98381
98382 check_irq_off();
98383 +
98384 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98385 + if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
98386 + STATS_INC_NOT_SANITIZED(cachep);
98387 + else {
98388 + memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
98389 +
98390 + if (cachep->ctor)
98391 + cachep->ctor(objp);
98392 +
98393 + STATS_INC_SANITIZED(cachep);
98394 + }
98395 +#endif
98396 +
98397 kmemleak_free_recursive(objp, cachep->flags);
98398 objp = cache_free_debugcheck(cachep, objp, caller);
98399
98400 @@ -3557,6 +3575,7 @@ void kfree(const void *objp)
98401
98402 if (unlikely(ZERO_OR_NULL_PTR(objp)))
98403 return;
98404 + VM_BUG_ON(!virt_addr_valid(objp));
98405 local_irq_save(flags);
98406 kfree_debugcheck(objp);
98407 c = virt_to_cache(objp);
98408 @@ -3979,14 +3998,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
98409 }
98410 /* cpu stats */
98411 {
98412 - unsigned long allochit = atomic_read(&cachep->allochit);
98413 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
98414 - unsigned long freehit = atomic_read(&cachep->freehit);
98415 - unsigned long freemiss = atomic_read(&cachep->freemiss);
98416 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
98417 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
98418 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
98419 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
98420
98421 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
98422 allochit, allocmiss, freehit, freemiss);
98423 }
98424 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98425 + {
98426 + unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
98427 + unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
98428 +
98429 + seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
98430 + }
98431 +#endif
98432 #endif
98433 }
98434
98435 @@ -4200,13 +4227,69 @@ static const struct file_operations proc_slabstats_operations = {
98436 static int __init slab_proc_init(void)
98437 {
98438 #ifdef CONFIG_DEBUG_SLAB_LEAK
98439 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
98440 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
98441 #endif
98442 return 0;
98443 }
98444 module_init(slab_proc_init);
98445 #endif
98446
98447 +bool is_usercopy_object(const void *ptr)
98448 +{
98449 + struct page *page;
98450 + struct kmem_cache *cachep;
98451 +
98452 + if (ZERO_OR_NULL_PTR(ptr))
98453 + return false;
98454 +
98455 + if (!slab_is_available())
98456 + return false;
98457 +
98458 + if (!virt_addr_valid(ptr))
98459 + return false;
98460 +
98461 + page = virt_to_head_page(ptr);
98462 +
98463 + if (!PageSlab(page))
98464 + return false;
98465 +
98466 + cachep = page->slab_cache;
98467 + return cachep->flags & SLAB_USERCOPY;
98468 +}
98469 +
98470 +#ifdef CONFIG_PAX_USERCOPY
98471 +const char *check_heap_object(const void *ptr, unsigned long n)
98472 +{
98473 + struct page *page;
98474 + struct kmem_cache *cachep;
98475 + unsigned int objnr;
98476 + unsigned long offset;
98477 +
98478 + if (ZERO_OR_NULL_PTR(ptr))
98479 + return "<null>";
98480 +
98481 + if (!virt_addr_valid(ptr))
98482 + return NULL;
98483 +
98484 + page = virt_to_head_page(ptr);
98485 +
98486 + if (!PageSlab(page))
98487 + return NULL;
98488 +
98489 + cachep = page->slab_cache;
98490 + if (!(cachep->flags & SLAB_USERCOPY))
98491 + return cachep->name;
98492 +
98493 + objnr = obj_to_index(cachep, page, ptr);
98494 + BUG_ON(objnr >= cachep->num);
98495 + offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
98496 + if (offset <= cachep->object_size && n <= cachep->object_size - offset)
98497 + return NULL;
98498 +
98499 + return cachep->name;
98500 +}
98501 +#endif
98502 +
98503 /**
98504 * ksize - get the actual amount of memory allocated for a given object
98505 * @objp: Pointer to the object
98506 diff --git a/mm/slab.h b/mm/slab.h
98507 index ab019e6..fbcac34 100644
98508 --- a/mm/slab.h
98509 +++ b/mm/slab.h
98510 @@ -22,7 +22,7 @@ struct kmem_cache {
98511 unsigned int align; /* Alignment as calculated */
98512 unsigned long flags; /* Active flags on the slab */
98513 const char *name; /* Slab name for sysfs */
98514 - int refcount; /* Use counter */
98515 + atomic_t refcount; /* Use counter */
98516 void (*ctor)(void *); /* Called on object slot creation */
98517 struct list_head list; /* List of all slab caches on the system */
98518 };
98519 @@ -66,6 +66,20 @@ extern struct list_head slab_caches;
98520 /* The slab cache that manages slab cache information */
98521 extern struct kmem_cache *kmem_cache;
98522
98523 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98524 +#ifdef CONFIG_X86_64
98525 +#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
98526 +#else
98527 +#define PAX_MEMORY_SANITIZE_VALUE '\xff'
98528 +#endif
98529 +enum pax_sanitize_mode {
98530 + PAX_SANITIZE_SLAB_OFF = 0,
98531 + PAX_SANITIZE_SLAB_FAST,
98532 + PAX_SANITIZE_SLAB_FULL,
98533 +};
98534 +extern enum pax_sanitize_mode pax_sanitize_slab;
98535 +#endif
98536 +
98537 unsigned long calculate_alignment(unsigned long flags,
98538 unsigned long align, unsigned long size);
98539
98540 @@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
98541
98542 /* Legal flag mask for kmem_cache_create(), for various configurations */
98543 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
98544 - SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
98545 + SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
98546 + SLAB_USERCOPY | SLAB_NO_SANITIZE)
98547
98548 #if defined(CONFIG_DEBUG_SLAB)
98549 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
98550 @@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
98551 return s;
98552
98553 page = virt_to_head_page(x);
98554 +
98555 + BUG_ON(!PageSlab(page));
98556 +
98557 cachep = page->slab_cache;
98558 if (slab_equal_or_root(cachep, s))
98559 return cachep;
98560 diff --git a/mm/slab_common.c b/mm/slab_common.c
98561 index dcdab81..3576646 100644
98562 --- a/mm/slab_common.c
98563 +++ b/mm/slab_common.c
98564 @@ -25,11 +25,35 @@
98565
98566 #include "slab.h"
98567
98568 -enum slab_state slab_state;
98569 +enum slab_state slab_state __read_only;
98570 LIST_HEAD(slab_caches);
98571 DEFINE_MUTEX(slab_mutex);
98572 struct kmem_cache *kmem_cache;
98573
98574 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98575 +enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
98576 +static int __init pax_sanitize_slab_setup(char *str)
98577 +{
98578 + if (!str)
98579 + return 0;
98580 +
98581 + if (!strcmp(str, "0") || !strcmp(str, "off")) {
98582 + pr_info("PaX slab sanitization: %s\n", "disabled");
98583 + pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
98584 + } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
98585 + pr_info("PaX slab sanitization: %s\n", "fast");
98586 + pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
98587 + } else if (!strcmp(str, "full")) {
98588 + pr_info("PaX slab sanitization: %s\n", "full");
98589 + pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
98590 + } else
98591 + pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
98592 +
98593 + return 0;
98594 +}
98595 +early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
98596 +#endif
98597 +
98598 /*
98599 * Set of flags that will prevent slab merging
98600 */
98601 @@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
98602 * Merge control. If this is set then no merging of slab caches will occur.
98603 * (Could be removed. This was introduced to pacify the merge skeptics.)
98604 */
98605 -static int slab_nomerge;
98606 +static int slab_nomerge = 1;
98607
98608 static int __init setup_slab_nomerge(char *str)
98609 {
98610 @@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
98611 /*
98612 * We may have set a slab to be unmergeable during bootstrap.
98613 */
98614 - if (s->refcount < 0)
98615 + if (atomic_read(&s->refcount) < 0)
98616 return 1;
98617
98618 return 0;
98619 @@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
98620 if (err)
98621 goto out_free_cache;
98622
98623 - s->refcount = 1;
98624 + atomic_set(&s->refcount, 1);
98625 list_add(&s->list, &slab_caches);
98626 out:
98627 if (err)
98628 @@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
98629 */
98630 flags &= CACHE_CREATE_MASK;
98631
98632 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98633 + if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
98634 + flags |= SLAB_NO_SANITIZE;
98635 + else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
98636 + flags &= ~SLAB_NO_SANITIZE;
98637 +#endif
98638 +
98639 s = __kmem_cache_alias(name, size, align, flags, ctor);
98640 if (s)
98641 goto out_unlock;
98642 @@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98643
98644 mutex_lock(&slab_mutex);
98645
98646 - s->refcount--;
98647 - if (s->refcount)
98648 + if (!atomic_dec_and_test(&s->refcount))
98649 goto out_unlock;
98650
98651 if (memcg_cleanup_cache_params(s) != 0)
98652 @@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98653 rcu_barrier();
98654
98655 memcg_free_cache_params(s);
98656 -#ifdef SLAB_SUPPORTS_SYSFS
98657 +#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
98658 sysfs_slab_remove(s);
98659 #else
98660 slab_kmem_cache_release(s);
98661 @@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
98662 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
98663 name, size, err);
98664
98665 - s->refcount = -1; /* Exempt from merging for now */
98666 + atomic_set(&s->refcount, -1); /* Exempt from merging for now */
98667 }
98668
98669 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98670 @@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98671
98672 create_boot_cache(s, name, size, flags);
98673 list_add(&s->list, &slab_caches);
98674 - s->refcount = 1;
98675 + atomic_set(&s->refcount, 1);
98676 return s;
98677 }
98678
98679 @@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
98680 EXPORT_SYMBOL(kmalloc_dma_caches);
98681 #endif
98682
98683 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98684 +struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
98685 +EXPORT_SYMBOL(kmalloc_usercopy_caches);
98686 +#endif
98687 +
98688 /*
98689 * Conversion table for small slabs sizes / 8 to the index in the
98690 * kmalloc array. This is necessary for slabs < 192 since we have non power
98691 @@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
98692 return kmalloc_dma_caches[index];
98693
98694 #endif
98695 +
98696 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98697 + if (unlikely((flags & GFP_USERCOPY)))
98698 + return kmalloc_usercopy_caches[index];
98699 +
98700 +#endif
98701 +
98702 return kmalloc_caches[index];
98703 }
98704
98705 @@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
98706 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
98707 if (!kmalloc_caches[i]) {
98708 kmalloc_caches[i] = create_kmalloc_cache(NULL,
98709 - 1 << i, flags);
98710 + 1 << i, SLAB_USERCOPY | flags);
98711 }
98712
98713 /*
98714 @@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
98715 * earlier power of two caches
98716 */
98717 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
98718 - kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
98719 + kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
98720
98721 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
98722 - kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
98723 + kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
98724 }
98725
98726 /* Kmalloc array is now usable */
98727 @@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
98728 }
98729 }
98730 #endif
98731 +
98732 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98733 + for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
98734 + struct kmem_cache *s = kmalloc_caches[i];
98735 +
98736 + if (s) {
98737 + int size = kmalloc_size(i);
98738 + char *n = kasprintf(GFP_NOWAIT,
98739 + "usercopy-kmalloc-%d", size);
98740 +
98741 + BUG_ON(!n);
98742 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
98743 + size, SLAB_USERCOPY | flags);
98744 + }
98745 + }
98746 +#endif
98747 +
98748 }
98749 #endif /* !CONFIG_SLOB */
98750
98751 @@ -830,6 +889,9 @@ void print_slabinfo_header(struct seq_file *m)
98752 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
98753 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
98754 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
98755 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98756 + seq_puts(m, " : pax <sanitized> <not_sanitized>");
98757 +#endif
98758 #endif
98759 seq_putc(m, '\n');
98760 }
98761 diff --git a/mm/slob.c b/mm/slob.c
98762 index 96a8620..3e7e663 100644
98763 --- a/mm/slob.c
98764 +++ b/mm/slob.c
98765 @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
98766 /*
98767 * Return the size of a slob block.
98768 */
98769 -static slobidx_t slob_units(slob_t *s)
98770 +static slobidx_t slob_units(const slob_t *s)
98771 {
98772 if (s->units > 0)
98773 return s->units;
98774 @@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
98775 /*
98776 * Return the next free slob block pointer after this one.
98777 */
98778 -static slob_t *slob_next(slob_t *s)
98779 +static slob_t *slob_next(const slob_t *s)
98780 {
98781 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
98782 slobidx_t next;
98783 @@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
98784 /*
98785 * Returns true if s is the last free block in its page.
98786 */
98787 -static int slob_last(slob_t *s)
98788 +static int slob_last(const slob_t *s)
98789 {
98790 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
98791 }
98792
98793 -static void *slob_new_pages(gfp_t gfp, int order, int node)
98794 +static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
98795 {
98796 - void *page;
98797 + struct page *page;
98798
98799 #ifdef CONFIG_NUMA
98800 if (node != NUMA_NO_NODE)
98801 @@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
98802 if (!page)
98803 return NULL;
98804
98805 - return page_address(page);
98806 + __SetPageSlab(page);
98807 + return page;
98808 }
98809
98810 -static void slob_free_pages(void *b, int order)
98811 +static void slob_free_pages(struct page *sp, int order)
98812 {
98813 if (current->reclaim_state)
98814 current->reclaim_state->reclaimed_slab += 1 << order;
98815 - free_pages((unsigned long)b, order);
98816 + __ClearPageSlab(sp);
98817 + page_mapcount_reset(sp);
98818 + sp->private = 0;
98819 + __free_pages(sp, order);
98820 }
98821
98822 /*
98823 @@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98824
98825 /* Not enough space: must allocate a new page */
98826 if (!b) {
98827 - b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98828 - if (!b)
98829 + sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98830 + if (!sp)
98831 return NULL;
98832 - sp = virt_to_page(b);
98833 - __SetPageSlab(sp);
98834 + b = page_address(sp);
98835
98836 spin_lock_irqsave(&slob_lock, flags);
98837 sp->units = SLOB_UNITS(PAGE_SIZE);
98838 sp->freelist = b;
98839 + sp->private = 0;
98840 INIT_LIST_HEAD(&sp->lru);
98841 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
98842 set_slob_page_free(sp, slob_list);
98843 @@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98844 /*
98845 * slob_free: entry point into the slob allocator.
98846 */
98847 -static void slob_free(void *block, int size)
98848 +static void slob_free(struct kmem_cache *c, void *block, int size)
98849 {
98850 struct page *sp;
98851 slob_t *prev, *next, *b = (slob_t *)block;
98852 @@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
98853 if (slob_page_free(sp))
98854 clear_slob_page_free(sp);
98855 spin_unlock_irqrestore(&slob_lock, flags);
98856 - __ClearPageSlab(sp);
98857 - page_mapcount_reset(sp);
98858 - slob_free_pages(b, 0);
98859 + slob_free_pages(sp, 0);
98860 return;
98861 }
98862
98863 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98864 + if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
98865 + memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
98866 +#endif
98867 +
98868 if (!slob_page_free(sp)) {
98869 /* This slob page is about to become partially free. Easy! */
98870 sp->units = units;
98871 @@ -424,11 +431,10 @@ out:
98872 */
98873
98874 static __always_inline void *
98875 -__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98876 +__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
98877 {
98878 - unsigned int *m;
98879 - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98880 - void *ret;
98881 + slob_t *m;
98882 + void *ret = NULL;
98883
98884 gfp &= gfp_allowed_mask;
98885
98886 @@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98887
98888 if (!m)
98889 return NULL;
98890 - *m = size;
98891 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
98892 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
98893 + m[0].units = size;
98894 + m[1].units = align;
98895 ret = (void *)m + align;
98896
98897 trace_kmalloc_node(caller, ret,
98898 size, size + align, gfp, node);
98899 } else {
98900 unsigned int order = get_order(size);
98901 + struct page *page;
98902
98903 if (likely(order))
98904 gfp |= __GFP_COMP;
98905 - ret = slob_new_pages(gfp, order, node);
98906 + page = slob_new_pages(gfp, order, node);
98907 + if (page) {
98908 + ret = page_address(page);
98909 + page->private = size;
98910 + }
98911
98912 trace_kmalloc_node(caller, ret,
98913 size, PAGE_SIZE << order, gfp, node);
98914 }
98915
98916 - kmemleak_alloc(ret, size, 1, gfp);
98917 + return ret;
98918 +}
98919 +
98920 +static __always_inline void *
98921 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98922 +{
98923 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98924 + void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
98925 +
98926 + if (!ZERO_OR_NULL_PTR(ret))
98927 + kmemleak_alloc(ret, size, 1, gfp);
98928 return ret;
98929 }
98930
98931 @@ -491,34 +515,112 @@ void kfree(const void *block)
98932 return;
98933 kmemleak_free(block);
98934
98935 + VM_BUG_ON(!virt_addr_valid(block));
98936 sp = virt_to_page(block);
98937 - if (PageSlab(sp)) {
98938 + VM_BUG_ON(!PageSlab(sp));
98939 + if (!sp->private) {
98940 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98941 - unsigned int *m = (unsigned int *)(block - align);
98942 - slob_free(m, *m + align);
98943 - } else
98944 + slob_t *m = (slob_t *)(block - align);
98945 + slob_free(NULL, m, m[0].units + align);
98946 + } else {
98947 + __ClearPageSlab(sp);
98948 + page_mapcount_reset(sp);
98949 + sp->private = 0;
98950 __free_pages(sp, compound_order(sp));
98951 + }
98952 }
98953 EXPORT_SYMBOL(kfree);
98954
98955 +bool is_usercopy_object(const void *ptr)
98956 +{
98957 + if (!slab_is_available())
98958 + return false;
98959 +
98960 + // PAX: TODO
98961 +
98962 + return false;
98963 +}
98964 +
98965 +#ifdef CONFIG_PAX_USERCOPY
98966 +const char *check_heap_object(const void *ptr, unsigned long n)
98967 +{
98968 + struct page *page;
98969 + const slob_t *free;
98970 + const void *base;
98971 + unsigned long flags;
98972 +
98973 + if (ZERO_OR_NULL_PTR(ptr))
98974 + return "<null>";
98975 +
98976 + if (!virt_addr_valid(ptr))
98977 + return NULL;
98978 +
98979 + page = virt_to_head_page(ptr);
98980 + if (!PageSlab(page))
98981 + return NULL;
98982 +
98983 + if (page->private) {
98984 + base = page;
98985 + if (base <= ptr && n <= page->private - (ptr - base))
98986 + return NULL;
98987 + return "<slob>";
98988 + }
98989 +
98990 + /* some tricky double walking to find the chunk */
98991 + spin_lock_irqsave(&slob_lock, flags);
98992 + base = (void *)((unsigned long)ptr & PAGE_MASK);
98993 + free = page->freelist;
98994 +
98995 + while (!slob_last(free) && (void *)free <= ptr) {
98996 + base = free + slob_units(free);
98997 + free = slob_next(free);
98998 + }
98999 +
99000 + while (base < (void *)free) {
99001 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
99002 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
99003 + int offset;
99004 +
99005 + if (ptr < base + align)
99006 + break;
99007 +
99008 + offset = ptr - base - align;
99009 + if (offset >= m) {
99010 + base += size;
99011 + continue;
99012 + }
99013 +
99014 + if (n > m - offset)
99015 + break;
99016 +
99017 + spin_unlock_irqrestore(&slob_lock, flags);
99018 + return NULL;
99019 + }
99020 +
99021 + spin_unlock_irqrestore(&slob_lock, flags);
99022 + return "<slob>";
99023 +}
99024 +#endif
99025 +
99026 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
99027 size_t ksize(const void *block)
99028 {
99029 struct page *sp;
99030 int align;
99031 - unsigned int *m;
99032 + slob_t *m;
99033
99034 BUG_ON(!block);
99035 if (unlikely(block == ZERO_SIZE_PTR))
99036 return 0;
99037
99038 sp = virt_to_page(block);
99039 - if (unlikely(!PageSlab(sp)))
99040 - return PAGE_SIZE << compound_order(sp);
99041 + VM_BUG_ON(!PageSlab(sp));
99042 + if (sp->private)
99043 + return sp->private;
99044
99045 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99046 - m = (unsigned int *)(block - align);
99047 - return SLOB_UNITS(*m) * SLOB_UNIT;
99048 + m = (slob_t *)(block - align);
99049 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
99050 }
99051 EXPORT_SYMBOL(ksize);
99052
99053 @@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
99054
99055 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
99056 {
99057 - void *b;
99058 + void *b = NULL;
99059
99060 flags &= gfp_allowed_mask;
99061
99062 lockdep_trace_alloc(flags);
99063
99064 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99065 + b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
99066 +#else
99067 if (c->size < PAGE_SIZE) {
99068 b = slob_alloc(c->size, flags, c->align, node);
99069 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99070 SLOB_UNITS(c->size) * SLOB_UNIT,
99071 flags, node);
99072 } else {
99073 - b = slob_new_pages(flags, get_order(c->size), node);
99074 + struct page *sp;
99075 +
99076 + sp = slob_new_pages(flags, get_order(c->size), node);
99077 + if (sp) {
99078 + b = page_address(sp);
99079 + sp->private = c->size;
99080 + }
99081 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99082 PAGE_SIZE << get_order(c->size),
99083 flags, node);
99084 }
99085 +#endif
99086
99087 if (b && c->ctor)
99088 c->ctor(b);
99089 @@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
99090 EXPORT_SYMBOL(kmem_cache_alloc_node);
99091 #endif
99092
99093 -static void __kmem_cache_free(void *b, int size)
99094 +static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
99095 {
99096 - if (size < PAGE_SIZE)
99097 - slob_free(b, size);
99098 + struct page *sp;
99099 +
99100 + sp = virt_to_page(b);
99101 + BUG_ON(!PageSlab(sp));
99102 + if (!sp->private)
99103 + slob_free(c, b, size);
99104 else
99105 - slob_free_pages(b, get_order(size));
99106 + slob_free_pages(sp, get_order(size));
99107 }
99108
99109 static void kmem_rcu_free(struct rcu_head *head)
99110 @@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
99111 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
99112 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
99113
99114 - __kmem_cache_free(b, slob_rcu->size);
99115 + __kmem_cache_free(NULL, b, slob_rcu->size);
99116 }
99117
99118 void kmem_cache_free(struct kmem_cache *c, void *b)
99119 {
99120 + int size = c->size;
99121 +
99122 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99123 + if (size + c->align < PAGE_SIZE) {
99124 + size += c->align;
99125 + b -= c->align;
99126 + }
99127 +#endif
99128 +
99129 kmemleak_free_recursive(b, c->flags);
99130 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
99131 struct slob_rcu *slob_rcu;
99132 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
99133 - slob_rcu->size = c->size;
99134 + slob_rcu = b + (size - sizeof(struct slob_rcu));
99135 + slob_rcu->size = size;
99136 call_rcu(&slob_rcu->head, kmem_rcu_free);
99137 } else {
99138 - __kmem_cache_free(b, c->size);
99139 + __kmem_cache_free(c, b, size);
99140 }
99141
99142 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99143 + trace_kfree(_RET_IP_, b);
99144 +#else
99145 trace_kmem_cache_free(_RET_IP_, b);
99146 +#endif
99147 +
99148 }
99149 EXPORT_SYMBOL(kmem_cache_free);
99150
99151 diff --git a/mm/slub.c b/mm/slub.c
99152 index ae7b9f1..7b3fdbe 100644
99153 --- a/mm/slub.c
99154 +++ b/mm/slub.c
99155 @@ -197,7 +197,7 @@ struct track {
99156
99157 enum track_item { TRACK_ALLOC, TRACK_FREE };
99158
99159 -#ifdef CONFIG_SYSFS
99160 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99161 static int sysfs_slab_add(struct kmem_cache *);
99162 static int sysfs_slab_alias(struct kmem_cache *, const char *);
99163 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
99164 @@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
99165 if (!t->addr)
99166 return;
99167
99168 - pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
99169 + pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
99170 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
99171 #ifdef CONFIG_STACKTRACE
99172 {
99173 @@ -2645,6 +2645,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
99174
99175 slab_free_hook(s, x);
99176
99177 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99178 + if (!(s->flags & SLAB_NO_SANITIZE)) {
99179 + memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
99180 + if (s->ctor)
99181 + s->ctor(x);
99182 + }
99183 +#endif
99184 +
99185 redo:
99186 /*
99187 * Determine the currently cpus per cpu slab.
99188 @@ -2982,6 +2990,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
99189 s->inuse = size;
99190
99191 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
99192 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99193 + (!(flags & SLAB_NO_SANITIZE)) ||
99194 +#endif
99195 s->ctor)) {
99196 /*
99197 * Relocate free pointer after the object if it is not
99198 @@ -3301,6 +3312,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
99199 EXPORT_SYMBOL(__kmalloc_node);
99200 #endif
99201
99202 +bool is_usercopy_object(const void *ptr)
99203 +{
99204 + struct page *page;
99205 + struct kmem_cache *s;
99206 +
99207 + if (ZERO_OR_NULL_PTR(ptr))
99208 + return false;
99209 +
99210 + if (!slab_is_available())
99211 + return false;
99212 +
99213 + if (!virt_addr_valid(ptr))
99214 + return false;
99215 +
99216 + page = virt_to_head_page(ptr);
99217 +
99218 + if (!PageSlab(page))
99219 + return false;
99220 +
99221 + s = page->slab_cache;
99222 + return s->flags & SLAB_USERCOPY;
99223 +}
99224 +
99225 +#ifdef CONFIG_PAX_USERCOPY
99226 +const char *check_heap_object(const void *ptr, unsigned long n)
99227 +{
99228 + struct page *page;
99229 + struct kmem_cache *s;
99230 + unsigned long offset;
99231 +
99232 + if (ZERO_OR_NULL_PTR(ptr))
99233 + return "<null>";
99234 +
99235 + if (!virt_addr_valid(ptr))
99236 + return NULL;
99237 +
99238 + page = virt_to_head_page(ptr);
99239 +
99240 + if (!PageSlab(page))
99241 + return NULL;
99242 +
99243 + s = page->slab_cache;
99244 + if (!(s->flags & SLAB_USERCOPY))
99245 + return s->name;
99246 +
99247 + offset = (ptr - page_address(page)) % s->size;
99248 + if (offset <= s->object_size && n <= s->object_size - offset)
99249 + return NULL;
99250 +
99251 + return s->name;
99252 +}
99253 +#endif
99254 +
99255 size_t ksize(const void *object)
99256 {
99257 struct page *page;
99258 @@ -3329,6 +3393,7 @@ void kfree(const void *x)
99259 if (unlikely(ZERO_OR_NULL_PTR(x)))
99260 return;
99261
99262 + VM_BUG_ON(!virt_addr_valid(x));
99263 page = virt_to_head_page(x);
99264 if (unlikely(!PageSlab(page))) {
99265 BUG_ON(!PageCompound(page));
99266 @@ -3624,7 +3689,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99267 int i;
99268 struct kmem_cache *c;
99269
99270 - s->refcount++;
99271 + atomic_inc(&s->refcount);
99272
99273 /*
99274 * Adjust the object sizes so that we clear
99275 @@ -3643,7 +3708,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99276 }
99277
99278 if (sysfs_slab_alias(s, name)) {
99279 - s->refcount--;
99280 + atomic_dec(&s->refcount);
99281 s = NULL;
99282 }
99283 }
99284 @@ -3760,7 +3825,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
99285 }
99286 #endif
99287
99288 -#ifdef CONFIG_SYSFS
99289 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99290 static int count_inuse(struct page *page)
99291 {
99292 return page->inuse;
99293 @@ -4041,7 +4106,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
99294 len += sprintf(buf + len, "%7ld ", l->count);
99295
99296 if (l->addr)
99297 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99298 + len += sprintf(buf + len, "%pS", NULL);
99299 +#else
99300 len += sprintf(buf + len, "%pS", (void *)l->addr);
99301 +#endif
99302 else
99303 len += sprintf(buf + len, "<not-available>");
99304
99305 @@ -4143,12 +4212,12 @@ static void __init resiliency_test(void)
99306 validate_slab_cache(kmalloc_caches[9]);
99307 }
99308 #else
99309 -#ifdef CONFIG_SYSFS
99310 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99311 static void resiliency_test(void) {};
99312 #endif
99313 #endif
99314
99315 -#ifdef CONFIG_SYSFS
99316 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99317 enum slab_stat_type {
99318 SL_ALL, /* All slabs */
99319 SL_PARTIAL, /* Only partially allocated slabs */
99320 @@ -4385,13 +4454,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
99321 {
99322 if (!s->ctor)
99323 return 0;
99324 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99325 + return sprintf(buf, "%pS\n", NULL);
99326 +#else
99327 return sprintf(buf, "%pS\n", s->ctor);
99328 +#endif
99329 }
99330 SLAB_ATTR_RO(ctor);
99331
99332 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
99333 {
99334 - return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
99335 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
99336 }
99337 SLAB_ATTR_RO(aliases);
99338
99339 @@ -4479,6 +4552,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
99340 SLAB_ATTR_RO(cache_dma);
99341 #endif
99342
99343 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99344 +static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
99345 +{
99346 + return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
99347 +}
99348 +SLAB_ATTR_RO(usercopy);
99349 +#endif
99350 +
99351 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99352 +static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
99353 +{
99354 + return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
99355 +}
99356 +SLAB_ATTR_RO(sanitize);
99357 +#endif
99358 +
99359 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
99360 {
99361 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
99362 @@ -4534,7 +4623,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
99363 * as well as cause other issues like converting a mergeable
99364 * cache into an umergeable one.
99365 */
99366 - if (s->refcount > 1)
99367 + if (atomic_read(&s->refcount) > 1)
99368 return -EINVAL;
99369
99370 s->flags &= ~SLAB_TRACE;
99371 @@ -4654,7 +4743,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
99372 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
99373 size_t length)
99374 {
99375 - if (s->refcount > 1)
99376 + if (atomic_read(&s->refcount) > 1)
99377 return -EINVAL;
99378
99379 s->flags &= ~SLAB_FAILSLAB;
99380 @@ -4824,6 +4913,12 @@ static struct attribute *slab_attrs[] = {
99381 #ifdef CONFIG_ZONE_DMA
99382 &cache_dma_attr.attr,
99383 #endif
99384 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99385 + &usercopy_attr.attr,
99386 +#endif
99387 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99388 + &sanitize_attr.attr,
99389 +#endif
99390 #ifdef CONFIG_NUMA
99391 &remote_node_defrag_ratio_attr.attr,
99392 #endif
99393 @@ -5068,6 +5163,7 @@ static char *create_unique_id(struct kmem_cache *s)
99394 return name;
99395 }
99396
99397 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99398 static int sysfs_slab_add(struct kmem_cache *s)
99399 {
99400 int err;
99401 @@ -5141,6 +5237,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
99402 kobject_del(&s->kobj);
99403 kobject_put(&s->kobj);
99404 }
99405 +#endif
99406
99407 /*
99408 * Need to buffer aliases during bootup until sysfs becomes
99409 @@ -5154,6 +5251,7 @@ struct saved_alias {
99410
99411 static struct saved_alias *alias_list;
99412
99413 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99414 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99415 {
99416 struct saved_alias *al;
99417 @@ -5176,6 +5274,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99418 alias_list = al;
99419 return 0;
99420 }
99421 +#endif
99422
99423 static int __init slab_sysfs_init(void)
99424 {
99425 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
99426 index 4cba9c2..b4f9fcc 100644
99427 --- a/mm/sparse-vmemmap.c
99428 +++ b/mm/sparse-vmemmap.c
99429 @@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
99430 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99431 if (!p)
99432 return NULL;
99433 - pud_populate(&init_mm, pud, p);
99434 + pud_populate_kernel(&init_mm, pud, p);
99435 }
99436 return pud;
99437 }
99438 @@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
99439 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99440 if (!p)
99441 return NULL;
99442 - pgd_populate(&init_mm, pgd, p);
99443 + pgd_populate_kernel(&init_mm, pgd, p);
99444 }
99445 return pgd;
99446 }
99447 diff --git a/mm/sparse.c b/mm/sparse.c
99448 index d1b48b6..6e8590e 100644
99449 --- a/mm/sparse.c
99450 +++ b/mm/sparse.c
99451 @@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
99452
99453 for (i = 0; i < PAGES_PER_SECTION; i++) {
99454 if (PageHWPoison(&memmap[i])) {
99455 - atomic_long_sub(1, &num_poisoned_pages);
99456 + atomic_long_sub_unchecked(1, &num_poisoned_pages);
99457 ClearPageHWPoison(&memmap[i]);
99458 }
99459 }
99460 diff --git a/mm/swap.c b/mm/swap.c
99461 index 8a12b33..7068e78 100644
99462 --- a/mm/swap.c
99463 +++ b/mm/swap.c
99464 @@ -31,6 +31,7 @@
99465 #include <linux/memcontrol.h>
99466 #include <linux/gfp.h>
99467 #include <linux/uio.h>
99468 +#include <linux/hugetlb.h>
99469
99470 #include "internal.h"
99471
99472 @@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
99473
99474 __page_cache_release(page);
99475 dtor = get_compound_page_dtor(page);
99476 + if (!PageHuge(page))
99477 + BUG_ON(dtor != free_compound_page);
99478 (*dtor)(page);
99479 }
99480
99481 diff --git a/mm/swapfile.c b/mm/swapfile.c
99482 index 8798b2e..348f9dd 100644
99483 --- a/mm/swapfile.c
99484 +++ b/mm/swapfile.c
99485 @@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
99486
99487 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
99488 /* Activity counter to indicate that a swapon or swapoff has occurred */
99489 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
99490 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
99491
99492 static inline unsigned char swap_count(unsigned char ent)
99493 {
99494 @@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
99495 spin_unlock(&swap_lock);
99496
99497 err = 0;
99498 - atomic_inc(&proc_poll_event);
99499 + atomic_inc_unchecked(&proc_poll_event);
99500 wake_up_interruptible(&proc_poll_wait);
99501
99502 out_dput:
99503 @@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
99504
99505 poll_wait(file, &proc_poll_wait, wait);
99506
99507 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
99508 - seq->poll_event = atomic_read(&proc_poll_event);
99509 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
99510 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99511 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
99512 }
99513
99514 @@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
99515 return ret;
99516
99517 seq = file->private_data;
99518 - seq->poll_event = atomic_read(&proc_poll_event);
99519 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99520 return 0;
99521 }
99522
99523 @@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
99524 (frontswap_map) ? "FS" : "");
99525
99526 mutex_unlock(&swapon_mutex);
99527 - atomic_inc(&proc_poll_event);
99528 + atomic_inc_unchecked(&proc_poll_event);
99529 wake_up_interruptible(&proc_poll_wait);
99530
99531 if (S_ISREG(inode->i_mode))
99532 diff --git a/mm/util.c b/mm/util.c
99533 index fec39d4..3e60325 100644
99534 --- a/mm/util.c
99535 +++ b/mm/util.c
99536 @@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
99537 void arch_pick_mmap_layout(struct mm_struct *mm)
99538 {
99539 mm->mmap_base = TASK_UNMAPPED_BASE;
99540 +
99541 +#ifdef CONFIG_PAX_RANDMMAP
99542 + if (mm->pax_flags & MF_PAX_RANDMMAP)
99543 + mm->mmap_base += mm->delta_mmap;
99544 +#endif
99545 +
99546 mm->get_unmapped_area = arch_get_unmapped_area;
99547 }
99548 #endif
99549 @@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
99550 if (!mm->arg_end)
99551 goto out_mm; /* Shh! No looking before we're done */
99552
99553 + if (gr_acl_handle_procpidmem(task))
99554 + goto out_mm;
99555 +
99556 len = mm->arg_end - mm->arg_start;
99557
99558 if (len > buflen)
99559 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
99560 index 90520af..24231aa 100644
99561 --- a/mm/vmalloc.c
99562 +++ b/mm/vmalloc.c
99563 @@ -40,6 +40,21 @@ struct vfree_deferred {
99564 };
99565 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
99566
99567 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99568 +struct stack_deferred_llist {
99569 + struct llist_head list;
99570 + void *stack;
99571 + void *lowmem_stack;
99572 +};
99573 +
99574 +struct stack_deferred {
99575 + struct stack_deferred_llist list;
99576 + struct work_struct wq;
99577 +};
99578 +
99579 +static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
99580 +#endif
99581 +
99582 static void __vunmap(const void *, int);
99583
99584 static void free_work(struct work_struct *w)
99585 @@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
99586 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
99587 struct llist_node *llnode = llist_del_all(&p->list);
99588 while (llnode) {
99589 - void *p = llnode;
99590 + void *x = llnode;
99591 llnode = llist_next(llnode);
99592 - __vunmap(p, 1);
99593 + __vunmap(x, 1);
99594 }
99595 }
99596
99597 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99598 +static void unmap_work(struct work_struct *w)
99599 +{
99600 + struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
99601 + struct llist_node *llnode = llist_del_all(&p->list.list);
99602 + while (llnode) {
99603 + struct stack_deferred_llist *x =
99604 + llist_entry((struct llist_head *)llnode,
99605 + struct stack_deferred_llist, list);
99606 + void *stack = ACCESS_ONCE(x->stack);
99607 + void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
99608 + llnode = llist_next(llnode);
99609 + __vunmap(stack, 0);
99610 + free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
99611 + }
99612 +}
99613 +#endif
99614 +
99615 /*** Page table manipulation functions ***/
99616
99617 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99618 @@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99619
99620 pte = pte_offset_kernel(pmd, addr);
99621 do {
99622 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99623 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99624 +
99625 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99626 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
99627 + BUG_ON(!pte_exec(*pte));
99628 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
99629 + continue;
99630 + }
99631 +#endif
99632 +
99633 + {
99634 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99635 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99636 + }
99637 } while (pte++, addr += PAGE_SIZE, addr != end);
99638 }
99639
99640 @@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
99641 pte = pte_alloc_kernel(pmd, addr);
99642 if (!pte)
99643 return -ENOMEM;
99644 +
99645 + pax_open_kernel();
99646 do {
99647 struct page *page = pages[*nr];
99648
99649 - if (WARN_ON(!pte_none(*pte)))
99650 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99651 + if (pgprot_val(prot) & _PAGE_NX)
99652 +#endif
99653 +
99654 + if (!pte_none(*pte)) {
99655 + pax_close_kernel();
99656 + WARN_ON(1);
99657 return -EBUSY;
99658 - if (WARN_ON(!page))
99659 + }
99660 + if (!page) {
99661 + pax_close_kernel();
99662 + WARN_ON(1);
99663 return -ENOMEM;
99664 + }
99665 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
99666 (*nr)++;
99667 } while (pte++, addr += PAGE_SIZE, addr != end);
99668 + pax_close_kernel();
99669 return 0;
99670 }
99671
99672 @@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
99673 pmd_t *pmd;
99674 unsigned long next;
99675
99676 - pmd = pmd_alloc(&init_mm, pud, addr);
99677 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
99678 if (!pmd)
99679 return -ENOMEM;
99680 do {
99681 @@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
99682 pud_t *pud;
99683 unsigned long next;
99684
99685 - pud = pud_alloc(&init_mm, pgd, addr);
99686 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
99687 if (!pud)
99688 return -ENOMEM;
99689 do {
99690 @@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
99691 if (addr >= MODULES_VADDR && addr < MODULES_END)
99692 return 1;
99693 #endif
99694 +
99695 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99696 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
99697 + return 1;
99698 +#endif
99699 +
99700 return is_vmalloc_addr(x);
99701 }
99702
99703 @@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
99704
99705 if (!pgd_none(*pgd)) {
99706 pud_t *pud = pud_offset(pgd, addr);
99707 +#ifdef CONFIG_X86
99708 + if (!pud_large(*pud))
99709 +#endif
99710 if (!pud_none(*pud)) {
99711 pmd_t *pmd = pmd_offset(pud, addr);
99712 +#ifdef CONFIG_X86
99713 + if (!pmd_large(*pmd))
99714 +#endif
99715 if (!pmd_none(*pmd)) {
99716 pte_t *ptep, pte;
99717
99718 @@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
99719 for_each_possible_cpu(i) {
99720 struct vmap_block_queue *vbq;
99721 struct vfree_deferred *p;
99722 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99723 + struct stack_deferred *p2;
99724 +#endif
99725
99726 vbq = &per_cpu(vmap_block_queue, i);
99727 spin_lock_init(&vbq->lock);
99728 INIT_LIST_HEAD(&vbq->free);
99729 +
99730 p = &per_cpu(vfree_deferred, i);
99731 init_llist_head(&p->list);
99732 INIT_WORK(&p->wq, free_work);
99733 +
99734 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99735 + p2 = &per_cpu(stack_deferred, i);
99736 + init_llist_head(&p2->list.list);
99737 + INIT_WORK(&p2->wq, unmap_work);
99738 +#endif
99739 }
99740
99741 /* Import existing vmlist entries. */
99742 @@ -1314,6 +1393,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
99743 struct vm_struct *area;
99744
99745 BUG_ON(in_interrupt());
99746 +
99747 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99748 + if (flags & VM_KERNEXEC) {
99749 + if (start != VMALLOC_START || end != VMALLOC_END)
99750 + return NULL;
99751 + start = (unsigned long)MODULES_EXEC_VADDR;
99752 + end = (unsigned long)MODULES_EXEC_END;
99753 + }
99754 +#endif
99755 +
99756 if (flags & VM_IOREMAP)
99757 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
99758
99759 @@ -1519,6 +1608,23 @@ void vunmap(const void *addr)
99760 }
99761 EXPORT_SYMBOL(vunmap);
99762
99763 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99764 +void unmap_process_stacks(struct task_struct *task)
99765 +{
99766 + if (unlikely(in_interrupt())) {
99767 + struct stack_deferred *p = &__get_cpu_var(stack_deferred);
99768 + struct stack_deferred_llist *list = task->stack;
99769 + list->stack = task->stack;
99770 + list->lowmem_stack = task->lowmem_stack;
99771 + if (llist_add((struct llist_node *)&list->list, &p->list.list))
99772 + schedule_work(&p->wq);
99773 + } else {
99774 + __vunmap(task->stack, 0);
99775 + free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
99776 + }
99777 +}
99778 +#endif
99779 +
99780 /**
99781 * vmap - map an array of pages into virtually contiguous space
99782 * @pages: array of page pointers
99783 @@ -1539,6 +1645,11 @@ void *vmap(struct page **pages, unsigned int count,
99784 if (count > totalram_pages)
99785 return NULL;
99786
99787 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99788 + if (!(pgprot_val(prot) & _PAGE_NX))
99789 + flags |= VM_KERNEXEC;
99790 +#endif
99791 +
99792 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
99793 __builtin_return_address(0));
99794 if (!area)
99795 @@ -1641,6 +1752,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
99796 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
99797 goto fail;
99798
99799 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99800 + if (!(pgprot_val(prot) & _PAGE_NX))
99801 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
99802 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
99803 + else
99804 +#endif
99805 +
99806 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
99807 start, end, node, gfp_mask, caller);
99808 if (!area)
99809 @@ -1817,10 +1935,9 @@ EXPORT_SYMBOL(vzalloc_node);
99810 * For tight control over page level allocator and protection flags
99811 * use __vmalloc() instead.
99812 */
99813 -
99814 void *vmalloc_exec(unsigned long size)
99815 {
99816 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
99817 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
99818 NUMA_NO_NODE, __builtin_return_address(0));
99819 }
99820
99821 @@ -2127,6 +2244,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
99822 {
99823 struct vm_struct *area;
99824
99825 + BUG_ON(vma->vm_mirror);
99826 +
99827 size = PAGE_ALIGN(size);
99828
99829 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
99830 @@ -2609,7 +2728,11 @@ static int s_show(struct seq_file *m, void *p)
99831 v->addr, v->addr + v->size, v->size);
99832
99833 if (v->caller)
99834 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99835 + seq_printf(m, " %pK", v->caller);
99836 +#else
99837 seq_printf(m, " %pS", v->caller);
99838 +#endif
99839
99840 if (v->nr_pages)
99841 seq_printf(m, " pages=%d", v->nr_pages);
99842 diff --git a/mm/vmstat.c b/mm/vmstat.c
99843 index 1b12d39..57b29b2 100644
99844 --- a/mm/vmstat.c
99845 +++ b/mm/vmstat.c
99846 @@ -22,6 +22,7 @@
99847 #include <linux/writeback.h>
99848 #include <linux/compaction.h>
99849 #include <linux/mm_inline.h>
99850 +#include <linux/grsecurity.h>
99851
99852 #include "internal.h"
99853
99854 @@ -81,7 +82,7 @@ void vm_events_fold_cpu(int cpu)
99855 *
99856 * vm_stat contains the global counters
99857 */
99858 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99859 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99860 EXPORT_SYMBOL(vm_stat);
99861
99862 #ifdef CONFIG_SMP
99863 @@ -433,7 +434,7 @@ static int fold_diff(int *diff)
99864
99865 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99866 if (diff[i]) {
99867 - atomic_long_add(diff[i], &vm_stat[i]);
99868 + atomic_long_add_unchecked(diff[i], &vm_stat[i]);
99869 changes++;
99870 }
99871 return changes;
99872 @@ -471,7 +472,7 @@ static int refresh_cpu_vm_stats(void)
99873 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
99874 if (v) {
99875
99876 - atomic_long_add(v, &zone->vm_stat[i]);
99877 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99878 global_diff[i] += v;
99879 #ifdef CONFIG_NUMA
99880 /* 3 seconds idle till flush */
99881 @@ -535,7 +536,7 @@ void cpu_vm_stats_fold(int cpu)
99882
99883 v = p->vm_stat_diff[i];
99884 p->vm_stat_diff[i] = 0;
99885 - atomic_long_add(v, &zone->vm_stat[i]);
99886 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99887 global_diff[i] += v;
99888 }
99889 }
99890 @@ -555,8 +556,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
99891 if (pset->vm_stat_diff[i]) {
99892 int v = pset->vm_stat_diff[i];
99893 pset->vm_stat_diff[i] = 0;
99894 - atomic_long_add(v, &zone->vm_stat[i]);
99895 - atomic_long_add(v, &vm_stat[i]);
99896 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99897 + atomic_long_add_unchecked(v, &vm_stat[i]);
99898 }
99899 }
99900 #endif
99901 @@ -1189,10 +1190,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
99902 stat_items_size += sizeof(struct vm_event_state);
99903 #endif
99904
99905 - v = kmalloc(stat_items_size, GFP_KERNEL);
99906 + v = kzalloc(stat_items_size, GFP_KERNEL);
99907 m->private = v;
99908 if (!v)
99909 return ERR_PTR(-ENOMEM);
99910 +
99911 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
99912 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99913 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
99914 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
99915 + && !in_group_p(grsec_proc_gid)
99916 +#endif
99917 + )
99918 + return (unsigned long *)m->private + *pos;
99919 +#endif
99920 +#endif
99921 +
99922 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99923 v[i] = global_page_state(i);
99924 v += NR_VM_ZONE_STAT_ITEMS;
99925 @@ -1424,10 +1437,16 @@ static int __init setup_vmstat(void)
99926 cpu_notifier_register_done();
99927 #endif
99928 #ifdef CONFIG_PROC_FS
99929 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
99930 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
99931 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99932 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
99933 + {
99934 + mode_t gr_mode = S_IRUGO;
99935 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
99936 + gr_mode = S_IRUSR;
99937 +#endif
99938 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
99939 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
99940 + proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99941 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
99942 + }
99943 #endif
99944 return 0;
99945 }
99946 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
99947 index 64c6bed..b79a5de 100644
99948 --- a/net/8021q/vlan.c
99949 +++ b/net/8021q/vlan.c
99950 @@ -481,7 +481,7 @@ out:
99951 return NOTIFY_DONE;
99952 }
99953
99954 -static struct notifier_block vlan_notifier_block __read_mostly = {
99955 +static struct notifier_block vlan_notifier_block = {
99956 .notifier_call = vlan_device_event,
99957 };
99958
99959 @@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
99960 err = -EPERM;
99961 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
99962 break;
99963 - if ((args.u.name_type >= 0) &&
99964 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
99965 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
99966 struct vlan_net *vn;
99967
99968 vn = net_generic(net, vlan_net_id);
99969 diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
99970 index 8ac8a5c..991defc 100644
99971 --- a/net/8021q/vlan_netlink.c
99972 +++ b/net/8021q/vlan_netlink.c
99973 @@ -238,7 +238,7 @@ nla_put_failure:
99974 return -EMSGSIZE;
99975 }
99976
99977 -struct rtnl_link_ops vlan_link_ops __read_mostly = {
99978 +struct rtnl_link_ops vlan_link_ops = {
99979 .kind = "vlan",
99980 .maxtype = IFLA_VLAN_MAX,
99981 .policy = vlan_policy,
99982 diff --git a/net/9p/client.c b/net/9p/client.c
99983 index e86a9bea..e91f70e 100644
99984 --- a/net/9p/client.c
99985 +++ b/net/9p/client.c
99986 @@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
99987 len - inline_len);
99988 } else {
99989 err = copy_from_user(ename + inline_len,
99990 - uidata, len - inline_len);
99991 + (char __force_user *)uidata, len - inline_len);
99992 if (err) {
99993 err = -EFAULT;
99994 goto out_err;
99995 @@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
99996 kernel_buf = 1;
99997 indata = data;
99998 } else
99999 - indata = (__force char *)udata;
100000 + indata = (__force_kernel char *)udata;
100001 /*
100002 * response header len is 11
100003 * PDU Header(7) + IO Size (4)
100004 @@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
100005 kernel_buf = 1;
100006 odata = data;
100007 } else
100008 - odata = (char *)udata;
100009 + odata = (char __force_kernel *)udata;
100010 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
100011 P9_ZC_HDR_SZ, kernel_buf, "dqd",
100012 fid->fid, offset, rsize);
100013 diff --git a/net/9p/mod.c b/net/9p/mod.c
100014 index 6ab36ae..6f1841b 100644
100015 --- a/net/9p/mod.c
100016 +++ b/net/9p/mod.c
100017 @@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
100018 void v9fs_register_trans(struct p9_trans_module *m)
100019 {
100020 spin_lock(&v9fs_trans_lock);
100021 - list_add_tail(&m->list, &v9fs_trans_list);
100022 + pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
100023 spin_unlock(&v9fs_trans_lock);
100024 }
100025 EXPORT_SYMBOL(v9fs_register_trans);
100026 @@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
100027 void v9fs_unregister_trans(struct p9_trans_module *m)
100028 {
100029 spin_lock(&v9fs_trans_lock);
100030 - list_del_init(&m->list);
100031 + pax_list_del_init((struct list_head *)&m->list);
100032 spin_unlock(&v9fs_trans_lock);
100033 }
100034 EXPORT_SYMBOL(v9fs_unregister_trans);
100035 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
100036 index 80d08f6..de63fd1 100644
100037 --- a/net/9p/trans_fd.c
100038 +++ b/net/9p/trans_fd.c
100039 @@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
100040 oldfs = get_fs();
100041 set_fs(get_ds());
100042 /* The cast to a user pointer is valid due to the set_fs() */
100043 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
100044 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
100045 set_fs(oldfs);
100046
100047 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
100048 diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
100049 index af46bc4..f9adfcd 100644
100050 --- a/net/appletalk/atalk_proc.c
100051 +++ b/net/appletalk/atalk_proc.c
100052 @@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
100053 struct proc_dir_entry *p;
100054 int rc = -ENOMEM;
100055
100056 - atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
100057 + atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
100058 if (!atalk_proc_dir)
100059 goto out;
100060
100061 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
100062 index 876fbe8..8bbea9f 100644
100063 --- a/net/atm/atm_misc.c
100064 +++ b/net/atm/atm_misc.c
100065 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
100066 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
100067 return 1;
100068 atm_return(vcc, truesize);
100069 - atomic_inc(&vcc->stats->rx_drop);
100070 + atomic_inc_unchecked(&vcc->stats->rx_drop);
100071 return 0;
100072 }
100073 EXPORT_SYMBOL(atm_charge);
100074 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
100075 }
100076 }
100077 atm_return(vcc, guess);
100078 - atomic_inc(&vcc->stats->rx_drop);
100079 + atomic_inc_unchecked(&vcc->stats->rx_drop);
100080 return NULL;
100081 }
100082 EXPORT_SYMBOL(atm_alloc_charge);
100083 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
100084
100085 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100086 {
100087 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100088 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100089 __SONET_ITEMS
100090 #undef __HANDLE_ITEM
100091 }
100092 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
100093
100094 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100095 {
100096 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100097 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
100098 __SONET_ITEMS
100099 #undef __HANDLE_ITEM
100100 }
100101 diff --git a/net/atm/lec.c b/net/atm/lec.c
100102 index 4b98f89..5a2f6cb 100644
100103 --- a/net/atm/lec.c
100104 +++ b/net/atm/lec.c
100105 @@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
100106 }
100107
100108 static struct lane2_ops lane2_ops = {
100109 - lane2_resolve, /* resolve, spec 3.1.3 */
100110 - lane2_associate_req, /* associate_req, spec 3.1.4 */
100111 - NULL /* associate indicator, spec 3.1.5 */
100112 + .resolve = lane2_resolve,
100113 + .associate_req = lane2_associate_req,
100114 + .associate_indicator = NULL
100115 };
100116
100117 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
100118 diff --git a/net/atm/lec.h b/net/atm/lec.h
100119 index 4149db1..f2ab682 100644
100120 --- a/net/atm/lec.h
100121 +++ b/net/atm/lec.h
100122 @@ -48,7 +48,7 @@ struct lane2_ops {
100123 const u8 *tlvs, u32 sizeoftlvs);
100124 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
100125 const u8 *tlvs, u32 sizeoftlvs);
100126 -};
100127 +} __no_const;
100128
100129 /*
100130 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
100131 diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
100132 index d1b2d9a..d549f7f 100644
100133 --- a/net/atm/mpoa_caches.c
100134 +++ b/net/atm/mpoa_caches.c
100135 @@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
100136
100137
100138 static struct in_cache_ops ingress_ops = {
100139 - in_cache_add_entry, /* add_entry */
100140 - in_cache_get, /* get */
100141 - in_cache_get_with_mask, /* get_with_mask */
100142 - in_cache_get_by_vcc, /* get_by_vcc */
100143 - in_cache_put, /* put */
100144 - in_cache_remove_entry, /* remove_entry */
100145 - cache_hit, /* cache_hit */
100146 - clear_count_and_expired, /* clear_count */
100147 - check_resolving_entries, /* check_resolving */
100148 - refresh_entries, /* refresh */
100149 - in_destroy_cache /* destroy_cache */
100150 + .add_entry = in_cache_add_entry,
100151 + .get = in_cache_get,
100152 + .get_with_mask = in_cache_get_with_mask,
100153 + .get_by_vcc = in_cache_get_by_vcc,
100154 + .put = in_cache_put,
100155 + .remove_entry = in_cache_remove_entry,
100156 + .cache_hit = cache_hit,
100157 + .clear_count = clear_count_and_expired,
100158 + .check_resolving = check_resolving_entries,
100159 + .refresh = refresh_entries,
100160 + .destroy_cache = in_destroy_cache
100161 };
100162
100163 static struct eg_cache_ops egress_ops = {
100164 - eg_cache_add_entry, /* add_entry */
100165 - eg_cache_get_by_cache_id, /* get_by_cache_id */
100166 - eg_cache_get_by_tag, /* get_by_tag */
100167 - eg_cache_get_by_vcc, /* get_by_vcc */
100168 - eg_cache_get_by_src_ip, /* get_by_src_ip */
100169 - eg_cache_put, /* put */
100170 - eg_cache_remove_entry, /* remove_entry */
100171 - update_eg_cache_entry, /* update */
100172 - clear_expired, /* clear_expired */
100173 - eg_destroy_cache /* destroy_cache */
100174 + .add_entry = eg_cache_add_entry,
100175 + .get_by_cache_id = eg_cache_get_by_cache_id,
100176 + .get_by_tag = eg_cache_get_by_tag,
100177 + .get_by_vcc = eg_cache_get_by_vcc,
100178 + .get_by_src_ip = eg_cache_get_by_src_ip,
100179 + .put = eg_cache_put,
100180 + .remove_entry = eg_cache_remove_entry,
100181 + .update = update_eg_cache_entry,
100182 + .clear_expired = clear_expired,
100183 + .destroy_cache = eg_destroy_cache
100184 };
100185
100186
100187 diff --git a/net/atm/proc.c b/net/atm/proc.c
100188 index bbb6461..cf04016 100644
100189 --- a/net/atm/proc.c
100190 +++ b/net/atm/proc.c
100191 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
100192 const struct k_atm_aal_stats *stats)
100193 {
100194 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
100195 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
100196 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
100197 - atomic_read(&stats->rx_drop));
100198 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
100199 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
100200 + atomic_read_unchecked(&stats->rx_drop));
100201 }
100202
100203 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
100204 diff --git a/net/atm/resources.c b/net/atm/resources.c
100205 index 0447d5d..3cf4728 100644
100206 --- a/net/atm/resources.c
100207 +++ b/net/atm/resources.c
100208 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
100209 static void copy_aal_stats(struct k_atm_aal_stats *from,
100210 struct atm_aal_stats *to)
100211 {
100212 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100213 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100214 __AAL_STAT_ITEMS
100215 #undef __HANDLE_ITEM
100216 }
100217 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
100218 static void subtract_aal_stats(struct k_atm_aal_stats *from,
100219 struct atm_aal_stats *to)
100220 {
100221 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100222 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
100223 __AAL_STAT_ITEMS
100224 #undef __HANDLE_ITEM
100225 }
100226 diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
100227 index 919a5ce..cc6b444 100644
100228 --- a/net/ax25/sysctl_net_ax25.c
100229 +++ b/net/ax25/sysctl_net_ax25.c
100230 @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
100231 {
100232 char path[sizeof("net/ax25/") + IFNAMSIZ];
100233 int k;
100234 - struct ctl_table *table;
100235 + ctl_table_no_const *table;
100236
100237 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
100238 if (!table)
100239 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
100240 index 1e80539..676c37a 100644
100241 --- a/net/batman-adv/bat_iv_ogm.c
100242 +++ b/net/batman-adv/bat_iv_ogm.c
100243 @@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
100244
100245 /* randomize initial seqno to avoid collision */
100246 get_random_bytes(&random_seqno, sizeof(random_seqno));
100247 - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100248 + atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100249
100250 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
100251 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
100252 @@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
100253 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
100254
100255 /* change sequence number to network order */
100256 - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
100257 + seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
100258 batadv_ogm_packet->seqno = htonl(seqno);
100259 - atomic_inc(&hard_iface->bat_iv.ogm_seqno);
100260 + atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
100261
100262 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
100263
100264 @@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
100265 return;
100266
100267 /* could be changed by schedule_own_packet() */
100268 - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
100269 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
100270
100271 if (ogm_packet->flags & BATADV_DIRECTLINK)
100272 has_directlink_flag = true;
100273 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
100274 index fc1835c..eead856 100644
100275 --- a/net/batman-adv/fragmentation.c
100276 +++ b/net/batman-adv/fragmentation.c
100277 @@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
100278 frag_header.packet_type = BATADV_UNICAST_FRAG;
100279 frag_header.version = BATADV_COMPAT_VERSION;
100280 frag_header.ttl = BATADV_TTL;
100281 - frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
100282 + frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
100283 frag_header.reserved = 0;
100284 frag_header.no = 0;
100285 frag_header.total_size = htons(skb->len);
100286 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
100287 index 5467955..75ad4e3 100644
100288 --- a/net/batman-adv/soft-interface.c
100289 +++ b/net/batman-adv/soft-interface.c
100290 @@ -296,7 +296,7 @@ send:
100291 primary_if->net_dev->dev_addr);
100292
100293 /* set broadcast sequence number */
100294 - seqno = atomic_inc_return(&bat_priv->bcast_seqno);
100295 + seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
100296 bcast_packet->seqno = htonl(seqno);
100297
100298 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
100299 @@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100300 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
100301
100302 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
100303 - atomic_set(&bat_priv->bcast_seqno, 1);
100304 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
100305 atomic_set(&bat_priv->tt.vn, 0);
100306 atomic_set(&bat_priv->tt.local_changes, 0);
100307 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
100308 @@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100309
100310 /* randomize initial seqno to avoid collision */
100311 get_random_bytes(&random_seqno, sizeof(random_seqno));
100312 - atomic_set(&bat_priv->frag_seqno, random_seqno);
100313 + atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
100314
100315 bat_priv->primary_if = NULL;
100316 bat_priv->num_ifaces = 0;
100317 @@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
100318 return 0;
100319 }
100320
100321 -struct rtnl_link_ops batadv_link_ops __read_mostly = {
100322 +struct rtnl_link_ops batadv_link_ops = {
100323 .kind = "batadv",
100324 .priv_size = sizeof(struct batadv_priv),
100325 .setup = batadv_softif_init_early,
100326 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
100327 index 8854c05..ee5d5497 100644
100328 --- a/net/batman-adv/types.h
100329 +++ b/net/batman-adv/types.h
100330 @@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
100331 struct batadv_hard_iface_bat_iv {
100332 unsigned char *ogm_buff;
100333 int ogm_buff_len;
100334 - atomic_t ogm_seqno;
100335 + atomic_unchecked_t ogm_seqno;
100336 };
100337
100338 /**
100339 @@ -768,7 +768,7 @@ struct batadv_priv {
100340 atomic_t bonding;
100341 atomic_t fragmentation;
100342 atomic_t packet_size_max;
100343 - atomic_t frag_seqno;
100344 + atomic_unchecked_t frag_seqno;
100345 #ifdef CONFIG_BATMAN_ADV_BLA
100346 atomic_t bridge_loop_avoidance;
100347 #endif
100348 @@ -787,7 +787,7 @@ struct batadv_priv {
100349 #endif
100350 uint32_t isolation_mark;
100351 uint32_t isolation_mark_mask;
100352 - atomic_t bcast_seqno;
100353 + atomic_unchecked_t bcast_seqno;
100354 atomic_t bcast_queue_left;
100355 atomic_t batman_queue_left;
100356 char num_ifaces;
100357 diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
100358 index c2e0d14..bfa852b 100644
100359 --- a/net/bluetooth/6lowpan.c
100360 +++ b/net/bluetooth/6lowpan.c
100361 @@ -367,7 +367,6 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
100362
100363 drop:
100364 dev->stats.rx_dropped++;
100365 - kfree_skb(skb);
100366 return NET_RX_DROP;
100367 }
100368
100369 diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
100370 index 85bcc21..ce82722d 100644
100371 --- a/net/bluetooth/bnep/core.c
100372 +++ b/net/bluetooth/bnep/core.c
100373 @@ -533,6 +533,9 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
100374
100375 BT_DBG("");
100376
100377 + if (!l2cap_is_socket(sock))
100378 + return -EBADFD;
100379 +
100380 baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
100381 baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
100382
100383 diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
100384 index 67fe5e8..278a194 100644
100385 --- a/net/bluetooth/cmtp/core.c
100386 +++ b/net/bluetooth/cmtp/core.c
100387 @@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
100388
100389 BT_DBG("");
100390
100391 + if (!l2cap_is_socket(sock))
100392 + return -EBADFD;
100393 +
100394 session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
100395 if (!session)
100396 return -ENOMEM;
100397 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
100398 index 115f149..f0ba286 100644
100399 --- a/net/bluetooth/hci_sock.c
100400 +++ b/net/bluetooth/hci_sock.c
100401 @@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
100402 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
100403 }
100404
100405 - len = min_t(unsigned int, len, sizeof(uf));
100406 + len = min((size_t)len, sizeof(uf));
100407 if (copy_from_user(&uf, optval, len)) {
100408 err = -EFAULT;
100409 break;
100410 diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
100411 index 1b7d605..02ebd10 100644
100412 --- a/net/bluetooth/hidp/core.c
100413 +++ b/net/bluetooth/hidp/core.c
100414 @@ -1318,13 +1318,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
100415 {
100416 struct hidp_session *session;
100417 struct l2cap_conn *conn;
100418 - struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
100419 + struct l2cap_chan *chan;
100420 int ret;
100421
100422 ret = hidp_verify_sockets(ctrl_sock, intr_sock);
100423 if (ret)
100424 return ret;
100425
100426 + chan = l2cap_pi(ctrl_sock->sk)->chan;
100427 conn = NULL;
100428 l2cap_chan_lock(chan);
100429 if (chan->conn)
100430 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
100431 index b6f9777..36d3039 100644
100432 --- a/net/bluetooth/l2cap_core.c
100433 +++ b/net/bluetooth/l2cap_core.c
100434 @@ -3512,8 +3512,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
100435 break;
100436
100437 case L2CAP_CONF_RFC:
100438 - if (olen == sizeof(rfc))
100439 - memcpy(&rfc, (void *)val, olen);
100440 + if (olen != sizeof(rfc))
100441 + break;
100442 +
100443 + memcpy(&rfc, (void *)val, olen);
100444
100445 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
100446 rfc.mode != chan->mode)
100447 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
100448 index 31f106e..323f606 100644
100449 --- a/net/bluetooth/l2cap_sock.c
100450 +++ b/net/bluetooth/l2cap_sock.c
100451 @@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100452 struct sock *sk = sock->sk;
100453 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
100454 struct l2cap_options opts;
100455 - int len, err = 0;
100456 + int err = 0;
100457 + size_t len = optlen;
100458 u32 opt;
100459
100460 BT_DBG("sk %p", sk);
100461 @@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100462 opts.max_tx = chan->max_tx;
100463 opts.txwin_size = chan->tx_win;
100464
100465 - len = min_t(unsigned int, sizeof(opts), optlen);
100466 + len = min(sizeof(opts), len);
100467 if (copy_from_user((char *) &opts, optval, len)) {
100468 err = -EFAULT;
100469 break;
100470 @@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100471 struct bt_security sec;
100472 struct bt_power pwr;
100473 struct l2cap_conn *conn;
100474 - int len, err = 0;
100475 + int err = 0;
100476 + size_t len = optlen;
100477 u32 opt;
100478
100479 BT_DBG("sk %p", sk);
100480 @@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100481
100482 sec.level = BT_SECURITY_LOW;
100483
100484 - len = min_t(unsigned int, sizeof(sec), optlen);
100485 + len = min(sizeof(sec), len);
100486 if (copy_from_user((char *) &sec, optval, len)) {
100487 err = -EFAULT;
100488 break;
100489 @@ -862,7 +864,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100490
100491 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
100492
100493 - len = min_t(unsigned int, sizeof(pwr), optlen);
100494 + len = min(sizeof(pwr), len);
100495 if (copy_from_user((char *) &pwr, optval, len)) {
100496 err = -EFAULT;
100497 break;
100498 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
100499 index 8bbbb5e..6fc0950 100644
100500 --- a/net/bluetooth/rfcomm/sock.c
100501 +++ b/net/bluetooth/rfcomm/sock.c
100502 @@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100503 struct sock *sk = sock->sk;
100504 struct bt_security sec;
100505 int err = 0;
100506 - size_t len;
100507 + size_t len = optlen;
100508 u32 opt;
100509
100510 BT_DBG("sk %p", sk);
100511 @@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100512
100513 sec.level = BT_SECURITY_LOW;
100514
100515 - len = min_t(unsigned int, sizeof(sec), optlen);
100516 + len = min(sizeof(sec), len);
100517 if (copy_from_user((char *) &sec, optval, len)) {
100518 err = -EFAULT;
100519 break;
100520 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
100521 index 8e385a0..a5bdd8e 100644
100522 --- a/net/bluetooth/rfcomm/tty.c
100523 +++ b/net/bluetooth/rfcomm/tty.c
100524 @@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
100525 BT_DBG("tty %p id %d", tty, tty->index);
100526
100527 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
100528 - dev->channel, dev->port.count);
100529 + dev->channel, atomic_read(&dev->port.count));
100530
100531 err = tty_port_open(&dev->port, tty, filp);
100532 if (err)
100533 @@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
100534 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
100535
100536 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
100537 - dev->port.count);
100538 + atomic_read(&dev->port.count));
100539
100540 tty_port_close(&dev->port, tty, filp);
100541 }
100542 diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
100543 index e5ec470..cbfabd1 100644
100544 --- a/net/bridge/br_netlink.c
100545 +++ b/net/bridge/br_netlink.c
100546 @@ -564,7 +564,7 @@ static struct rtnl_af_ops br_af_ops = {
100547 .get_link_af_size = br_get_link_af_size,
100548 };
100549
100550 -struct rtnl_link_ops br_link_ops __read_mostly = {
100551 +struct rtnl_link_ops br_link_ops = {
100552 .kind = "bridge",
100553 .priv_size = sizeof(struct net_bridge),
100554 .setup = br_dev_setup,
100555 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
100556 index d9a8c05..8dadc6c6 100644
100557 --- a/net/bridge/netfilter/ebtables.c
100558 +++ b/net/bridge/netfilter/ebtables.c
100559 @@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100560 tmp.valid_hooks = t->table->valid_hooks;
100561 }
100562 mutex_unlock(&ebt_mutex);
100563 - if (copy_to_user(user, &tmp, *len) != 0) {
100564 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100565 BUGPRINT("c2u Didn't work\n");
100566 ret = -EFAULT;
100567 break;
100568 @@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100569 goto out;
100570 tmp.valid_hooks = t->valid_hooks;
100571
100572 - if (copy_to_user(user, &tmp, *len) != 0) {
100573 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100574 ret = -EFAULT;
100575 break;
100576 }
100577 @@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100578 tmp.entries_size = t->table->entries_size;
100579 tmp.valid_hooks = t->table->valid_hooks;
100580
100581 - if (copy_to_user(user, &tmp, *len) != 0) {
100582 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100583 ret = -EFAULT;
100584 break;
100585 }
100586 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
100587 index f5afda1..dcf770a 100644
100588 --- a/net/caif/cfctrl.c
100589 +++ b/net/caif/cfctrl.c
100590 @@ -10,6 +10,7 @@
100591 #include <linux/spinlock.h>
100592 #include <linux/slab.h>
100593 #include <linux/pkt_sched.h>
100594 +#include <linux/sched.h>
100595 #include <net/caif/caif_layer.h>
100596 #include <net/caif/cfpkt.h>
100597 #include <net/caif/cfctrl.h>
100598 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
100599 memset(&dev_info, 0, sizeof(dev_info));
100600 dev_info.id = 0xff;
100601 cfsrvl_init(&this->serv, 0, &dev_info, false);
100602 - atomic_set(&this->req_seq_no, 1);
100603 - atomic_set(&this->rsp_seq_no, 1);
100604 + atomic_set_unchecked(&this->req_seq_no, 1);
100605 + atomic_set_unchecked(&this->rsp_seq_no, 1);
100606 this->serv.layer.receive = cfctrl_recv;
100607 sprintf(this->serv.layer.name, "ctrl");
100608 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
100609 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
100610 struct cfctrl_request_info *req)
100611 {
100612 spin_lock_bh(&ctrl->info_list_lock);
100613 - atomic_inc(&ctrl->req_seq_no);
100614 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
100615 + atomic_inc_unchecked(&ctrl->req_seq_no);
100616 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
100617 list_add_tail(&req->list, &ctrl->list);
100618 spin_unlock_bh(&ctrl->info_list_lock);
100619 }
100620 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
100621 if (p != first)
100622 pr_warn("Requests are not received in order\n");
100623
100624 - atomic_set(&ctrl->rsp_seq_no,
100625 + atomic_set_unchecked(&ctrl->rsp_seq_no,
100626 p->sequence_no);
100627 list_del(&p->list);
100628 goto out;
100629 diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
100630 index 4589ff67..46d6b8f 100644
100631 --- a/net/caif/chnl_net.c
100632 +++ b/net/caif/chnl_net.c
100633 @@ -516,7 +516,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
100634 };
100635
100636
100637 -static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
100638 +static struct rtnl_link_ops ipcaif_link_ops = {
100639 .kind = "caif",
100640 .priv_size = sizeof(struct chnl_net),
100641 .setup = ipcaif_net_setup,
100642 diff --git a/net/can/af_can.c b/net/can/af_can.c
100643 index ce82337..5d17b4d 100644
100644 --- a/net/can/af_can.c
100645 +++ b/net/can/af_can.c
100646 @@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
100647 };
100648
100649 /* notifier block for netdevice event */
100650 -static struct notifier_block can_netdev_notifier __read_mostly = {
100651 +static struct notifier_block can_netdev_notifier = {
100652 .notifier_call = can_notifier,
100653 };
100654
100655 diff --git a/net/can/bcm.c b/net/can/bcm.c
100656 index dcb75c0..24b1b43 100644
100657 --- a/net/can/bcm.c
100658 +++ b/net/can/bcm.c
100659 @@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
100660 }
100661
100662 /* create /proc/net/can-bcm directory */
100663 - proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
100664 + proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
100665 return 0;
100666 }
100667
100668 diff --git a/net/can/gw.c b/net/can/gw.c
100669 index 050a211..bb9fe33 100644
100670 --- a/net/can/gw.c
100671 +++ b/net/can/gw.c
100672 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
100673 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
100674
100675 static HLIST_HEAD(cgw_list);
100676 -static struct notifier_block notifier;
100677
100678 static struct kmem_cache *cgw_cache __read_mostly;
100679
100680 @@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
100681 return err;
100682 }
100683
100684 +static struct notifier_block notifier = {
100685 + .notifier_call = cgw_notifier
100686 +};
100687 +
100688 static __init int cgw_module_init(void)
100689 {
100690 /* sanitize given module parameter */
100691 @@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
100692 return -ENOMEM;
100693
100694 /* set notifier */
100695 - notifier.notifier_call = cgw_notifier;
100696 register_netdevice_notifier(&notifier);
100697
100698 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
100699 diff --git a/net/can/proc.c b/net/can/proc.c
100700 index 1a19b98..df2b4ec 100644
100701 --- a/net/can/proc.c
100702 +++ b/net/can/proc.c
100703 @@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
100704 void can_init_proc(void)
100705 {
100706 /* create /proc/net/can directory */
100707 - can_dir = proc_mkdir("can", init_net.proc_net);
100708 + can_dir = proc_mkdir_restrict("can", init_net.proc_net);
100709
100710 if (!can_dir) {
100711 printk(KERN_INFO "can: failed to create /proc/net/can . "
100712 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
100713 index 8d1653c..77ad145 100644
100714 --- a/net/ceph/messenger.c
100715 +++ b/net/ceph/messenger.c
100716 @@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
100717 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
100718
100719 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
100720 -static atomic_t addr_str_seq = ATOMIC_INIT(0);
100721 +static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
100722
100723 static struct page *zero_page; /* used in certain error cases */
100724
100725 @@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
100726 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
100727 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
100728
100729 - i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100730 + i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100731 s = addr_str[i];
100732
100733 switch (ss->ss_family) {
100734 diff --git a/net/compat.c b/net/compat.c
100735 index bc8aeef..f9c070c 100644
100736 --- a/net/compat.c
100737 +++ b/net/compat.c
100738 @@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
100739 return -EFAULT;
100740 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
100741 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
100742 - kmsg->msg_name = compat_ptr(tmp1);
100743 - kmsg->msg_iov = compat_ptr(tmp2);
100744 - kmsg->msg_control = compat_ptr(tmp3);
100745 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
100746 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
100747 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
100748 return 0;
100749 }
100750
100751 @@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100752
100753 if (kern_msg->msg_name && kern_msg->msg_namelen) {
100754 if (mode == VERIFY_READ) {
100755 - int err = move_addr_to_kernel(kern_msg->msg_name,
100756 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
100757 kern_msg->msg_namelen,
100758 kern_address);
100759 if (err < 0)
100760 @@ -100,7 +100,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100761 }
100762
100763 tot_len = iov_from_user_compat_to_kern(kern_iov,
100764 - (struct compat_iovec __user *)kern_msg->msg_iov,
100765 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
100766 kern_msg->msg_iovlen);
100767 if (tot_len >= 0)
100768 kern_msg->msg_iov = kern_iov;
100769 @@ -120,20 +120,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100770
100771 #define CMSG_COMPAT_FIRSTHDR(msg) \
100772 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
100773 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
100774 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
100775 (struct compat_cmsghdr __user *)NULL)
100776
100777 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
100778 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
100779 (ucmlen) <= (unsigned long) \
100780 ((mhdr)->msg_controllen - \
100781 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
100782 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
100783
100784 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
100785 struct compat_cmsghdr __user *cmsg, int cmsg_len)
100786 {
100787 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
100788 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
100789 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
100790 msg->msg_controllen)
100791 return NULL;
100792 return (struct compat_cmsghdr __user *)ptr;
100793 @@ -223,7 +223,7 @@ Efault:
100794
100795 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
100796 {
100797 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100798 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100799 struct compat_cmsghdr cmhdr;
100800 struct compat_timeval ctv;
100801 struct compat_timespec cts[3];
100802 @@ -279,7 +279,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
100803
100804 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
100805 {
100806 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100807 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100808 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
100809 int fdnum = scm->fp->count;
100810 struct file **fp = scm->fp->fp;
100811 @@ -367,7 +367,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
100812 return -EFAULT;
100813 old_fs = get_fs();
100814 set_fs(KERNEL_DS);
100815 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
100816 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
100817 set_fs(old_fs);
100818
100819 return err;
100820 @@ -428,7 +428,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
100821 len = sizeof(ktime);
100822 old_fs = get_fs();
100823 set_fs(KERNEL_DS);
100824 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
100825 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
100826 set_fs(old_fs);
100827
100828 if (!err) {
100829 @@ -571,7 +571,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100830 case MCAST_JOIN_GROUP:
100831 case MCAST_LEAVE_GROUP:
100832 {
100833 - struct compat_group_req __user *gr32 = (void *)optval;
100834 + struct compat_group_req __user *gr32 = (void __user *)optval;
100835 struct group_req __user *kgr =
100836 compat_alloc_user_space(sizeof(struct group_req));
100837 u32 interface;
100838 @@ -592,7 +592,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100839 case MCAST_BLOCK_SOURCE:
100840 case MCAST_UNBLOCK_SOURCE:
100841 {
100842 - struct compat_group_source_req __user *gsr32 = (void *)optval;
100843 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
100844 struct group_source_req __user *kgsr = compat_alloc_user_space(
100845 sizeof(struct group_source_req));
100846 u32 interface;
100847 @@ -613,7 +613,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100848 }
100849 case MCAST_MSFILTER:
100850 {
100851 - struct compat_group_filter __user *gf32 = (void *)optval;
100852 + struct compat_group_filter __user *gf32 = (void __user *)optval;
100853 struct group_filter __user *kgf;
100854 u32 interface, fmode, numsrc;
100855
100856 @@ -651,7 +651,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
100857 char __user *optval, int __user *optlen,
100858 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
100859 {
100860 - struct compat_group_filter __user *gf32 = (void *)optval;
100861 + struct compat_group_filter __user *gf32 = (void __user *)optval;
100862 struct group_filter __user *kgf;
100863 int __user *koptlen;
100864 u32 interface, fmode, numsrc;
100865 @@ -804,7 +804,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
100866
100867 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
100868 return -EINVAL;
100869 - if (copy_from_user(a, args, nas[call]))
100870 + if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
100871 return -EFAULT;
100872 a0 = a[0];
100873 a1 = a[1];
100874 diff --git a/net/core/datagram.c b/net/core/datagram.c
100875 index fdbc9a8..cd6972c 100644
100876 --- a/net/core/datagram.c
100877 +++ b/net/core/datagram.c
100878 @@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
100879 }
100880
100881 kfree_skb(skb);
100882 - atomic_inc(&sk->sk_drops);
100883 + atomic_inc_unchecked(&sk->sk_drops);
100884 sk_mem_reclaim_partial(sk);
100885
100886 return err;
100887 diff --git a/net/core/dev.c b/net/core/dev.c
100888 index 945bbd0..8b1a370 100644
100889 --- a/net/core/dev.c
100890 +++ b/net/core/dev.c
100891 @@ -1683,14 +1683,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
100892 {
100893 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
100894 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
100895 - atomic_long_inc(&dev->rx_dropped);
100896 + atomic_long_inc_unchecked(&dev->rx_dropped);
100897 kfree_skb(skb);
100898 return NET_RX_DROP;
100899 }
100900 }
100901
100902 if (unlikely(!is_skb_forwardable(dev, skb))) {
100903 - atomic_long_inc(&dev->rx_dropped);
100904 + atomic_long_inc_unchecked(&dev->rx_dropped);
100905 kfree_skb(skb);
100906 return NET_RX_DROP;
100907 }
100908 @@ -2985,7 +2985,7 @@ recursion_alert:
100909 drop:
100910 rcu_read_unlock_bh();
100911
100912 - atomic_long_inc(&dev->tx_dropped);
100913 + atomic_long_inc_unchecked(&dev->tx_dropped);
100914 kfree_skb_list(skb);
100915 return rc;
100916 out:
100917 @@ -3328,7 +3328,7 @@ enqueue:
100918
100919 local_irq_restore(flags);
100920
100921 - atomic_long_inc(&skb->dev->rx_dropped);
100922 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100923 kfree_skb(skb);
100924 return NET_RX_DROP;
100925 }
100926 @@ -3405,7 +3405,7 @@ int netif_rx_ni(struct sk_buff *skb)
100927 }
100928 EXPORT_SYMBOL(netif_rx_ni);
100929
100930 -static void net_tx_action(struct softirq_action *h)
100931 +static __latent_entropy void net_tx_action(void)
100932 {
100933 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100934
100935 @@ -3738,7 +3738,7 @@ ncls:
100936 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
100937 } else {
100938 drop:
100939 - atomic_long_inc(&skb->dev->rx_dropped);
100940 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100941 kfree_skb(skb);
100942 /* Jamal, now you will not able to escape explaining
100943 * me how you were going to use this. :-)
100944 @@ -4502,7 +4502,7 @@ void netif_napi_del(struct napi_struct *napi)
100945 }
100946 EXPORT_SYMBOL(netif_napi_del);
100947
100948 -static void net_rx_action(struct softirq_action *h)
100949 +static __latent_entropy void net_rx_action(void)
100950 {
100951 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100952 unsigned long time_limit = jiffies + 2;
100953 @@ -6548,8 +6548,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
100954 } else {
100955 netdev_stats_to_stats64(storage, &dev->stats);
100956 }
100957 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
100958 - storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
100959 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
100960 + storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
100961 return storage;
100962 }
100963 EXPORT_SYMBOL(dev_get_stats);
100964 diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
100965 index 72e899a..79a9409 100644
100966 --- a/net/core/dev_ioctl.c
100967 +++ b/net/core/dev_ioctl.c
100968 @@ -365,8 +365,13 @@ void dev_load(struct net *net, const char *name)
100969 no_module = !dev;
100970 if (no_module && capable(CAP_NET_ADMIN))
100971 no_module = request_module("netdev-%s", name);
100972 - if (no_module && capable(CAP_SYS_MODULE))
100973 + if (no_module && capable(CAP_SYS_MODULE)) {
100974 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
100975 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
100976 +#else
100977 request_module("%s", name);
100978 +#endif
100979 + }
100980 }
100981 EXPORT_SYMBOL(dev_load);
100982
100983 diff --git a/net/core/filter.c b/net/core/filter.c
100984 index 647b122..18a7ff6 100644
100985 --- a/net/core/filter.c
100986 +++ b/net/core/filter.c
100987 @@ -532,7 +532,11 @@ do_pass:
100988
100989 /* Unkown instruction. */
100990 default:
100991 - goto err;
100992 + WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
100993 + fp->code, fp->jt, fp->jf, fp->k);
100994 + kfree(addrs);
100995 + BUG();
100996 + return -EINVAL;
100997 }
100998
100999 insn++;
101000 @@ -576,7 +580,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
101001 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
101002 int pc, ret = 0;
101003
101004 - BUILD_BUG_ON(BPF_MEMWORDS > 16);
101005 + BUILD_BUG_ON(BPF_MEMWORDS != 16);
101006
101007 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
101008 if (!masks)
101009 @@ -987,7 +991,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
101010 if (!fp)
101011 return -ENOMEM;
101012
101013 - memcpy(fp->insns, fprog->filter, fsize);
101014 + memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
101015
101016 fp->len = fprog->len;
101017 /* Since unattached filters are not copied back to user
101018 diff --git a/net/core/flow.c b/net/core/flow.c
101019 index a0348fd..6951c76 100644
101020 --- a/net/core/flow.c
101021 +++ b/net/core/flow.c
101022 @@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
101023 static int flow_entry_valid(struct flow_cache_entry *fle,
101024 struct netns_xfrm *xfrm)
101025 {
101026 - if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
101027 + if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
101028 return 0;
101029 if (fle->object && !fle->object->ops->check(fle->object))
101030 return 0;
101031 @@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
101032 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
101033 fcp->hash_count++;
101034 }
101035 - } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
101036 + } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
101037 flo = fle->object;
101038 if (!flo)
101039 goto ret_object;
101040 @@ -263,7 +263,7 @@ nocache:
101041 }
101042 flo = resolver(net, key, family, dir, flo, ctx);
101043 if (fle) {
101044 - fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
101045 + fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
101046 if (!IS_ERR(flo))
101047 fle->object = flo;
101048 else
101049 diff --git a/net/core/iovec.c b/net/core/iovec.c
101050 index e1ec45a..e5c6f16 100644
101051 --- a/net/core/iovec.c
101052 +++ b/net/core/iovec.c
101053 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101054 if (m->msg_name && m->msg_namelen) {
101055 if (mode == VERIFY_READ) {
101056 void __user *namep;
101057 - namep = (void __user __force *) m->msg_name;
101058 + namep = (void __force_user *) m->msg_name;
101059 err = move_addr_to_kernel(namep, m->msg_namelen,
101060 address);
101061 if (err < 0)
101062 @@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101063 }
101064
101065 size = m->msg_iovlen * sizeof(struct iovec);
101066 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
101067 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
101068 return -EFAULT;
101069
101070 m->msg_iov = iov;
101071 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
101072 index ef31fef..8be66d9 100644
101073 --- a/net/core/neighbour.c
101074 +++ b/net/core/neighbour.c
101075 @@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
101076 void __user *buffer, size_t *lenp, loff_t *ppos)
101077 {
101078 int size, ret;
101079 - struct ctl_table tmp = *ctl;
101080 + ctl_table_no_const tmp = *ctl;
101081
101082 tmp.extra1 = &zero;
101083 tmp.extra2 = &unres_qlen_max;
101084 @@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
101085 void __user *buffer,
101086 size_t *lenp, loff_t *ppos)
101087 {
101088 - struct ctl_table tmp = *ctl;
101089 + ctl_table_no_const tmp = *ctl;
101090 int ret;
101091
101092 tmp.extra1 = &zero;
101093 diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
101094 index 2bf8329..2eb1423 100644
101095 --- a/net/core/net-procfs.c
101096 +++ b/net/core/net-procfs.c
101097 @@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
101098 struct rtnl_link_stats64 temp;
101099 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
101100
101101 - seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101102 + if (gr_proc_is_restricted())
101103 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101104 + "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101105 + dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
101106 + 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
101107 + else
101108 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101109 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101110 dev->name, stats->rx_bytes, stats->rx_packets,
101111 stats->rx_errors,
101112 @@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
101113 return 0;
101114 }
101115
101116 -static const struct seq_operations dev_seq_ops = {
101117 +const struct seq_operations dev_seq_ops = {
101118 .start = dev_seq_start,
101119 .next = dev_seq_next,
101120 .stop = dev_seq_stop,
101121 @@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
101122
101123 static int softnet_seq_open(struct inode *inode, struct file *file)
101124 {
101125 - return seq_open(file, &softnet_seq_ops);
101126 + return seq_open_restrict(file, &softnet_seq_ops);
101127 }
101128
101129 static const struct file_operations softnet_seq_fops = {
101130 @@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
101131 else
101132 seq_printf(seq, "%04x", ntohs(pt->type));
101133
101134 +#ifdef CONFIG_GRKERNSEC_HIDESYM
101135 + seq_printf(seq, " %-8s %pf\n",
101136 + pt->dev ? pt->dev->name : "", NULL);
101137 +#else
101138 seq_printf(seq, " %-8s %pf\n",
101139 pt->dev ? pt->dev->name : "", pt->func);
101140 +#endif
101141 }
101142
101143 return 0;
101144 diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
101145 index 9dd0669..c52fb1b 100644
101146 --- a/net/core/net-sysfs.c
101147 +++ b/net/core/net-sysfs.c
101148 @@ -278,7 +278,7 @@ static ssize_t carrier_changes_show(struct device *dev,
101149 {
101150 struct net_device *netdev = to_net_dev(dev);
101151 return sprintf(buf, fmt_dec,
101152 - atomic_read(&netdev->carrier_changes));
101153 + atomic_read_unchecked(&netdev->carrier_changes));
101154 }
101155 static DEVICE_ATTR_RO(carrier_changes);
101156
101157 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
101158 index 7f15517..f7d65c0 100644
101159 --- a/net/core/net_namespace.c
101160 +++ b/net/core/net_namespace.c
101161 @@ -445,7 +445,7 @@ static int __register_pernet_operations(struct list_head *list,
101162 int error;
101163 LIST_HEAD(net_exit_list);
101164
101165 - list_add_tail(&ops->list, list);
101166 + pax_list_add_tail((struct list_head *)&ops->list, list);
101167 if (ops->init || (ops->id && ops->size)) {
101168 for_each_net(net) {
101169 error = ops_init(ops, net);
101170 @@ -458,7 +458,7 @@ static int __register_pernet_operations(struct list_head *list,
101171
101172 out_undo:
101173 /* If I have an error cleanup all namespaces I initialized */
101174 - list_del(&ops->list);
101175 + pax_list_del((struct list_head *)&ops->list);
101176 ops_exit_list(ops, &net_exit_list);
101177 ops_free_list(ops, &net_exit_list);
101178 return error;
101179 @@ -469,7 +469,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
101180 struct net *net;
101181 LIST_HEAD(net_exit_list);
101182
101183 - list_del(&ops->list);
101184 + pax_list_del((struct list_head *)&ops->list);
101185 for_each_net(net)
101186 list_add_tail(&net->exit_list, &net_exit_list);
101187 ops_exit_list(ops, &net_exit_list);
101188 @@ -603,7 +603,7 @@ int register_pernet_device(struct pernet_operations *ops)
101189 mutex_lock(&net_mutex);
101190 error = register_pernet_operations(&pernet_list, ops);
101191 if (!error && (first_device == &pernet_list))
101192 - first_device = &ops->list;
101193 + first_device = (struct list_head *)&ops->list;
101194 mutex_unlock(&net_mutex);
101195 return error;
101196 }
101197 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
101198 index e6645b4..43e1af9 100644
101199 --- a/net/core/netpoll.c
101200 +++ b/net/core/netpoll.c
101201 @@ -379,7 +379,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101202 struct udphdr *udph;
101203 struct iphdr *iph;
101204 struct ethhdr *eth;
101205 - static atomic_t ip_ident;
101206 + static atomic_unchecked_t ip_ident;
101207 struct ipv6hdr *ip6h;
101208
101209 udp_len = len + sizeof(*udph);
101210 @@ -450,7 +450,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101211 put_unaligned(0x45, (unsigned char *)iph);
101212 iph->tos = 0;
101213 put_unaligned(htons(ip_len), &(iph->tot_len));
101214 - iph->id = htons(atomic_inc_return(&ip_ident));
101215 + iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
101216 iph->frag_off = 0;
101217 iph->ttl = 64;
101218 iph->protocol = IPPROTO_UDP;
101219 diff --git a/net/core/pktgen.c b/net/core/pktgen.c
101220 index 443256b..bbff424 100644
101221 --- a/net/core/pktgen.c
101222 +++ b/net/core/pktgen.c
101223 @@ -3753,7 +3753,7 @@ static int __net_init pg_net_init(struct net *net)
101224 pn->net = net;
101225 INIT_LIST_HEAD(&pn->pktgen_threads);
101226 pn->pktgen_exiting = false;
101227 - pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
101228 + pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
101229 if (!pn->proc_dir) {
101230 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
101231 return -ENODEV;
101232 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
101233 index 76321ea..3129bd6 100644
101234 --- a/net/core/rtnetlink.c
101235 +++ b/net/core/rtnetlink.c
101236 @@ -58,7 +58,7 @@ struct rtnl_link {
101237 rtnl_doit_func doit;
101238 rtnl_dumpit_func dumpit;
101239 rtnl_calcit_func calcit;
101240 -};
101241 +} __no_const;
101242
101243 static DEFINE_MUTEX(rtnl_mutex);
101244
101245 @@ -304,10 +304,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
101246 * to use the ops for creating device. So do not
101247 * fill up dellink as well. That disables rtnl_dellink.
101248 */
101249 - if (ops->setup && !ops->dellink)
101250 - ops->dellink = unregister_netdevice_queue;
101251 + if (ops->setup && !ops->dellink) {
101252 + pax_open_kernel();
101253 + *(void **)&ops->dellink = unregister_netdevice_queue;
101254 + pax_close_kernel();
101255 + }
101256
101257 - list_add_tail(&ops->list, &link_ops);
101258 + pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
101259 return 0;
101260 }
101261 EXPORT_SYMBOL_GPL(__rtnl_link_register);
101262 @@ -354,7 +357,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
101263 for_each_net(net) {
101264 __rtnl_kill_links(net, ops);
101265 }
101266 - list_del(&ops->list);
101267 + pax_list_del((struct list_head *)&ops->list);
101268 }
101269 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
101270
101271 @@ -1014,7 +1017,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
101272 (dev->ifalias &&
101273 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
101274 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
101275 - atomic_read(&dev->carrier_changes)))
101276 + atomic_read_unchecked(&dev->carrier_changes)))
101277 goto nla_put_failure;
101278
101279 if (1) {
101280 diff --git a/net/core/scm.c b/net/core/scm.c
101281 index b442e7e..6f5b5a2 100644
101282 --- a/net/core/scm.c
101283 +++ b/net/core/scm.c
101284 @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
101285 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101286 {
101287 struct cmsghdr __user *cm
101288 - = (__force struct cmsghdr __user *)msg->msg_control;
101289 + = (struct cmsghdr __force_user *)msg->msg_control;
101290 struct cmsghdr cmhdr;
101291 int cmlen = CMSG_LEN(len);
101292 int err;
101293 @@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101294 err = -EFAULT;
101295 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
101296 goto out;
101297 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
101298 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
101299 goto out;
101300 cmlen = CMSG_SPACE(len);
101301 if (msg->msg_controllen < cmlen)
101302 @@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
101303 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101304 {
101305 struct cmsghdr __user *cm
101306 - = (__force struct cmsghdr __user*)msg->msg_control;
101307 + = (struct cmsghdr __force_user *)msg->msg_control;
101308
101309 int fdmax = 0;
101310 int fdnum = scm->fp->count;
101311 @@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101312 if (fdnum < fdmax)
101313 fdmax = fdnum;
101314
101315 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
101316 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
101317 i++, cmfptr++)
101318 {
101319 struct socket *sock;
101320 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
101321 index 32e31c2..e981248 100644
101322 --- a/net/core/skbuff.c
101323 +++ b/net/core/skbuff.c
101324 @@ -2025,7 +2025,7 @@ EXPORT_SYMBOL(__skb_checksum);
101325 __wsum skb_checksum(const struct sk_buff *skb, int offset,
101326 int len, __wsum csum)
101327 {
101328 - const struct skb_checksum_ops ops = {
101329 + static const struct skb_checksum_ops ops = {
101330 .update = csum_partial_ext,
101331 .combine = csum_block_add_ext,
101332 };
101333 @@ -3255,12 +3255,14 @@ void __init skb_init(void)
101334 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
101335 sizeof(struct sk_buff),
101336 0,
101337 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101338 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101339 + SLAB_NO_SANITIZE,
101340 NULL);
101341 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
101342 sizeof(struct sk_buff_fclones),
101343 0,
101344 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101345 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101346 + SLAB_NO_SANITIZE,
101347 NULL);
101348 }
101349
101350 diff --git a/net/core/sock.c b/net/core/sock.c
101351 index 15e0c67..0310f4a 100644
101352 --- a/net/core/sock.c
101353 +++ b/net/core/sock.c
101354 @@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101355 struct sk_buff_head *list = &sk->sk_receive_queue;
101356
101357 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
101358 - atomic_inc(&sk->sk_drops);
101359 + atomic_inc_unchecked(&sk->sk_drops);
101360 trace_sock_rcvqueue_full(sk, skb);
101361 return -ENOMEM;
101362 }
101363 @@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101364 return err;
101365
101366 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
101367 - atomic_inc(&sk->sk_drops);
101368 + atomic_inc_unchecked(&sk->sk_drops);
101369 return -ENOBUFS;
101370 }
101371
101372 @@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101373 skb_dst_force(skb);
101374
101375 spin_lock_irqsave(&list->lock, flags);
101376 - skb->dropcount = atomic_read(&sk->sk_drops);
101377 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
101378 __skb_queue_tail(list, skb);
101379 spin_unlock_irqrestore(&list->lock, flags);
101380
101381 @@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101382 skb->dev = NULL;
101383
101384 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
101385 - atomic_inc(&sk->sk_drops);
101386 + atomic_inc_unchecked(&sk->sk_drops);
101387 goto discard_and_relse;
101388 }
101389 if (nested)
101390 @@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101391 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
101392 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
101393 bh_unlock_sock(sk);
101394 - atomic_inc(&sk->sk_drops);
101395 + atomic_inc_unchecked(&sk->sk_drops);
101396 goto discard_and_relse;
101397 }
101398
101399 @@ -991,12 +991,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101400 struct timeval tm;
101401 } v;
101402
101403 - int lv = sizeof(int);
101404 - int len;
101405 + unsigned int lv = sizeof(int);
101406 + unsigned int len;
101407
101408 if (get_user(len, optlen))
101409 return -EFAULT;
101410 - if (len < 0)
101411 + if (len > INT_MAX)
101412 return -EINVAL;
101413
101414 memset(&v, 0, sizeof(v));
101415 @@ -1134,11 +1134,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101416
101417 case SO_PEERNAME:
101418 {
101419 - char address[128];
101420 + char address[_K_SS_MAXSIZE];
101421
101422 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
101423 return -ENOTCONN;
101424 - if (lv < len)
101425 + if (lv < len || sizeof address < len)
101426 return -EINVAL;
101427 if (copy_to_user(optval, address, len))
101428 return -EFAULT;
101429 @@ -1219,7 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101430
101431 if (len > lv)
101432 len = lv;
101433 - if (copy_to_user(optval, &v, len))
101434 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
101435 return -EFAULT;
101436 lenout:
101437 if (put_user(len, optlen))
101438 @@ -2315,7 +2315,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
101439 */
101440 smp_wmb();
101441 atomic_set(&sk->sk_refcnt, 1);
101442 - atomic_set(&sk->sk_drops, 0);
101443 + atomic_set_unchecked(&sk->sk_drops, 0);
101444 }
101445 EXPORT_SYMBOL(sock_init_data);
101446
101447 @@ -2443,6 +2443,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
101448 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101449 int level, int type)
101450 {
101451 + struct sock_extended_err ee;
101452 struct sock_exterr_skb *serr;
101453 struct sk_buff *skb;
101454 int copied, err;
101455 @@ -2464,7 +2465,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101456 sock_recv_timestamp(msg, sk, skb);
101457
101458 serr = SKB_EXT_ERR(skb);
101459 - put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
101460 + ee = serr->ee;
101461 + put_cmsg(msg, level, type, sizeof ee, &ee);
101462
101463 msg->msg_flags |= MSG_ERRQUEUE;
101464 err = copied;
101465 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
101466 index ad704c7..ca48aff 100644
101467 --- a/net/core/sock_diag.c
101468 +++ b/net/core/sock_diag.c
101469 @@ -9,26 +9,33 @@
101470 #include <linux/inet_diag.h>
101471 #include <linux/sock_diag.h>
101472
101473 -static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
101474 +static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
101475 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
101476 static DEFINE_MUTEX(sock_diag_table_mutex);
101477
101478 int sock_diag_check_cookie(void *sk, __u32 *cookie)
101479 {
101480 +#ifndef CONFIG_GRKERNSEC_HIDESYM
101481 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
101482 cookie[1] != INET_DIAG_NOCOOKIE) &&
101483 ((u32)(unsigned long)sk != cookie[0] ||
101484 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
101485 return -ESTALE;
101486 else
101487 +#endif
101488 return 0;
101489 }
101490 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
101491
101492 void sock_diag_save_cookie(void *sk, __u32 *cookie)
101493 {
101494 +#ifdef CONFIG_GRKERNSEC_HIDESYM
101495 + cookie[0] = 0;
101496 + cookie[1] = 0;
101497 +#else
101498 cookie[0] = (u32)(unsigned long)sk;
101499 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
101500 +#endif
101501 }
101502 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
101503
101504 @@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
101505 mutex_lock(&sock_diag_table_mutex);
101506 if (sock_diag_handlers[hndl->family])
101507 err = -EBUSY;
101508 - else
101509 + else {
101510 + pax_open_kernel();
101511 sock_diag_handlers[hndl->family] = hndl;
101512 + pax_close_kernel();
101513 + }
101514 mutex_unlock(&sock_diag_table_mutex);
101515
101516 return err;
101517 @@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
101518
101519 mutex_lock(&sock_diag_table_mutex);
101520 BUG_ON(sock_diag_handlers[family] != hnld);
101521 + pax_open_kernel();
101522 sock_diag_handlers[family] = NULL;
101523 + pax_close_kernel();
101524 mutex_unlock(&sock_diag_table_mutex);
101525 }
101526 EXPORT_SYMBOL_GPL(sock_diag_unregister);
101527 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
101528 index cf9cd13..50683950 100644
101529 --- a/net/core/sysctl_net_core.c
101530 +++ b/net/core/sysctl_net_core.c
101531 @@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
101532 {
101533 unsigned int orig_size, size;
101534 int ret, i;
101535 - struct ctl_table tmp = {
101536 + ctl_table_no_const tmp = {
101537 .data = &size,
101538 .maxlen = sizeof(size),
101539 .mode = table->mode
101540 @@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
101541 void __user *buffer, size_t *lenp, loff_t *ppos)
101542 {
101543 char id[IFNAMSIZ];
101544 - struct ctl_table tbl = {
101545 + ctl_table_no_const tbl = {
101546 .data = id,
101547 .maxlen = IFNAMSIZ,
101548 };
101549 @@ -263,7 +263,7 @@ static struct ctl_table net_core_table[] = {
101550 .mode = 0644,
101551 .proc_handler = proc_dointvec
101552 },
101553 -#ifdef CONFIG_BPF_JIT
101554 +#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
101555 {
101556 .procname = "bpf_jit_enable",
101557 .data = &bpf_jit_enable,
101558 @@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
101559
101560 static __net_init int sysctl_core_net_init(struct net *net)
101561 {
101562 - struct ctl_table *tbl;
101563 + ctl_table_no_const *tbl = NULL;
101564
101565 net->core.sysctl_somaxconn = SOMAXCONN;
101566
101567 - tbl = netns_core_table;
101568 if (!net_eq(net, &init_net)) {
101569 - tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
101570 + tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
101571 if (tbl == NULL)
101572 goto err_dup;
101573
101574 @@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
101575 if (net->user_ns != &init_user_ns) {
101576 tbl[0].procname = NULL;
101577 }
101578 - }
101579 -
101580 - net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101581 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101582 + } else
101583 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
101584 if (net->core.sysctl_hdr == NULL)
101585 goto err_reg;
101586
101587 return 0;
101588
101589 err_reg:
101590 - if (tbl != netns_core_table)
101591 - kfree(tbl);
101592 + kfree(tbl);
101593 err_dup:
101594 return -ENOMEM;
101595 }
101596 @@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
101597 kfree(tbl);
101598 }
101599
101600 -static __net_initdata struct pernet_operations sysctl_core_ops = {
101601 +static __net_initconst struct pernet_operations sysctl_core_ops = {
101602 .init = sysctl_core_net_init,
101603 .exit = sysctl_core_net_exit,
101604 };
101605 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
101606 index 25733d5..b9360f0 100644
101607 --- a/net/decnet/af_decnet.c
101608 +++ b/net/decnet/af_decnet.c
101609 @@ -466,6 +466,7 @@ static struct proto dn_proto = {
101610 .sysctl_rmem = sysctl_decnet_rmem,
101611 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
101612 .obj_size = sizeof(struct dn_sock),
101613 + .slab_flags = SLAB_USERCOPY,
101614 };
101615
101616 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
101617 diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
101618 index 4400da7..3429972 100644
101619 --- a/net/decnet/dn_dev.c
101620 +++ b/net/decnet/dn_dev.c
101621 @@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
101622 .extra1 = &min_t3,
101623 .extra2 = &max_t3
101624 },
101625 - {0}
101626 + { }
101627 },
101628 };
101629
101630 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
101631 index 5325b54..a0d4d69 100644
101632 --- a/net/decnet/sysctl_net_decnet.c
101633 +++ b/net/decnet/sysctl_net_decnet.c
101634 @@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
101635
101636 if (len > *lenp) len = *lenp;
101637
101638 - if (copy_to_user(buffer, addr, len))
101639 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
101640 return -EFAULT;
101641
101642 *lenp = len;
101643 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
101644
101645 if (len > *lenp) len = *lenp;
101646
101647 - if (copy_to_user(buffer, devname, len))
101648 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
101649 return -EFAULT;
101650
101651 *lenp = len;
101652 diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
101653 index a2c7e4c..3dc9f67 100644
101654 --- a/net/hsr/hsr_netlink.c
101655 +++ b/net/hsr/hsr_netlink.c
101656 @@ -102,7 +102,7 @@ nla_put_failure:
101657 return -EMSGSIZE;
101658 }
101659
101660 -static struct rtnl_link_ops hsr_link_ops __read_mostly = {
101661 +static struct rtnl_link_ops hsr_link_ops = {
101662 .kind = "hsr",
101663 .maxtype = IFLA_HSR_MAX,
101664 .policy = hsr_policy,
101665 diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
101666 index 4413629..dea596a 100644
101667 --- a/net/ieee802154/6lowpan_rtnl.c
101668 +++ b/net/ieee802154/6lowpan_rtnl.c
101669 @@ -635,7 +635,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
101670 dev_put(real_dev);
101671 }
101672
101673 -static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
101674 +static struct rtnl_link_ops lowpan_link_ops = {
101675 .kind = "lowpan",
101676 .priv_size = sizeof(struct lowpan_dev_info),
101677 .setup = lowpan_setup,
101678 diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
101679 index 7cfcd68..84ca5b7 100644
101680 --- a/net/ieee802154/reassembly.c
101681 +++ b/net/ieee802154/reassembly.c
101682 @@ -433,14 +433,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
101683
101684 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101685 {
101686 - struct ctl_table *table;
101687 + ctl_table_no_const *table = NULL;
101688 struct ctl_table_header *hdr;
101689 struct netns_ieee802154_lowpan *ieee802154_lowpan =
101690 net_ieee802154_lowpan(net);
101691
101692 - table = lowpan_frags_ns_ctl_table;
101693 if (!net_eq(net, &init_net)) {
101694 - table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
101695 + table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
101696 GFP_KERNEL);
101697 if (table == NULL)
101698 goto err_alloc;
101699 @@ -455,9 +454,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101700 /* Don't export sysctls to unprivileged users */
101701 if (net->user_ns != &init_user_ns)
101702 table[0].procname = NULL;
101703 - }
101704 -
101705 - hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101706 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101707 + } else
101708 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
101709 if (hdr == NULL)
101710 goto err_reg;
101711
101712 @@ -465,8 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101713 return 0;
101714
101715 err_reg:
101716 - if (!net_eq(net, &init_net))
101717 - kfree(table);
101718 + kfree(table);
101719 err_alloc:
101720 return -ENOMEM;
101721 }
101722 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
101723 index e67da4e..da217942 100644
101724 --- a/net/ipv4/af_inet.c
101725 +++ b/net/ipv4/af_inet.c
101726 @@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
101727 return ip_recv_error(sk, msg, len, addr_len);
101728 #if IS_ENABLED(CONFIG_IPV6)
101729 if (sk->sk_family == AF_INET6)
101730 - return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
101731 + return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
101732 #endif
101733 return -EINVAL;
101734 }
101735 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
101736 index 214882e..ec032f6 100644
101737 --- a/net/ipv4/devinet.c
101738 +++ b/net/ipv4/devinet.c
101739 @@ -69,7 +69,8 @@
101740
101741 static struct ipv4_devconf ipv4_devconf = {
101742 .data = {
101743 - [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101744 + [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101745 + [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101746 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101747 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101748 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101749 @@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
101750
101751 static struct ipv4_devconf ipv4_devconf_dflt = {
101752 .data = {
101753 - [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101754 + [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101755 + [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101756 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101757 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101758 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101759 @@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
101760 idx = 0;
101761 head = &net->dev_index_head[h];
101762 rcu_read_lock();
101763 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101764 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101765 net->dev_base_seq;
101766 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101767 if (idx < s_idx)
101768 @@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
101769 idx = 0;
101770 head = &net->dev_index_head[h];
101771 rcu_read_lock();
101772 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101773 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101774 net->dev_base_seq;
101775 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101776 if (idx < s_idx)
101777 @@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
101778 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
101779 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
101780
101781 -static struct devinet_sysctl_table {
101782 +static const struct devinet_sysctl_table {
101783 struct ctl_table_header *sysctl_header;
101784 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
101785 } devinet_sysctl = {
101786 @@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
101787 int err;
101788 struct ipv4_devconf *all, *dflt;
101789 #ifdef CONFIG_SYSCTL
101790 - struct ctl_table *tbl = ctl_forward_entry;
101791 + ctl_table_no_const *tbl = NULL;
101792 struct ctl_table_header *forw_hdr;
101793 #endif
101794
101795 @@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
101796 goto err_alloc_dflt;
101797
101798 #ifdef CONFIG_SYSCTL
101799 - tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
101800 + tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
101801 if (tbl == NULL)
101802 goto err_alloc_ctl;
101803
101804 @@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
101805 goto err_reg_dflt;
101806
101807 err = -ENOMEM;
101808 - forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101809 + if (!net_eq(net, &init_net))
101810 + forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101811 + else
101812 + forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
101813 if (forw_hdr == NULL)
101814 goto err_reg_ctl;
101815 net->ipv4.forw_hdr = forw_hdr;
101816 @@ -2287,8 +2292,7 @@ err_reg_ctl:
101817 err_reg_dflt:
101818 __devinet_sysctl_unregister(all);
101819 err_reg_all:
101820 - if (tbl != ctl_forward_entry)
101821 - kfree(tbl);
101822 + kfree(tbl);
101823 err_alloc_ctl:
101824 #endif
101825 if (dflt != &ipv4_devconf_dflt)
101826 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
101827 index 23104a3..9f5570b 100644
101828 --- a/net/ipv4/fib_frontend.c
101829 +++ b/net/ipv4/fib_frontend.c
101830 @@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
101831 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101832 fib_sync_up(dev);
101833 #endif
101834 - atomic_inc(&net->ipv4.dev_addr_genid);
101835 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101836 rt_cache_flush(dev_net(dev));
101837 break;
101838 case NETDEV_DOWN:
101839 fib_del_ifaddr(ifa, NULL);
101840 - atomic_inc(&net->ipv4.dev_addr_genid);
101841 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101842 if (ifa->ifa_dev->ifa_list == NULL) {
101843 /* Last address was deleted from this interface.
101844 * Disable IP.
101845 @@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
101846 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101847 fib_sync_up(dev);
101848 #endif
101849 - atomic_inc(&net->ipv4.dev_addr_genid);
101850 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101851 rt_cache_flush(net);
101852 break;
101853 case NETDEV_DOWN:
101854 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
101855 index f99f41b..1879da9 100644
101856 --- a/net/ipv4/fib_semantics.c
101857 +++ b/net/ipv4/fib_semantics.c
101858 @@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
101859 nh->nh_saddr = inet_select_addr(nh->nh_dev,
101860 nh->nh_gw,
101861 nh->nh_parent->fib_scope);
101862 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
101863 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
101864
101865 return nh->nh_saddr;
101866 }
101867 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
101868 index 9111a4e..3576905 100644
101869 --- a/net/ipv4/inet_hashtables.c
101870 +++ b/net/ipv4/inet_hashtables.c
101871 @@ -18,6 +18,7 @@
101872 #include <linux/sched.h>
101873 #include <linux/slab.h>
101874 #include <linux/wait.h>
101875 +#include <linux/security.h>
101876
101877 #include <net/inet_connection_sock.h>
101878 #include <net/inet_hashtables.h>
101879 @@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
101880 return inet_ehashfn(net, laddr, lport, faddr, fport);
101881 }
101882
101883 +extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
101884 +
101885 /*
101886 * Allocate and initialize a new local port bind bucket.
101887 * The bindhash mutex for snum's hash chain must be held here.
101888 @@ -554,6 +557,8 @@ ok:
101889 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
101890 spin_unlock(&head->lock);
101891
101892 + gr_update_task_in_ip_table(inet_sk(sk));
101893 +
101894 if (tw) {
101895 inet_twsk_deschedule(tw, death_row);
101896 while (twrefcnt) {
101897 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
101898 index 241afd7..31b95d5 100644
101899 --- a/net/ipv4/inetpeer.c
101900 +++ b/net/ipv4/inetpeer.c
101901 @@ -461,7 +461,7 @@ relookup:
101902 if (p) {
101903 p->daddr = *daddr;
101904 atomic_set(&p->refcnt, 1);
101905 - atomic_set(&p->rid, 0);
101906 + atomic_set_unchecked(&p->rid, 0);
101907 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
101908 p->rate_tokens = 0;
101909 /* 60*HZ is arbitrary, but chosen enough high so that the first
101910 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
101911 index 2811cc1..ad5a534 100644
101912 --- a/net/ipv4/ip_fragment.c
101913 +++ b/net/ipv4/ip_fragment.c
101914 @@ -268,7 +268,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
101915 return 0;
101916
101917 start = qp->rid;
101918 - end = atomic_inc_return(&peer->rid);
101919 + end = atomic_inc_return_unchecked(&peer->rid);
101920 qp->rid = end;
101921
101922 rc = qp->q.fragments && (end - start) > max;
101923 @@ -746,12 +746,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
101924
101925 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101926 {
101927 - struct ctl_table *table;
101928 + ctl_table_no_const *table = NULL;
101929 struct ctl_table_header *hdr;
101930
101931 - table = ip4_frags_ns_ctl_table;
101932 if (!net_eq(net, &init_net)) {
101933 - table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101934 + table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101935 if (table == NULL)
101936 goto err_alloc;
101937
101938 @@ -765,9 +764,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101939 /* Don't export sysctls to unprivileged users */
101940 if (net->user_ns != &init_user_ns)
101941 table[0].procname = NULL;
101942 - }
101943 + hdr = register_net_sysctl(net, "net/ipv4", table);
101944 + } else
101945 + hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
101946
101947 - hdr = register_net_sysctl(net, "net/ipv4", table);
101948 if (hdr == NULL)
101949 goto err_reg;
101950
101951 @@ -775,8 +775,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101952 return 0;
101953
101954 err_reg:
101955 - if (!net_eq(net, &init_net))
101956 - kfree(table);
101957 + kfree(table);
101958 err_alloc:
101959 return -ENOMEM;
101960 }
101961 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
101962 index 12055fd..df852c4 100644
101963 --- a/net/ipv4/ip_gre.c
101964 +++ b/net/ipv4/ip_gre.c
101965 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
101966 module_param(log_ecn_error, bool, 0644);
101967 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
101968
101969 -static struct rtnl_link_ops ipgre_link_ops __read_mostly;
101970 +static struct rtnl_link_ops ipgre_link_ops;
101971 static int ipgre_tunnel_init(struct net_device *dev);
101972
101973 static int ipgre_net_id __read_mostly;
101974 @@ -815,7 +815,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
101975 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
101976 };
101977
101978 -static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
101979 +static struct rtnl_link_ops ipgre_link_ops = {
101980 .kind = "gre",
101981 .maxtype = IFLA_GRE_MAX,
101982 .policy = ipgre_policy,
101983 @@ -829,7 +829,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
101984 .fill_info = ipgre_fill_info,
101985 };
101986
101987 -static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
101988 +static struct rtnl_link_ops ipgre_tap_ops = {
101989 .kind = "gretap",
101990 .maxtype = IFLA_GRE_MAX,
101991 .policy = ipgre_policy,
101992 diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
101993 index 3d4da2c..40f9c29 100644
101994 --- a/net/ipv4/ip_input.c
101995 +++ b/net/ipv4/ip_input.c
101996 @@ -147,6 +147,10 @@
101997 #include <linux/mroute.h>
101998 #include <linux/netlink.h>
101999
102000 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102001 +extern int grsec_enable_blackhole;
102002 +#endif
102003 +
102004 /*
102005 * Process Router Attention IP option (RFC 2113)
102006 */
102007 @@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
102008 if (!raw) {
102009 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
102010 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
102011 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102012 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102013 +#endif
102014 icmp_send(skb, ICMP_DEST_UNREACH,
102015 ICMP_PROT_UNREACH, 0);
102016 }
102017 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
102018 index 9daf217..dc6972d 100644
102019 --- a/net/ipv4/ip_sockglue.c
102020 +++ b/net/ipv4/ip_sockglue.c
102021 @@ -1177,7 +1177,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102022 len = min_t(unsigned int, len, opt->optlen);
102023 if (put_user(len, optlen))
102024 return -EFAULT;
102025 - if (copy_to_user(optval, opt->__data, len))
102026 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
102027 + copy_to_user(optval, opt->__data, len))
102028 return -EFAULT;
102029 return 0;
102030 }
102031 @@ -1308,7 +1309,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102032 if (sk->sk_type != SOCK_STREAM)
102033 return -ENOPROTOOPT;
102034
102035 - msg.msg_control = (__force void *) optval;
102036 + msg.msg_control = (__force_kernel void *) optval;
102037 msg.msg_controllen = len;
102038 msg.msg_flags = flags;
102039
102040 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
102041 index 1a7e979..fd05aa4 100644
102042 --- a/net/ipv4/ip_vti.c
102043 +++ b/net/ipv4/ip_vti.c
102044 @@ -45,7 +45,7 @@
102045 #include <net/net_namespace.h>
102046 #include <net/netns/generic.h>
102047
102048 -static struct rtnl_link_ops vti_link_ops __read_mostly;
102049 +static struct rtnl_link_ops vti_link_ops;
102050
102051 static int vti_net_id __read_mostly;
102052 static int vti_tunnel_init(struct net_device *dev);
102053 @@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
102054 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
102055 };
102056
102057 -static struct rtnl_link_ops vti_link_ops __read_mostly = {
102058 +static struct rtnl_link_ops vti_link_ops = {
102059 .kind = "vti",
102060 .maxtype = IFLA_VTI_MAX,
102061 .policy = vti_policy,
102062 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
102063 index 648fa14..97864d0 100644
102064 --- a/net/ipv4/ipconfig.c
102065 +++ b/net/ipv4/ipconfig.c
102066 @@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
102067
102068 mm_segment_t oldfs = get_fs();
102069 set_fs(get_ds());
102070 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102071 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102072 set_fs(oldfs);
102073 return res;
102074 }
102075 @@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
102076
102077 mm_segment_t oldfs = get_fs();
102078 set_fs(get_ds());
102079 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102080 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102081 set_fs(oldfs);
102082 return res;
102083 }
102084 @@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
102085
102086 mm_segment_t oldfs = get_fs();
102087 set_fs(get_ds());
102088 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
102089 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
102090 set_fs(oldfs);
102091 return res;
102092 }
102093 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
102094 index 37096d6..86abb03 100644
102095 --- a/net/ipv4/ipip.c
102096 +++ b/net/ipv4/ipip.c
102097 @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
102098 static int ipip_net_id __read_mostly;
102099
102100 static int ipip_tunnel_init(struct net_device *dev);
102101 -static struct rtnl_link_ops ipip_link_ops __read_mostly;
102102 +static struct rtnl_link_ops ipip_link_ops;
102103
102104 static int ipip_err(struct sk_buff *skb, u32 info)
102105 {
102106 @@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
102107 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
102108 };
102109
102110 -static struct rtnl_link_ops ipip_link_ops __read_mostly = {
102111 +static struct rtnl_link_ops ipip_link_ops = {
102112 .kind = "ipip",
102113 .maxtype = IFLA_IPTUN_MAX,
102114 .policy = ipip_policy,
102115 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
102116 index f95b6f9..2ee2097 100644
102117 --- a/net/ipv4/netfilter/arp_tables.c
102118 +++ b/net/ipv4/netfilter/arp_tables.c
102119 @@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
102120 #endif
102121
102122 static int get_info(struct net *net, void __user *user,
102123 - const int *len, int compat)
102124 + int len, int compat)
102125 {
102126 char name[XT_TABLE_MAXNAMELEN];
102127 struct xt_table *t;
102128 int ret;
102129
102130 - if (*len != sizeof(struct arpt_getinfo)) {
102131 - duprintf("length %u != %Zu\n", *len,
102132 + if (len != sizeof(struct arpt_getinfo)) {
102133 + duprintf("length %u != %Zu\n", len,
102134 sizeof(struct arpt_getinfo));
102135 return -EINVAL;
102136 }
102137 @@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
102138 info.size = private->size;
102139 strcpy(info.name, name);
102140
102141 - if (copy_to_user(user, &info, *len) != 0)
102142 + if (copy_to_user(user, &info, len) != 0)
102143 ret = -EFAULT;
102144 else
102145 ret = 0;
102146 @@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
102147
102148 switch (cmd) {
102149 case ARPT_SO_GET_INFO:
102150 - ret = get_info(sock_net(sk), user, len, 1);
102151 + ret = get_info(sock_net(sk), user, *len, 1);
102152 break;
102153 case ARPT_SO_GET_ENTRIES:
102154 ret = compat_get_entries(sock_net(sk), user, len);
102155 @@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
102156
102157 switch (cmd) {
102158 case ARPT_SO_GET_INFO:
102159 - ret = get_info(sock_net(sk), user, len, 0);
102160 + ret = get_info(sock_net(sk), user, *len, 0);
102161 break;
102162
102163 case ARPT_SO_GET_ENTRIES:
102164 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
102165 index 99e810f..3711b81 100644
102166 --- a/net/ipv4/netfilter/ip_tables.c
102167 +++ b/net/ipv4/netfilter/ip_tables.c
102168 @@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
102169 #endif
102170
102171 static int get_info(struct net *net, void __user *user,
102172 - const int *len, int compat)
102173 + int len, int compat)
102174 {
102175 char name[XT_TABLE_MAXNAMELEN];
102176 struct xt_table *t;
102177 int ret;
102178
102179 - if (*len != sizeof(struct ipt_getinfo)) {
102180 - duprintf("length %u != %zu\n", *len,
102181 + if (len != sizeof(struct ipt_getinfo)) {
102182 + duprintf("length %u != %zu\n", len,
102183 sizeof(struct ipt_getinfo));
102184 return -EINVAL;
102185 }
102186 @@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
102187 info.size = private->size;
102188 strcpy(info.name, name);
102189
102190 - if (copy_to_user(user, &info, *len) != 0)
102191 + if (copy_to_user(user, &info, len) != 0)
102192 ret = -EFAULT;
102193 else
102194 ret = 0;
102195 @@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102196
102197 switch (cmd) {
102198 case IPT_SO_GET_INFO:
102199 - ret = get_info(sock_net(sk), user, len, 1);
102200 + ret = get_info(sock_net(sk), user, *len, 1);
102201 break;
102202 case IPT_SO_GET_ENTRIES:
102203 ret = compat_get_entries(sock_net(sk), user, len);
102204 @@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102205
102206 switch (cmd) {
102207 case IPT_SO_GET_INFO:
102208 - ret = get_info(sock_net(sk), user, len, 0);
102209 + ret = get_info(sock_net(sk), user, *len, 0);
102210 break;
102211
102212 case IPT_SO_GET_ENTRIES:
102213 diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102214 index e90f83a..3e6acca 100644
102215 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
102216 +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102217 @@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
102218 spin_lock_init(&cn->lock);
102219
102220 #ifdef CONFIG_PROC_FS
102221 - cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
102222 + cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
102223 if (!cn->procdir) {
102224 pr_err("Unable to proc dir entry\n");
102225 return -ENOMEM;
102226 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
102227 index 5d740cc..b2842b9 100644
102228 --- a/net/ipv4/ping.c
102229 +++ b/net/ipv4/ping.c
102230 @@ -59,7 +59,7 @@ struct ping_table {
102231 };
102232
102233 static struct ping_table ping_table;
102234 -struct pingv6_ops pingv6_ops;
102235 +struct pingv6_ops *pingv6_ops;
102236 EXPORT_SYMBOL_GPL(pingv6_ops);
102237
102238 static u16 ping_port_rover;
102239 @@ -350,7 +350,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
102240 return -ENODEV;
102241 }
102242 }
102243 - has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
102244 + has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
102245 scoped);
102246 rcu_read_unlock();
102247
102248 @@ -558,7 +558,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102249 }
102250 #if IS_ENABLED(CONFIG_IPV6)
102251 } else if (skb->protocol == htons(ETH_P_IPV6)) {
102252 - harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
102253 + harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
102254 #endif
102255 }
102256
102257 @@ -576,7 +576,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102258 info, (u8 *)icmph);
102259 #if IS_ENABLED(CONFIG_IPV6)
102260 } else if (family == AF_INET6) {
102261 - pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
102262 + pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
102263 info, (u8 *)icmph);
102264 #endif
102265 }
102266 @@ -910,10 +910,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102267 }
102268
102269 if (inet6_sk(sk)->rxopt.all)
102270 - pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
102271 + pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
102272 if (skb->protocol == htons(ETH_P_IPV6) &&
102273 inet6_sk(sk)->rxopt.all)
102274 - pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
102275 + pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
102276 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
102277 ip_cmsg_recv(msg, skb);
102278 #endif
102279 @@ -1105,7 +1105,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
102280 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102281 0, sock_i_ino(sp),
102282 atomic_read(&sp->sk_refcnt), sp,
102283 - atomic_read(&sp->sk_drops));
102284 + atomic_read_unchecked(&sp->sk_drops));
102285 }
102286
102287 static int ping_v4_seq_show(struct seq_file *seq, void *v)
102288 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
102289 index 739db31..74f0210 100644
102290 --- a/net/ipv4/raw.c
102291 +++ b/net/ipv4/raw.c
102292 @@ -314,7 +314,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
102293 int raw_rcv(struct sock *sk, struct sk_buff *skb)
102294 {
102295 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
102296 - atomic_inc(&sk->sk_drops);
102297 + atomic_inc_unchecked(&sk->sk_drops);
102298 kfree_skb(skb);
102299 return NET_RX_DROP;
102300 }
102301 @@ -755,16 +755,20 @@ static int raw_init(struct sock *sk)
102302
102303 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
102304 {
102305 + struct icmp_filter filter;
102306 +
102307 if (optlen > sizeof(struct icmp_filter))
102308 optlen = sizeof(struct icmp_filter);
102309 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
102310 + if (copy_from_user(&filter, optval, optlen))
102311 return -EFAULT;
102312 + raw_sk(sk)->filter = filter;
102313 return 0;
102314 }
102315
102316 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
102317 {
102318 int len, ret = -EFAULT;
102319 + struct icmp_filter filter;
102320
102321 if (get_user(len, optlen))
102322 goto out;
102323 @@ -774,8 +778,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
102324 if (len > sizeof(struct icmp_filter))
102325 len = sizeof(struct icmp_filter);
102326 ret = -EFAULT;
102327 - if (put_user(len, optlen) ||
102328 - copy_to_user(optval, &raw_sk(sk)->filter, len))
102329 + filter = raw_sk(sk)->filter;
102330 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
102331 goto out;
102332 ret = 0;
102333 out: return ret;
102334 @@ -1004,7 +1008,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
102335 0, 0L, 0,
102336 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
102337 0, sock_i_ino(sp),
102338 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
102339 + atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
102340 }
102341
102342 static int raw_seq_show(struct seq_file *seq, void *v)
102343 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
102344 index 6a2155b..d426880 100644
102345 --- a/net/ipv4/route.c
102346 +++ b/net/ipv4/route.c
102347 @@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
102348
102349 static int rt_cache_seq_open(struct inode *inode, struct file *file)
102350 {
102351 - return seq_open(file, &rt_cache_seq_ops);
102352 + return seq_open_restrict(file, &rt_cache_seq_ops);
102353 }
102354
102355 static const struct file_operations rt_cache_seq_fops = {
102356 @@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
102357
102358 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
102359 {
102360 - return seq_open(file, &rt_cpu_seq_ops);
102361 + return seq_open_restrict(file, &rt_cpu_seq_ops);
102362 }
102363
102364 static const struct file_operations rt_cpu_seq_fops = {
102365 @@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
102366
102367 static int rt_acct_proc_open(struct inode *inode, struct file *file)
102368 {
102369 - return single_open(file, rt_acct_proc_show, NULL);
102370 + return single_open_restrict(file, rt_acct_proc_show, NULL);
102371 }
102372
102373 static const struct file_operations rt_acct_proc_fops = {
102374 @@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
102375
102376 #define IP_IDENTS_SZ 2048u
102377 struct ip_ident_bucket {
102378 - atomic_t id;
102379 + atomic_unchecked_t id;
102380 u32 stamp32;
102381 };
102382
102383 -static struct ip_ident_bucket *ip_idents __read_mostly;
102384 +static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
102385
102386 /* In order to protect privacy, we add a perturbation to identifiers
102387 * if one generator is seldom used. This makes hard for an attacker
102388 @@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
102389 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
102390 delta = prandom_u32_max(now - old);
102391
102392 - return atomic_add_return(segs + delta, &bucket->id) - segs;
102393 + return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
102394 }
102395 EXPORT_SYMBOL(ip_idents_reserve);
102396
102397 @@ -2624,34 +2624,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
102398 .maxlen = sizeof(int),
102399 .mode = 0200,
102400 .proc_handler = ipv4_sysctl_rtcache_flush,
102401 + .extra1 = &init_net,
102402 },
102403 { },
102404 };
102405
102406 static __net_init int sysctl_route_net_init(struct net *net)
102407 {
102408 - struct ctl_table *tbl;
102409 + ctl_table_no_const *tbl = NULL;
102410
102411 - tbl = ipv4_route_flush_table;
102412 if (!net_eq(net, &init_net)) {
102413 - tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102414 + tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102415 if (tbl == NULL)
102416 goto err_dup;
102417
102418 /* Don't export sysctls to unprivileged users */
102419 if (net->user_ns != &init_user_ns)
102420 tbl[0].procname = NULL;
102421 - }
102422 - tbl[0].extra1 = net;
102423 + tbl[0].extra1 = net;
102424 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102425 + } else
102426 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
102427
102428 - net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102429 if (net->ipv4.route_hdr == NULL)
102430 goto err_reg;
102431 return 0;
102432
102433 err_reg:
102434 - if (tbl != ipv4_route_flush_table)
102435 - kfree(tbl);
102436 + kfree(tbl);
102437 err_dup:
102438 return -ENOMEM;
102439 }
102440 @@ -2674,8 +2674,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
102441
102442 static __net_init int rt_genid_init(struct net *net)
102443 {
102444 - atomic_set(&net->ipv4.rt_genid, 0);
102445 - atomic_set(&net->fnhe_genid, 0);
102446 + atomic_set_unchecked(&net->ipv4.rt_genid, 0);
102447 + atomic_set_unchecked(&net->fnhe_genid, 0);
102448 get_random_bytes(&net->ipv4.dev_addr_genid,
102449 sizeof(net->ipv4.dev_addr_genid));
102450 return 0;
102451 @@ -2718,11 +2718,7 @@ int __init ip_rt_init(void)
102452 {
102453 int rc = 0;
102454
102455 - ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
102456 - if (!ip_idents)
102457 - panic("IP: failed to allocate ip_idents\n");
102458 -
102459 - prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
102460 + prandom_bytes(ip_idents, sizeof(ip_idents));
102461
102462 #ifdef CONFIG_IP_ROUTE_CLASSID
102463 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
102464 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
102465 index b3c53c8..35cc18d 100644
102466 --- a/net/ipv4/sysctl_net_ipv4.c
102467 +++ b/net/ipv4/sysctl_net_ipv4.c
102468 @@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
102469 container_of(table->data, struct net, ipv4.ip_local_ports.range);
102470 int ret;
102471 int range[2];
102472 - struct ctl_table tmp = {
102473 + ctl_table_no_const tmp = {
102474 .data = &range,
102475 .maxlen = sizeof(range),
102476 .mode = table->mode,
102477 @@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
102478 int ret;
102479 gid_t urange[2];
102480 kgid_t low, high;
102481 - struct ctl_table tmp = {
102482 + ctl_table_no_const tmp = {
102483 .data = &urange,
102484 .maxlen = sizeof(urange),
102485 .mode = table->mode,
102486 @@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
102487 void __user *buffer, size_t *lenp, loff_t *ppos)
102488 {
102489 char val[TCP_CA_NAME_MAX];
102490 - struct ctl_table tbl = {
102491 + ctl_table_no_const tbl = {
102492 .data = val,
102493 .maxlen = TCP_CA_NAME_MAX,
102494 };
102495 @@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
102496 void __user *buffer, size_t *lenp,
102497 loff_t *ppos)
102498 {
102499 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
102500 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
102501 int ret;
102502
102503 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102504 @@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
102505 void __user *buffer, size_t *lenp,
102506 loff_t *ppos)
102507 {
102508 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
102509 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
102510 int ret;
102511
102512 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102513 @@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
102514 void __user *buffer, size_t *lenp,
102515 loff_t *ppos)
102516 {
102517 - struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102518 + ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102519 struct tcp_fastopen_context *ctxt;
102520 int ret;
102521 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
102522 @@ -874,13 +874,12 @@ static struct ctl_table ipv4_net_table[] = {
102523
102524 static __net_init int ipv4_sysctl_init_net(struct net *net)
102525 {
102526 - struct ctl_table *table;
102527 + ctl_table_no_const *table = NULL;
102528
102529 - table = ipv4_net_table;
102530 if (!net_eq(net, &init_net)) {
102531 int i;
102532
102533 - table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
102534 + table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
102535 if (table == NULL)
102536 goto err_alloc;
102537
102538 @@ -889,7 +888,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
102539 table[i].data += (void *)net - (void *)&init_net;
102540 }
102541
102542 - net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102543 + if (!net_eq(net, &init_net))
102544 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102545 + else
102546 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
102547 if (net->ipv4.ipv4_hdr == NULL)
102548 goto err_reg;
102549
102550 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
102551 index d107ee2..bcebf11 100644
102552 --- a/net/ipv4/tcp_input.c
102553 +++ b/net/ipv4/tcp_input.c
102554 @@ -765,7 +765,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
102555 * without any lock. We want to make sure compiler wont store
102556 * intermediate values in this location.
102557 */
102558 - ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
102559 + ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
102560 sk->sk_max_pacing_rate);
102561 }
102562
102563 @@ -4527,7 +4527,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
102564 * simplifies code)
102565 */
102566 static void
102567 -tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102568 +__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102569 struct sk_buff *head, struct sk_buff *tail,
102570 u32 start, u32 end)
102571 {
102572 @@ -5506,6 +5506,7 @@ discard:
102573 tcp_paws_reject(&tp->rx_opt, 0))
102574 goto discard_and_undo;
102575
102576 +#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
102577 if (th->syn) {
102578 /* We see SYN without ACK. It is attempt of
102579 * simultaneous connect with crossed SYNs.
102580 @@ -5556,6 +5557,7 @@ discard:
102581 goto discard;
102582 #endif
102583 }
102584 +#endif
102585 /* "fifth, if neither of the SYN or RST bits is set then
102586 * drop the segment and return."
102587 */
102588 @@ -5602,7 +5604,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
102589 goto discard;
102590
102591 if (th->syn) {
102592 - if (th->fin)
102593 + if (th->fin || th->urg || th->psh)
102594 goto discard;
102595 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
102596 return 1;
102597 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
102598 index ef7089c..a3e65fb 100644
102599 --- a/net/ipv4/tcp_ipv4.c
102600 +++ b/net/ipv4/tcp_ipv4.c
102601 @@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
102602 int sysctl_tcp_low_latency __read_mostly;
102603 EXPORT_SYMBOL(sysctl_tcp_low_latency);
102604
102605 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102606 +extern int grsec_enable_blackhole;
102607 +#endif
102608 +
102609 #ifdef CONFIG_TCP_MD5SIG
102610 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
102611 __be32 daddr, __be32 saddr, const struct tcphdr *th);
102612 @@ -1469,6 +1473,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
102613 return 0;
102614
102615 reset:
102616 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102617 + if (!grsec_enable_blackhole)
102618 +#endif
102619 tcp_v4_send_reset(rsk, skb);
102620 discard:
102621 kfree_skb(skb);
102622 @@ -1633,12 +1640,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
102623 TCP_SKB_CB(skb)->sacked = 0;
102624
102625 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
102626 - if (!sk)
102627 + if (!sk) {
102628 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102629 + ret = 1;
102630 +#endif
102631 goto no_tcp_socket;
102632 -
102633 + }
102634 process:
102635 - if (sk->sk_state == TCP_TIME_WAIT)
102636 + if (sk->sk_state == TCP_TIME_WAIT) {
102637 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102638 + ret = 2;
102639 +#endif
102640 goto do_time_wait;
102641 + }
102642
102643 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
102644 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
102645 @@ -1694,6 +1708,10 @@ csum_error:
102646 bad_packet:
102647 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
102648 } else {
102649 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102650 + if (!grsec_enable_blackhole || (ret == 1 &&
102651 + (skb->dev->flags & IFF_LOOPBACK)))
102652 +#endif
102653 tcp_v4_send_reset(NULL, skb);
102654 }
102655
102656 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
102657 index 63d2680..2db9d6b 100644
102658 --- a/net/ipv4/tcp_minisocks.c
102659 +++ b/net/ipv4/tcp_minisocks.c
102660 @@ -27,6 +27,10 @@
102661 #include <net/inet_common.h>
102662 #include <net/xfrm.h>
102663
102664 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102665 +extern int grsec_enable_blackhole;
102666 +#endif
102667 +
102668 int sysctl_tcp_syncookies __read_mostly = 1;
102669 EXPORT_SYMBOL(sysctl_tcp_syncookies);
102670
102671 @@ -739,7 +743,10 @@ embryonic_reset:
102672 * avoid becoming vulnerable to outside attack aiming at
102673 * resetting legit local connections.
102674 */
102675 - req->rsk_ops->send_reset(sk, skb);
102676 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102677 + if (!grsec_enable_blackhole)
102678 +#endif
102679 + req->rsk_ops->send_reset(sk, skb);
102680 } else if (fastopen) { /* received a valid RST pkt */
102681 reqsk_fastopen_remove(sk, req, true);
102682 tcp_reset(sk);
102683 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
102684 index ebf5ff5..4d1ff32 100644
102685 --- a/net/ipv4/tcp_probe.c
102686 +++ b/net/ipv4/tcp_probe.c
102687 @@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
102688 if (cnt + width >= len)
102689 break;
102690
102691 - if (copy_to_user(buf + cnt, tbuf, width))
102692 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
102693 return -EFAULT;
102694 cnt += width;
102695 }
102696 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
102697 index 9b21ae8..4eb67df 100644
102698 --- a/net/ipv4/tcp_timer.c
102699 +++ b/net/ipv4/tcp_timer.c
102700 @@ -22,6 +22,10 @@
102701 #include <linux/gfp.h>
102702 #include <net/tcp.h>
102703
102704 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102705 +extern int grsec_lastack_retries;
102706 +#endif
102707 +
102708 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
102709 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
102710 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
102711 @@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
102712 }
102713 }
102714
102715 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102716 + if ((sk->sk_state == TCP_LAST_ACK) &&
102717 + (grsec_lastack_retries > 0) &&
102718 + (grsec_lastack_retries < retry_until))
102719 + retry_until = grsec_lastack_retries;
102720 +#endif
102721 +
102722 if (retransmits_timed_out(sk, retry_until,
102723 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
102724 /* Has it gone just too far? */
102725 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
102726 index cd0db54..93a6518 100644
102727 --- a/net/ipv4/udp.c
102728 +++ b/net/ipv4/udp.c
102729 @@ -87,6 +87,7 @@
102730 #include <linux/types.h>
102731 #include <linux/fcntl.h>
102732 #include <linux/module.h>
102733 +#include <linux/security.h>
102734 #include <linux/socket.h>
102735 #include <linux/sockios.h>
102736 #include <linux/igmp.h>
102737 @@ -114,6 +115,10 @@
102738 #include <net/busy_poll.h>
102739 #include "udp_impl.h"
102740
102741 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102742 +extern int grsec_enable_blackhole;
102743 +#endif
102744 +
102745 struct udp_table udp_table __read_mostly;
102746 EXPORT_SYMBOL(udp_table);
102747
102748 @@ -595,6 +600,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
102749 return true;
102750 }
102751
102752 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
102753 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
102754 +
102755 /*
102756 * This routine is called by the ICMP module when it gets some
102757 * sort of error condition. If err < 0 then the socket should
102758 @@ -932,9 +940,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102759 dport = usin->sin_port;
102760 if (dport == 0)
102761 return -EINVAL;
102762 +
102763 + err = gr_search_udp_sendmsg(sk, usin);
102764 + if (err)
102765 + return err;
102766 } else {
102767 if (sk->sk_state != TCP_ESTABLISHED)
102768 return -EDESTADDRREQ;
102769 +
102770 + err = gr_search_udp_sendmsg(sk, NULL);
102771 + if (err)
102772 + return err;
102773 +
102774 daddr = inet->inet_daddr;
102775 dport = inet->inet_dport;
102776 /* Open fast path for connected socket.
102777 @@ -1182,7 +1199,7 @@ static unsigned int first_packet_length(struct sock *sk)
102778 IS_UDPLITE(sk));
102779 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102780 IS_UDPLITE(sk));
102781 - atomic_inc(&sk->sk_drops);
102782 + atomic_inc_unchecked(&sk->sk_drops);
102783 __skb_unlink(skb, rcvq);
102784 __skb_queue_tail(&list_kill, skb);
102785 }
102786 @@ -1262,6 +1279,10 @@ try_again:
102787 if (!skb)
102788 goto out;
102789
102790 + err = gr_search_udp_recvmsg(sk, skb);
102791 + if (err)
102792 + goto out_free;
102793 +
102794 ulen = skb->len - sizeof(struct udphdr);
102795 copied = len;
102796 if (copied > ulen)
102797 @@ -1295,7 +1316,7 @@ try_again:
102798 if (unlikely(err)) {
102799 trace_kfree_skb(skb, udp_recvmsg);
102800 if (!peeked) {
102801 - atomic_inc(&sk->sk_drops);
102802 + atomic_inc_unchecked(&sk->sk_drops);
102803 UDP_INC_STATS_USER(sock_net(sk),
102804 UDP_MIB_INERRORS, is_udplite);
102805 }
102806 @@ -1592,7 +1613,7 @@ csum_error:
102807 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
102808 drop:
102809 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
102810 - atomic_inc(&sk->sk_drops);
102811 + atomic_inc_unchecked(&sk->sk_drops);
102812 kfree_skb(skb);
102813 return -1;
102814 }
102815 @@ -1611,7 +1632,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
102816 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
102817
102818 if (!skb1) {
102819 - atomic_inc(&sk->sk_drops);
102820 + atomic_inc_unchecked(&sk->sk_drops);
102821 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
102822 IS_UDPLITE(sk));
102823 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102824 @@ -1812,6 +1833,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
102825 goto csum_error;
102826
102827 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
102828 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102829 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102830 +#endif
102831 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
102832
102833 /*
102834 @@ -2398,7 +2422,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
102835 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102836 0, sock_i_ino(sp),
102837 atomic_read(&sp->sk_refcnt), sp,
102838 - atomic_read(&sp->sk_drops));
102839 + atomic_read_unchecked(&sp->sk_drops));
102840 }
102841
102842 int udp4_seq_show(struct seq_file *seq, void *v)
102843 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
102844 index 6156f68..d6ab46d 100644
102845 --- a/net/ipv4/xfrm4_policy.c
102846 +++ b/net/ipv4/xfrm4_policy.c
102847 @@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
102848 fl4->flowi4_tos = iph->tos;
102849 }
102850
102851 -static inline int xfrm4_garbage_collect(struct dst_ops *ops)
102852 +static int xfrm4_garbage_collect(struct dst_ops *ops)
102853 {
102854 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
102855
102856 - xfrm4_policy_afinfo.garbage_collect(net);
102857 + xfrm_garbage_collect_deferred(net);
102858 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
102859 }
102860
102861 @@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
102862
102863 static int __net_init xfrm4_net_init(struct net *net)
102864 {
102865 - struct ctl_table *table;
102866 + ctl_table_no_const *table = NULL;
102867 struct ctl_table_header *hdr;
102868
102869 - table = xfrm4_policy_table;
102870 if (!net_eq(net, &init_net)) {
102871 - table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102872 + table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102873 if (!table)
102874 goto err_alloc;
102875
102876 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
102877 - }
102878 -
102879 - hdr = register_net_sysctl(net, "net/ipv4", table);
102880 + hdr = register_net_sysctl(net, "net/ipv4", table);
102881 + } else
102882 + hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
102883 if (!hdr)
102884 goto err_reg;
102885
102886 @@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
102887 return 0;
102888
102889 err_reg:
102890 - if (!net_eq(net, &init_net))
102891 - kfree(table);
102892 + kfree(table);
102893 err_alloc:
102894 return -ENOMEM;
102895 }
102896 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
102897 index 0169ccf..50d7b04 100644
102898 --- a/net/ipv6/addrconf.c
102899 +++ b/net/ipv6/addrconf.c
102900 @@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
102901 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102902 .mtu6 = IPV6_MIN_MTU,
102903 .accept_ra = 1,
102904 - .accept_redirects = 1,
102905 + .accept_redirects = 0,
102906 .autoconf = 1,
102907 .force_mld_version = 0,
102908 .mldv1_unsolicited_report_interval = 10 * HZ,
102909 @@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
102910 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102911 .mtu6 = IPV6_MIN_MTU,
102912 .accept_ra = 1,
102913 - .accept_redirects = 1,
102914 + .accept_redirects = 0,
102915 .autoconf = 1,
102916 .force_mld_version = 0,
102917 .mldv1_unsolicited_report_interval = 10 * HZ,
102918 @@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
102919 idx = 0;
102920 head = &net->dev_index_head[h];
102921 rcu_read_lock();
102922 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
102923 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
102924 net->dev_base_seq;
102925 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102926 if (idx < s_idx)
102927 @@ -2396,7 +2396,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
102928 p.iph.ihl = 5;
102929 p.iph.protocol = IPPROTO_IPV6;
102930 p.iph.ttl = 64;
102931 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
102932 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
102933
102934 if (ops->ndo_do_ioctl) {
102935 mm_segment_t oldfs = get_fs();
102936 @@ -3534,16 +3534,23 @@ static const struct file_operations if6_fops = {
102937 .release = seq_release_net,
102938 };
102939
102940 +extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
102941 +extern void unregister_ipv6_seq_ops_addr(void);
102942 +
102943 static int __net_init if6_proc_net_init(struct net *net)
102944 {
102945 - if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
102946 + register_ipv6_seq_ops_addr(&if6_seq_ops);
102947 + if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
102948 + unregister_ipv6_seq_ops_addr();
102949 return -ENOMEM;
102950 + }
102951 return 0;
102952 }
102953
102954 static void __net_exit if6_proc_net_exit(struct net *net)
102955 {
102956 remove_proc_entry("if_inet6", net->proc_net);
102957 + unregister_ipv6_seq_ops_addr();
102958 }
102959
102960 static struct pernet_operations if6_proc_net_ops = {
102961 @@ -4159,7 +4166,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
102962 s_ip_idx = ip_idx = cb->args[2];
102963
102964 rcu_read_lock();
102965 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102966 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102967 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
102968 idx = 0;
102969 head = &net->dev_index_head[h];
102970 @@ -4788,7 +4795,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
102971 rt_genid_bump_ipv6(net);
102972 break;
102973 }
102974 - atomic_inc(&net->ipv6.dev_addr_genid);
102975 + atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
102976 }
102977
102978 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
102979 @@ -4808,7 +4815,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
102980 int *valp = ctl->data;
102981 int val = *valp;
102982 loff_t pos = *ppos;
102983 - struct ctl_table lctl;
102984 + ctl_table_no_const lctl;
102985 int ret;
102986
102987 /*
102988 @@ -4893,7 +4900,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
102989 int *valp = ctl->data;
102990 int val = *valp;
102991 loff_t pos = *ppos;
102992 - struct ctl_table lctl;
102993 + ctl_table_no_const lctl;
102994 int ret;
102995
102996 /*
102997 diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
102998 index e8c4400..a4cd5da 100644
102999 --- a/net/ipv6/af_inet6.c
103000 +++ b/net/ipv6/af_inet6.c
103001 @@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
103002 net->ipv6.sysctl.icmpv6_time = 1*HZ;
103003 net->ipv6.sysctl.flowlabel_consistency = 1;
103004 net->ipv6.sysctl.auto_flowlabels = 0;
103005 - atomic_set(&net->ipv6.fib6_sernum, 1);
103006 + atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
103007
103008 err = ipv6_init_mibs(net);
103009 if (err)
103010 diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
103011 index 2cdc383..09cffb8 100644
103012 --- a/net/ipv6/datagram.c
103013 +++ b/net/ipv6/datagram.c
103014 @@ -928,5 +928,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
103015 0,
103016 sock_i_ino(sp),
103017 atomic_read(&sp->sk_refcnt), sp,
103018 - atomic_read(&sp->sk_drops));
103019 + atomic_read_unchecked(&sp->sk_drops));
103020 }
103021 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
103022 index 97ae700..18dcae0 100644
103023 --- a/net/ipv6/icmp.c
103024 +++ b/net/ipv6/icmp.c
103025 @@ -997,7 +997,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
103026
103027 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
103028 {
103029 - struct ctl_table *table;
103030 + ctl_table_no_const *table;
103031
103032 table = kmemdup(ipv6_icmp_table_template,
103033 sizeof(ipv6_icmp_table_template),
103034 diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
103035 index b2d1838..0194c04 100644
103036 --- a/net/ipv6/ip6_fib.c
103037 +++ b/net/ipv6/ip6_fib.c
103038 @@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
103039 int new, old;
103040
103041 do {
103042 - old = atomic_read(&net->ipv6.fib6_sernum);
103043 + old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
103044 new = old < INT_MAX ? old + 1 : 1;
103045 - } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
103046 + } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
103047 old, new) != old);
103048 return new;
103049 }
103050 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
103051 index 0e32d2e..98cbe65 100644
103052 --- a/net/ipv6/ip6_gre.c
103053 +++ b/net/ipv6/ip6_gre.c
103054 @@ -71,8 +71,8 @@ struct ip6gre_net {
103055 struct net_device *fb_tunnel_dev;
103056 };
103057
103058 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
103059 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
103060 +static struct rtnl_link_ops ip6gre_link_ops;
103061 +static struct rtnl_link_ops ip6gre_tap_ops;
103062 static int ip6gre_tunnel_init(struct net_device *dev);
103063 static void ip6gre_tunnel_setup(struct net_device *dev);
103064 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
103065 @@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
103066 }
103067
103068
103069 -static struct inet6_protocol ip6gre_protocol __read_mostly = {
103070 +static struct inet6_protocol ip6gre_protocol = {
103071 .handler = ip6gre_rcv,
103072 .err_handler = ip6gre_err,
103073 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
103074 @@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
103075 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
103076 };
103077
103078 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103079 +static struct rtnl_link_ops ip6gre_link_ops = {
103080 .kind = "ip6gre",
103081 .maxtype = IFLA_GRE_MAX,
103082 .policy = ip6gre_policy,
103083 @@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103084 .fill_info = ip6gre_fill_info,
103085 };
103086
103087 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
103088 +static struct rtnl_link_ops ip6gre_tap_ops = {
103089 .kind = "ip6gretap",
103090 .maxtype = IFLA_GRE_MAX,
103091 .policy = ip6gre_policy,
103092 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
103093 index 9cb94cf..5678108 100644
103094 --- a/net/ipv6/ip6_tunnel.c
103095 +++ b/net/ipv6/ip6_tunnel.c
103096 @@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103097
103098 static int ip6_tnl_dev_init(struct net_device *dev);
103099 static void ip6_tnl_dev_setup(struct net_device *dev);
103100 -static struct rtnl_link_ops ip6_link_ops __read_mostly;
103101 +static struct rtnl_link_ops ip6_link_ops;
103102
103103 static int ip6_tnl_net_id __read_mostly;
103104 struct ip6_tnl_net {
103105 @@ -1706,7 +1706,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
103106 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
103107 };
103108
103109 -static struct rtnl_link_ops ip6_link_ops __read_mostly = {
103110 +static struct rtnl_link_ops ip6_link_ops = {
103111 .kind = "ip6tnl",
103112 .maxtype = IFLA_IPTUN_MAX,
103113 .policy = ip6_tnl_policy,
103114 diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
103115 index bcda14d..49378c9 100644
103116 --- a/net/ipv6/ip6_vti.c
103117 +++ b/net/ipv6/ip6_vti.c
103118 @@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103119
103120 static int vti6_dev_init(struct net_device *dev);
103121 static void vti6_dev_setup(struct net_device *dev);
103122 -static struct rtnl_link_ops vti6_link_ops __read_mostly;
103123 +static struct rtnl_link_ops vti6_link_ops;
103124
103125 static int vti6_net_id __read_mostly;
103126 struct vti6_net {
103127 @@ -981,7 +981,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
103128 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
103129 };
103130
103131 -static struct rtnl_link_ops vti6_link_ops __read_mostly = {
103132 +static struct rtnl_link_ops vti6_link_ops = {
103133 .kind = "vti6",
103134 .maxtype = IFLA_VTI_MAX,
103135 .policy = vti6_policy,
103136 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
103137 index e1a9583..7dd8f4d 100644
103138 --- a/net/ipv6/ipv6_sockglue.c
103139 +++ b/net/ipv6/ipv6_sockglue.c
103140 @@ -993,7 +993,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
103141 if (sk->sk_type != SOCK_STREAM)
103142 return -ENOPROTOOPT;
103143
103144 - msg.msg_control = optval;
103145 + msg.msg_control = (void __force_kernel *)optval;
103146 msg.msg_controllen = len;
103147 msg.msg_flags = flags;
103148
103149 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
103150 index e080fbb..412b3cf 100644
103151 --- a/net/ipv6/netfilter/ip6_tables.c
103152 +++ b/net/ipv6/netfilter/ip6_tables.c
103153 @@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
103154 #endif
103155
103156 static int get_info(struct net *net, void __user *user,
103157 - const int *len, int compat)
103158 + int len, int compat)
103159 {
103160 char name[XT_TABLE_MAXNAMELEN];
103161 struct xt_table *t;
103162 int ret;
103163
103164 - if (*len != sizeof(struct ip6t_getinfo)) {
103165 - duprintf("length %u != %zu\n", *len,
103166 + if (len != sizeof(struct ip6t_getinfo)) {
103167 + duprintf("length %u != %zu\n", len,
103168 sizeof(struct ip6t_getinfo));
103169 return -EINVAL;
103170 }
103171 @@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
103172 info.size = private->size;
103173 strcpy(info.name, name);
103174
103175 - if (copy_to_user(user, &info, *len) != 0)
103176 + if (copy_to_user(user, &info, len) != 0)
103177 ret = -EFAULT;
103178 else
103179 ret = 0;
103180 @@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103181
103182 switch (cmd) {
103183 case IP6T_SO_GET_INFO:
103184 - ret = get_info(sock_net(sk), user, len, 1);
103185 + ret = get_info(sock_net(sk), user, *len, 1);
103186 break;
103187 case IP6T_SO_GET_ENTRIES:
103188 ret = compat_get_entries(sock_net(sk), user, len);
103189 @@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103190
103191 switch (cmd) {
103192 case IP6T_SO_GET_INFO:
103193 - ret = get_info(sock_net(sk), user, len, 0);
103194 + ret = get_info(sock_net(sk), user, *len, 0);
103195 break;
103196
103197 case IP6T_SO_GET_ENTRIES:
103198 diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
103199 index 6f187c8..34b367f 100644
103200 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
103201 +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
103202 @@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
103203
103204 static int nf_ct_frag6_sysctl_register(struct net *net)
103205 {
103206 - struct ctl_table *table;
103207 + ctl_table_no_const *table = NULL;
103208 struct ctl_table_header *hdr;
103209
103210 - table = nf_ct_frag6_sysctl_table;
103211 if (!net_eq(net, &init_net)) {
103212 - table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
103213 + table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
103214 GFP_KERNEL);
103215 if (table == NULL)
103216 goto err_alloc;
103217 @@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103218 table[2].data = &net->nf_frag.frags.high_thresh;
103219 table[2].extra1 = &net->nf_frag.frags.low_thresh;
103220 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
103221 - }
103222 -
103223 - hdr = register_net_sysctl(net, "net/netfilter", table);
103224 + hdr = register_net_sysctl(net, "net/netfilter", table);
103225 + } else
103226 + hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
103227 if (hdr == NULL)
103228 goto err_reg;
103229
103230 @@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103231 return 0;
103232
103233 err_reg:
103234 - if (!net_eq(net, &init_net))
103235 - kfree(table);
103236 + kfree(table);
103237 err_alloc:
103238 return -ENOMEM;
103239 }
103240 diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
103241 index 5b7a1ed..d9da205 100644
103242 --- a/net/ipv6/ping.c
103243 +++ b/net/ipv6/ping.c
103244 @@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
103245 };
103246 #endif
103247
103248 +static struct pingv6_ops real_pingv6_ops = {
103249 + .ipv6_recv_error = ipv6_recv_error,
103250 + .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
103251 + .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
103252 + .icmpv6_err_convert = icmpv6_err_convert,
103253 + .ipv6_icmp_error = ipv6_icmp_error,
103254 + .ipv6_chk_addr = ipv6_chk_addr,
103255 +};
103256 +
103257 +static struct pingv6_ops dummy_pingv6_ops = {
103258 + .ipv6_recv_error = dummy_ipv6_recv_error,
103259 + .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
103260 + .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
103261 + .icmpv6_err_convert = dummy_icmpv6_err_convert,
103262 + .ipv6_icmp_error = dummy_ipv6_icmp_error,
103263 + .ipv6_chk_addr = dummy_ipv6_chk_addr,
103264 +};
103265 +
103266 int __init pingv6_init(void)
103267 {
103268 #ifdef CONFIG_PROC_FS
103269 @@ -247,13 +265,7 @@ int __init pingv6_init(void)
103270 if (ret)
103271 return ret;
103272 #endif
103273 - pingv6_ops.ipv6_recv_error = ipv6_recv_error;
103274 - pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
103275 - pingv6_ops.ip6_datagram_recv_specific_ctl =
103276 - ip6_datagram_recv_specific_ctl;
103277 - pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
103278 - pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
103279 - pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
103280 + pingv6_ops = &real_pingv6_ops;
103281 return inet6_register_protosw(&pingv6_protosw);
103282 }
103283
103284 @@ -262,14 +274,9 @@ int __init pingv6_init(void)
103285 */
103286 void pingv6_exit(void)
103287 {
103288 - pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
103289 - pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
103290 - pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
103291 - pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
103292 - pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
103293 - pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
103294 #ifdef CONFIG_PROC_FS
103295 unregister_pernet_subsys(&ping_v6_net_ops);
103296 #endif
103297 + pingv6_ops = &dummy_pingv6_ops;
103298 inet6_unregister_protosw(&pingv6_protosw);
103299 }
103300 diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
103301 index 1752cd0..3c6af41 100644
103302 --- a/net/ipv6/proc.c
103303 +++ b/net/ipv6/proc.c
103304 @@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
103305 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
103306 goto proc_snmp6_fail;
103307
103308 - net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
103309 + net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
103310 if (!net->mib.proc_net_devsnmp6)
103311 goto proc_dev_snmp6_fail;
103312 return 0;
103313 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
103314 index 896af88..6e2ba628 100644
103315 --- a/net/ipv6/raw.c
103316 +++ b/net/ipv6/raw.c
103317 @@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
103318 {
103319 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
103320 skb_checksum_complete(skb)) {
103321 - atomic_inc(&sk->sk_drops);
103322 + atomic_inc_unchecked(&sk->sk_drops);
103323 kfree_skb(skb);
103324 return NET_RX_DROP;
103325 }
103326 @@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103327 struct raw6_sock *rp = raw6_sk(sk);
103328
103329 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
103330 - atomic_inc(&sk->sk_drops);
103331 + atomic_inc_unchecked(&sk->sk_drops);
103332 kfree_skb(skb);
103333 return NET_RX_DROP;
103334 }
103335 @@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103336
103337 if (inet->hdrincl) {
103338 if (skb_checksum_complete(skb)) {
103339 - atomic_inc(&sk->sk_drops);
103340 + atomic_inc_unchecked(&sk->sk_drops);
103341 kfree_skb(skb);
103342 return NET_RX_DROP;
103343 }
103344 @@ -608,7 +608,7 @@ out:
103345 return err;
103346 }
103347
103348 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
103349 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
103350 struct flowi6 *fl6, struct dst_entry **dstp,
103351 unsigned int flags)
103352 {
103353 @@ -914,12 +914,15 @@ do_confirm:
103354 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
103355 char __user *optval, int optlen)
103356 {
103357 + struct icmp6_filter filter;
103358 +
103359 switch (optname) {
103360 case ICMPV6_FILTER:
103361 if (optlen > sizeof(struct icmp6_filter))
103362 optlen = sizeof(struct icmp6_filter);
103363 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
103364 + if (copy_from_user(&filter, optval, optlen))
103365 return -EFAULT;
103366 + raw6_sk(sk)->filter = filter;
103367 return 0;
103368 default:
103369 return -ENOPROTOOPT;
103370 @@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103371 char __user *optval, int __user *optlen)
103372 {
103373 int len;
103374 + struct icmp6_filter filter;
103375
103376 switch (optname) {
103377 case ICMPV6_FILTER:
103378 @@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103379 len = sizeof(struct icmp6_filter);
103380 if (put_user(len, optlen))
103381 return -EFAULT;
103382 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
103383 + filter = raw6_sk(sk)->filter;
103384 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
103385 return -EFAULT;
103386 return 0;
103387 default:
103388 diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
103389 index 1a157ca..9fc05f4 100644
103390 --- a/net/ipv6/reassembly.c
103391 +++ b/net/ipv6/reassembly.c
103392 @@ -625,12 +625,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
103393
103394 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103395 {
103396 - struct ctl_table *table;
103397 + ctl_table_no_const *table = NULL;
103398 struct ctl_table_header *hdr;
103399
103400 - table = ip6_frags_ns_ctl_table;
103401 if (!net_eq(net, &init_net)) {
103402 - table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103403 + table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103404 if (table == NULL)
103405 goto err_alloc;
103406
103407 @@ -644,9 +643,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103408 /* Don't export sysctls to unprivileged users */
103409 if (net->user_ns != &init_user_ns)
103410 table[0].procname = NULL;
103411 - }
103412 + hdr = register_net_sysctl(net, "net/ipv6", table);
103413 + } else
103414 + hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
103415
103416 - hdr = register_net_sysctl(net, "net/ipv6", table);
103417 if (hdr == NULL)
103418 goto err_reg;
103419
103420 @@ -654,8 +654,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103421 return 0;
103422
103423 err_reg:
103424 - if (!net_eq(net, &init_net))
103425 - kfree(table);
103426 + kfree(table);
103427 err_alloc:
103428 return -ENOMEM;
103429 }
103430 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
103431 index a318dd89..7ecfea6 100644
103432 --- a/net/ipv6/route.c
103433 +++ b/net/ipv6/route.c
103434 @@ -2965,7 +2965,7 @@ struct ctl_table ipv6_route_table_template[] = {
103435
103436 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
103437 {
103438 - struct ctl_table *table;
103439 + ctl_table_no_const *table;
103440
103441 table = kmemdup(ipv6_route_table_template,
103442 sizeof(ipv6_route_table_template),
103443 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
103444 index a24557a..00a9ed1 100644
103445 --- a/net/ipv6/sit.c
103446 +++ b/net/ipv6/sit.c
103447 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
103448 static void ipip6_dev_free(struct net_device *dev);
103449 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
103450 __be32 *v4dst);
103451 -static struct rtnl_link_ops sit_link_ops __read_mostly;
103452 +static struct rtnl_link_ops sit_link_ops;
103453
103454 static int sit_net_id __read_mostly;
103455 struct sit_net {
103456 @@ -1750,7 +1750,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
103457 unregister_netdevice_queue(dev, head);
103458 }
103459
103460 -static struct rtnl_link_ops sit_link_ops __read_mostly = {
103461 +static struct rtnl_link_ops sit_link_ops = {
103462 .kind = "sit",
103463 .maxtype = IFLA_IPTUN_MAX,
103464 .policy = ipip6_policy,
103465 diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
103466 index c5c10fa..2577d51 100644
103467 --- a/net/ipv6/sysctl_net_ipv6.c
103468 +++ b/net/ipv6/sysctl_net_ipv6.c
103469 @@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
103470
103471 static int __net_init ipv6_sysctl_net_init(struct net *net)
103472 {
103473 - struct ctl_table *ipv6_table;
103474 + ctl_table_no_const *ipv6_table;
103475 struct ctl_table *ipv6_route_table;
103476 struct ctl_table *ipv6_icmp_table;
103477 int err;
103478 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
103479 index c277951..c7ee5bf 100644
103480 --- a/net/ipv6/tcp_ipv6.c
103481 +++ b/net/ipv6/tcp_ipv6.c
103482 @@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
103483 }
103484 }
103485
103486 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103487 +extern int grsec_enable_blackhole;
103488 +#endif
103489 +
103490 static void tcp_v6_hash(struct sock *sk)
103491 {
103492 if (sk->sk_state != TCP_CLOSE) {
103493 @@ -1341,6 +1345,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
103494 return 0;
103495
103496 reset:
103497 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103498 + if (!grsec_enable_blackhole)
103499 +#endif
103500 tcp_v6_send_reset(sk, skb);
103501 discard:
103502 if (opt_skb)
103503 @@ -1434,12 +1441,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
103504
103505 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
103506 tcp_v6_iif(skb));
103507 - if (!sk)
103508 + if (!sk) {
103509 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103510 + ret = 1;
103511 +#endif
103512 goto no_tcp_socket;
103513 + }
103514
103515 process:
103516 - if (sk->sk_state == TCP_TIME_WAIT)
103517 + if (sk->sk_state == TCP_TIME_WAIT) {
103518 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103519 + ret = 2;
103520 +#endif
103521 goto do_time_wait;
103522 + }
103523
103524 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
103525 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103526 @@ -1486,6 +1501,10 @@ csum_error:
103527 bad_packet:
103528 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103529 } else {
103530 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103531 + if (!grsec_enable_blackhole || (ret == 1 &&
103532 + (skb->dev->flags & IFF_LOOPBACK)))
103533 +#endif
103534 tcp_v6_send_reset(NULL, skb);
103535 }
103536
103537 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
103538 index f6ba535..b41033f 100644
103539 --- a/net/ipv6/udp.c
103540 +++ b/net/ipv6/udp.c
103541 @@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
103542 udp_ipv6_hash_secret + net_hash_mix(net));
103543 }
103544
103545 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103546 +extern int grsec_enable_blackhole;
103547 +#endif
103548 +
103549 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
103550 {
103551 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
103552 @@ -434,7 +438,7 @@ try_again:
103553 if (unlikely(err)) {
103554 trace_kfree_skb(skb, udpv6_recvmsg);
103555 if (!peeked) {
103556 - atomic_inc(&sk->sk_drops);
103557 + atomic_inc_unchecked(&sk->sk_drops);
103558 if (is_udp4)
103559 UDP_INC_STATS_USER(sock_net(sk),
103560 UDP_MIB_INERRORS,
103561 @@ -701,7 +705,7 @@ csum_error:
103562 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
103563 drop:
103564 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
103565 - atomic_inc(&sk->sk_drops);
103566 + atomic_inc_unchecked(&sk->sk_drops);
103567 kfree_skb(skb);
103568 return -1;
103569 }
103570 @@ -740,7 +744,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
103571 if (likely(skb1 == NULL))
103572 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
103573 if (!skb1) {
103574 - atomic_inc(&sk->sk_drops);
103575 + atomic_inc_unchecked(&sk->sk_drops);
103576 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
103577 IS_UDPLITE(sk));
103578 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
103579 @@ -919,6 +923,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
103580 goto csum_error;
103581
103582 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
103583 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103584 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103585 +#endif
103586 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
103587
103588 kfree_skb(skb);
103589 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
103590 index 5f98364..5ca982a 100644
103591 --- a/net/ipv6/xfrm6_policy.c
103592 +++ b/net/ipv6/xfrm6_policy.c
103593 @@ -130,8 +130,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103594 {
103595 struct flowi6 *fl6 = &fl->u.ip6;
103596 int onlyproto = 0;
103597 - u16 offset = skb_network_header_len(skb);
103598 const struct ipv6hdr *hdr = ipv6_hdr(skb);
103599 + u16 offset = sizeof(*hdr);
103600 struct ipv6_opt_hdr *exthdr;
103601 const unsigned char *nh = skb_network_header(skb);
103602 u8 nexthdr = nh[IP6CB(skb)->nhoff];
103603 @@ -217,11 +217,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103604 }
103605 }
103606
103607 -static inline int xfrm6_garbage_collect(struct dst_ops *ops)
103608 +static int xfrm6_garbage_collect(struct dst_ops *ops)
103609 {
103610 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
103611
103612 - xfrm6_policy_afinfo.garbage_collect(net);
103613 + xfrm_garbage_collect_deferred(net);
103614 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
103615 }
103616
103617 @@ -334,19 +334,19 @@ static struct ctl_table xfrm6_policy_table[] = {
103618
103619 static int __net_init xfrm6_net_init(struct net *net)
103620 {
103621 - struct ctl_table *table;
103622 + ctl_table_no_const *table = NULL;
103623 struct ctl_table_header *hdr;
103624
103625 - table = xfrm6_policy_table;
103626 if (!net_eq(net, &init_net)) {
103627 - table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103628 + table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103629 if (!table)
103630 goto err_alloc;
103631
103632 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
103633 - }
103634 + hdr = register_net_sysctl(net, "net/ipv6", table);
103635 + } else
103636 + hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
103637
103638 - hdr = register_net_sysctl(net, "net/ipv6", table);
103639 if (!hdr)
103640 goto err_reg;
103641
103642 @@ -354,8 +354,7 @@ static int __net_init xfrm6_net_init(struct net *net)
103643 return 0;
103644
103645 err_reg:
103646 - if (!net_eq(net, &init_net))
103647 - kfree(table);
103648 + kfree(table);
103649 err_alloc:
103650 return -ENOMEM;
103651 }
103652 diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
103653 index e15c16a..7cf07aa 100644
103654 --- a/net/ipx/ipx_proc.c
103655 +++ b/net/ipx/ipx_proc.c
103656 @@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
103657 struct proc_dir_entry *p;
103658 int rc = -ENOMEM;
103659
103660 - ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
103661 + ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
103662
103663 if (!ipx_proc_dir)
103664 goto out;
103665 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
103666 index 61ceb4c..e788eb8 100644
103667 --- a/net/irda/ircomm/ircomm_tty.c
103668 +++ b/net/irda/ircomm/ircomm_tty.c
103669 @@ -317,10 +317,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103670 add_wait_queue(&port->open_wait, &wait);
103671
103672 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
103673 - __FILE__, __LINE__, tty->driver->name, port->count);
103674 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103675
103676 spin_lock_irqsave(&port->lock, flags);
103677 - port->count--;
103678 + atomic_dec(&port->count);
103679 port->blocked_open++;
103680 spin_unlock_irqrestore(&port->lock, flags);
103681
103682 @@ -355,7 +355,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103683 }
103684
103685 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
103686 - __FILE__, __LINE__, tty->driver->name, port->count);
103687 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103688
103689 schedule();
103690 }
103691 @@ -365,12 +365,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103692
103693 spin_lock_irqsave(&port->lock, flags);
103694 if (!tty_hung_up_p(filp))
103695 - port->count++;
103696 + atomic_inc(&port->count);
103697 port->blocked_open--;
103698 spin_unlock_irqrestore(&port->lock, flags);
103699
103700 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
103701 - __FILE__, __LINE__, tty->driver->name, port->count);
103702 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103703
103704 if (!retval)
103705 port->flags |= ASYNC_NORMAL_ACTIVE;
103706 @@ -444,12 +444,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
103707
103708 /* ++ is not atomic, so this should be protected - Jean II */
103709 spin_lock_irqsave(&self->port.lock, flags);
103710 - self->port.count++;
103711 + atomic_inc(&self->port.count);
103712 spin_unlock_irqrestore(&self->port.lock, flags);
103713 tty_port_tty_set(&self->port, tty);
103714
103715 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
103716 - self->line, self->port.count);
103717 + self->line, atomic_read(&self->port.count));
103718
103719 /* Not really used by us, but lets do it anyway */
103720 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
103721 @@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
103722 tty_kref_put(port->tty);
103723 }
103724 port->tty = NULL;
103725 - port->count = 0;
103726 + atomic_set(&port->count, 0);
103727 spin_unlock_irqrestore(&port->lock, flags);
103728
103729 wake_up_interruptible(&port->open_wait);
103730 @@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
103731 seq_putc(m, '\n');
103732
103733 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
103734 - seq_printf(m, "Open count: %d\n", self->port.count);
103735 + seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
103736 seq_printf(m, "Max data size: %d\n", self->max_data_size);
103737 seq_printf(m, "Max header size: %d\n", self->max_header_size);
103738
103739 diff --git a/net/irda/irproc.c b/net/irda/irproc.c
103740 index b9ac598..f88cc56 100644
103741 --- a/net/irda/irproc.c
103742 +++ b/net/irda/irproc.c
103743 @@ -66,7 +66,7 @@ void __init irda_proc_register(void)
103744 {
103745 int i;
103746
103747 - proc_irda = proc_mkdir("irda", init_net.proc_net);
103748 + proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
103749 if (proc_irda == NULL)
103750 return;
103751
103752 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
103753 index a089b6b..3ca3b60 100644
103754 --- a/net/iucv/af_iucv.c
103755 +++ b/net/iucv/af_iucv.c
103756 @@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
103757 {
103758 char name[12];
103759
103760 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
103761 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103762 while (__iucv_get_sock_by_name(name)) {
103763 sprintf(name, "%08x",
103764 - atomic_inc_return(&iucv_sk_list.autobind_name));
103765 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103766 }
103767 memcpy(iucv->src_name, name, 8);
103768 }
103769 diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
103770 index 2a6a1fd..6c112b0 100644
103771 --- a/net/iucv/iucv.c
103772 +++ b/net/iucv/iucv.c
103773 @@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
103774 return NOTIFY_OK;
103775 }
103776
103777 -static struct notifier_block __refdata iucv_cpu_notifier = {
103778 +static struct notifier_block iucv_cpu_notifier = {
103779 .notifier_call = iucv_cpu_notify,
103780 };
103781
103782 diff --git a/net/key/af_key.c b/net/key/af_key.c
103783 index 1847ec4..26ef732 100644
103784 --- a/net/key/af_key.c
103785 +++ b/net/key/af_key.c
103786 @@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
103787 static u32 get_acqseq(void)
103788 {
103789 u32 res;
103790 - static atomic_t acqseq;
103791 + static atomic_unchecked_t acqseq;
103792
103793 do {
103794 - res = atomic_inc_return(&acqseq);
103795 + res = atomic_inc_return_unchecked(&acqseq);
103796 } while (!res);
103797 return res;
103798 }
103799 diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
103800 index edb78e6..8dc654a 100644
103801 --- a/net/l2tp/l2tp_eth.c
103802 +++ b/net/l2tp/l2tp_eth.c
103803 @@ -42,12 +42,12 @@ struct l2tp_eth {
103804 struct sock *tunnel_sock;
103805 struct l2tp_session *session;
103806 struct list_head list;
103807 - atomic_long_t tx_bytes;
103808 - atomic_long_t tx_packets;
103809 - atomic_long_t tx_dropped;
103810 - atomic_long_t rx_bytes;
103811 - atomic_long_t rx_packets;
103812 - atomic_long_t rx_errors;
103813 + atomic_long_unchecked_t tx_bytes;
103814 + atomic_long_unchecked_t tx_packets;
103815 + atomic_long_unchecked_t tx_dropped;
103816 + atomic_long_unchecked_t rx_bytes;
103817 + atomic_long_unchecked_t rx_packets;
103818 + atomic_long_unchecked_t rx_errors;
103819 };
103820
103821 /* via l2tp_session_priv() */
103822 @@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
103823 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
103824
103825 if (likely(ret == NET_XMIT_SUCCESS)) {
103826 - atomic_long_add(len, &priv->tx_bytes);
103827 - atomic_long_inc(&priv->tx_packets);
103828 + atomic_long_add_unchecked(len, &priv->tx_bytes);
103829 + atomic_long_inc_unchecked(&priv->tx_packets);
103830 } else {
103831 - atomic_long_inc(&priv->tx_dropped);
103832 + atomic_long_inc_unchecked(&priv->tx_dropped);
103833 }
103834 return NETDEV_TX_OK;
103835 }
103836 @@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
103837 {
103838 struct l2tp_eth *priv = netdev_priv(dev);
103839
103840 - stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
103841 - stats->tx_packets = atomic_long_read(&priv->tx_packets);
103842 - stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
103843 - stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
103844 - stats->rx_packets = atomic_long_read(&priv->rx_packets);
103845 - stats->rx_errors = atomic_long_read(&priv->rx_errors);
103846 + stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
103847 + stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
103848 + stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
103849 + stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
103850 + stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
103851 + stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
103852 return stats;
103853 }
103854
103855 @@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
103856 nf_reset(skb);
103857
103858 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
103859 - atomic_long_inc(&priv->rx_packets);
103860 - atomic_long_add(data_len, &priv->rx_bytes);
103861 + atomic_long_inc_unchecked(&priv->rx_packets);
103862 + atomic_long_add_unchecked(data_len, &priv->rx_bytes);
103863 } else {
103864 - atomic_long_inc(&priv->rx_errors);
103865 + atomic_long_inc_unchecked(&priv->rx_errors);
103866 }
103867 return;
103868
103869 error:
103870 - atomic_long_inc(&priv->rx_errors);
103871 + atomic_long_inc_unchecked(&priv->rx_errors);
103872 kfree_skb(skb);
103873 }
103874
103875 diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
103876 index 1a3c7e0..80f8b0c 100644
103877 --- a/net/llc/llc_proc.c
103878 +++ b/net/llc/llc_proc.c
103879 @@ -247,7 +247,7 @@ int __init llc_proc_init(void)
103880 int rc = -ENOMEM;
103881 struct proc_dir_entry *p;
103882
103883 - llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
103884 + llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
103885 if (!llc_proc_dir)
103886 goto out;
103887
103888 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
103889 index 343da1e..509873f 100644
103890 --- a/net/mac80211/cfg.c
103891 +++ b/net/mac80211/cfg.c
103892 @@ -541,7 +541,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
103893 ret = ieee80211_vif_use_channel(sdata, chandef,
103894 IEEE80211_CHANCTX_EXCLUSIVE);
103895 }
103896 - } else if (local->open_count == local->monitors) {
103897 + } else if (local_read(&local->open_count) == local->monitors) {
103898 local->_oper_chandef = *chandef;
103899 ieee80211_hw_config(local, 0);
103900 }
103901 @@ -3326,7 +3326,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
103902 else
103903 local->probe_req_reg--;
103904
103905 - if (!local->open_count)
103906 + if (!local_read(&local->open_count))
103907 break;
103908
103909 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
103910 @@ -3460,8 +3460,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
103911 if (chanctx_conf) {
103912 *chandef = sdata->vif.bss_conf.chandef;
103913 ret = 0;
103914 - } else if (local->open_count > 0 &&
103915 - local->open_count == local->monitors &&
103916 + } else if (local_read(&local->open_count) > 0 &&
103917 + local_read(&local->open_count) == local->monitors &&
103918 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
103919 if (local->use_chanctx)
103920 *chandef = local->monitor_chandef;
103921 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
103922 index 8c68da3..0695016 100644
103923 --- a/net/mac80211/ieee80211_i.h
103924 +++ b/net/mac80211/ieee80211_i.h
103925 @@ -29,6 +29,7 @@
103926 #include <net/ieee80211_radiotap.h>
103927 #include <net/cfg80211.h>
103928 #include <net/mac80211.h>
103929 +#include <asm/local.h>
103930 #include "key.h"
103931 #include "sta_info.h"
103932 #include "debug.h"
103933 @@ -1057,7 +1058,7 @@ struct ieee80211_local {
103934 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
103935 spinlock_t queue_stop_reason_lock;
103936
103937 - int open_count;
103938 + local_t open_count;
103939 int monitors, cooked_mntrs;
103940 /* number of interfaces with corresponding FIF_ flags */
103941 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
103942 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
103943 index 653f5eb..02994ee 100644
103944 --- a/net/mac80211/iface.c
103945 +++ b/net/mac80211/iface.c
103946 @@ -532,7 +532,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103947 break;
103948 }
103949
103950 - if (local->open_count == 0) {
103951 + if (local_read(&local->open_count) == 0) {
103952 res = drv_start(local);
103953 if (res)
103954 goto err_del_bss;
103955 @@ -579,7 +579,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103956 res = drv_add_interface(local, sdata);
103957 if (res)
103958 goto err_stop;
103959 - } else if (local->monitors == 0 && local->open_count == 0) {
103960 + } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
103961 res = ieee80211_add_virtual_monitor(local);
103962 if (res)
103963 goto err_stop;
103964 @@ -688,7 +688,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103965 atomic_inc(&local->iff_promiscs);
103966
103967 if (coming_up)
103968 - local->open_count++;
103969 + local_inc(&local->open_count);
103970
103971 if (hw_reconf_flags)
103972 ieee80211_hw_config(local, hw_reconf_flags);
103973 @@ -726,7 +726,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103974 err_del_interface:
103975 drv_remove_interface(local, sdata);
103976 err_stop:
103977 - if (!local->open_count)
103978 + if (!local_read(&local->open_count))
103979 drv_stop(local);
103980 err_del_bss:
103981 sdata->bss = NULL;
103982 @@ -892,7 +892,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103983 }
103984
103985 if (going_down)
103986 - local->open_count--;
103987 + local_dec(&local->open_count);
103988
103989 switch (sdata->vif.type) {
103990 case NL80211_IFTYPE_AP_VLAN:
103991 @@ -954,7 +954,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103992 }
103993 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
103994
103995 - if (local->open_count == 0)
103996 + if (local_read(&local->open_count) == 0)
103997 ieee80211_clear_tx_pending(local);
103998
103999 /*
104000 @@ -997,7 +997,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104001 if (cancel_scan)
104002 flush_delayed_work(&local->scan_work);
104003
104004 - if (local->open_count == 0) {
104005 + if (local_read(&local->open_count) == 0) {
104006 ieee80211_stop_device(local);
104007
104008 /* no reconfiguring after stop! */
104009 @@ -1008,7 +1008,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104010 ieee80211_configure_filter(local);
104011 ieee80211_hw_config(local, hw_reconf_flags);
104012
104013 - if (local->monitors == local->open_count)
104014 + if (local->monitors == local_read(&local->open_count))
104015 ieee80211_add_virtual_monitor(local);
104016 }
104017
104018 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
104019 index 0de7c93..884b2ca 100644
104020 --- a/net/mac80211/main.c
104021 +++ b/net/mac80211/main.c
104022 @@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
104023 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
104024 IEEE80211_CONF_CHANGE_POWER);
104025
104026 - if (changed && local->open_count) {
104027 + if (changed && local_read(&local->open_count)) {
104028 ret = drv_config(local, changed);
104029 /*
104030 * Goal:
104031 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
104032 index 4c5192e..04cc0d8 100644
104033 --- a/net/mac80211/pm.c
104034 +++ b/net/mac80211/pm.c
104035 @@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104036 struct ieee80211_sub_if_data *sdata;
104037 struct sta_info *sta;
104038
104039 - if (!local->open_count)
104040 + if (!local_read(&local->open_count))
104041 goto suspend;
104042
104043 ieee80211_scan_cancel(local);
104044 @@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104045 cancel_work_sync(&local->dynamic_ps_enable_work);
104046 del_timer_sync(&local->dynamic_ps_timer);
104047
104048 - local->wowlan = wowlan && local->open_count;
104049 + local->wowlan = wowlan && local_read(&local->open_count);
104050 if (local->wowlan) {
104051 int err = drv_suspend(local, wowlan);
104052 if (err < 0) {
104053 @@ -125,7 +125,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104054 WARN_ON(!list_empty(&local->chanctx_list));
104055
104056 /* stop hardware - this must stop RX */
104057 - if (local->open_count)
104058 + if (local_read(&local->open_count))
104059 ieee80211_stop_device(local);
104060
104061 suspend:
104062 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
104063 index 6081329..ab23834 100644
104064 --- a/net/mac80211/rate.c
104065 +++ b/net/mac80211/rate.c
104066 @@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
104067
104068 ASSERT_RTNL();
104069
104070 - if (local->open_count)
104071 + if (local_read(&local->open_count))
104072 return -EBUSY;
104073
104074 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
104075 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
104076 index 3c61060..7bed2e3 100644
104077 --- a/net/mac80211/util.c
104078 +++ b/net/mac80211/util.c
104079 @@ -1669,7 +1669,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104080 }
104081 #endif
104082 /* everything else happens only if HW was up & running */
104083 - if (!local->open_count)
104084 + if (!local_read(&local->open_count))
104085 goto wake_up;
104086
104087 /*
104088 @@ -1895,7 +1895,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104089 local->in_reconfig = false;
104090 barrier();
104091
104092 - if (local->monitors == local->open_count && local->monitors > 0)
104093 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
104094 ieee80211_add_virtual_monitor(local);
104095
104096 /*
104097 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
104098 index ae5096ab..e5aa70a 100644
104099 --- a/net/netfilter/Kconfig
104100 +++ b/net/netfilter/Kconfig
104101 @@ -1105,6 +1105,16 @@ config NETFILTER_XT_MATCH_ESP
104102
104103 To compile it as a module, choose M here. If unsure, say N.
104104
104105 +config NETFILTER_XT_MATCH_GRADM
104106 + tristate '"gradm" match support'
104107 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
104108 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
104109 + ---help---
104110 + The gradm match allows to match on grsecurity RBAC being enabled.
104111 + It is useful when iptables rules are applied early on bootup to
104112 + prevent connections to the machine (except from a trusted host)
104113 + while the RBAC system is disabled.
104114 +
104115 config NETFILTER_XT_MATCH_HASHLIMIT
104116 tristate '"hashlimit" match support'
104117 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
104118 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
104119 index a9571be..c59e173 100644
104120 --- a/net/netfilter/Makefile
104121 +++ b/net/netfilter/Makefile
104122 @@ -137,6 +137,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
104123 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
104124 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
104125 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
104126 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
104127 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
104128 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
104129 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
104130 diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
104131 index d259da3..6a32b2c 100644
104132 --- a/net/netfilter/ipset/ip_set_core.c
104133 +++ b/net/netfilter/ipset/ip_set_core.c
104134 @@ -1952,7 +1952,7 @@ done:
104135 return ret;
104136 }
104137
104138 -static struct nf_sockopt_ops so_set __read_mostly = {
104139 +static struct nf_sockopt_ops so_set = {
104140 .pf = PF_INET,
104141 .get_optmin = SO_IP_SET,
104142 .get_optmax = SO_IP_SET + 1,
104143 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
104144 index b0f7b62..0541842 100644
104145 --- a/net/netfilter/ipvs/ip_vs_conn.c
104146 +++ b/net/netfilter/ipvs/ip_vs_conn.c
104147 @@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
104148 /* Increase the refcnt counter of the dest */
104149 ip_vs_dest_hold(dest);
104150
104151 - conn_flags = atomic_read(&dest->conn_flags);
104152 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
104153 if (cp->protocol != IPPROTO_UDP)
104154 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
104155 flags = cp->flags;
104156 @@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
104157
104158 cp->control = NULL;
104159 atomic_set(&cp->n_control, 0);
104160 - atomic_set(&cp->in_pkts, 0);
104161 + atomic_set_unchecked(&cp->in_pkts, 0);
104162
104163 cp->packet_xmit = NULL;
104164 cp->app = NULL;
104165 @@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
104166
104167 /* Don't drop the entry if its number of incoming packets is not
104168 located in [0, 8] */
104169 - i = atomic_read(&cp->in_pkts);
104170 + i = atomic_read_unchecked(&cp->in_pkts);
104171 if (i > 8 || i < 0) return 0;
104172
104173 if (!todrop_rate[i]) return 0;
104174 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
104175 index 990decb..5075248 100644
104176 --- a/net/netfilter/ipvs/ip_vs_core.c
104177 +++ b/net/netfilter/ipvs/ip_vs_core.c
104178 @@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
104179 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
104180 /* do not touch skb anymore */
104181
104182 - atomic_inc(&cp->in_pkts);
104183 + atomic_inc_unchecked(&cp->in_pkts);
104184 ip_vs_conn_put(cp);
104185 return ret;
104186 }
104187 @@ -1712,7 +1712,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
104188 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
104189 pkts = sysctl_sync_threshold(ipvs);
104190 else
104191 - pkts = atomic_add_return(1, &cp->in_pkts);
104192 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104193
104194 if (ipvs->sync_state & IP_VS_STATE_MASTER)
104195 ip_vs_sync_conn(net, cp, pkts);
104196 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
104197 index ac7ba68..9735acb9 100644
104198 --- a/net/netfilter/ipvs/ip_vs_ctl.c
104199 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
104200 @@ -800,7 +800,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
104201 */
104202 ip_vs_rs_hash(ipvs, dest);
104203 }
104204 - atomic_set(&dest->conn_flags, conn_flags);
104205 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
104206
104207 /* bind the service */
104208 old_svc = rcu_dereference_protected(dest->svc, 1);
104209 @@ -1665,7 +1665,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
104210 * align with netns init in ip_vs_control_net_init()
104211 */
104212
104213 -static struct ctl_table vs_vars[] = {
104214 +static ctl_table_no_const vs_vars[] __read_only = {
104215 {
104216 .procname = "amemthresh",
104217 .maxlen = sizeof(int),
104218 @@ -2000,7 +2000,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104219 " %-7s %-6d %-10d %-10d\n",
104220 &dest->addr.in6,
104221 ntohs(dest->port),
104222 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104223 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104224 atomic_read(&dest->weight),
104225 atomic_read(&dest->activeconns),
104226 atomic_read(&dest->inactconns));
104227 @@ -2011,7 +2011,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104228 "%-7s %-6d %-10d %-10d\n",
104229 ntohl(dest->addr.ip),
104230 ntohs(dest->port),
104231 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104232 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104233 atomic_read(&dest->weight),
104234 atomic_read(&dest->activeconns),
104235 atomic_read(&dest->inactconns));
104236 @@ -2500,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
104237
104238 entry.addr = dest->addr.ip;
104239 entry.port = dest->port;
104240 - entry.conn_flags = atomic_read(&dest->conn_flags);
104241 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
104242 entry.weight = atomic_read(&dest->weight);
104243 entry.u_threshold = dest->u_threshold;
104244 entry.l_threshold = dest->l_threshold;
104245 @@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
104246 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
104247 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
104248 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
104249 - (atomic_read(&dest->conn_flags) &
104250 + (atomic_read_unchecked(&dest->conn_flags) &
104251 IP_VS_CONN_F_FWD_MASK)) ||
104252 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
104253 atomic_read(&dest->weight)) ||
104254 @@ -3673,7 +3673,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
104255 {
104256 int idx;
104257 struct netns_ipvs *ipvs = net_ipvs(net);
104258 - struct ctl_table *tbl;
104259 + ctl_table_no_const *tbl;
104260
104261 atomic_set(&ipvs->dropentry, 0);
104262 spin_lock_init(&ipvs->dropentry_lock);
104263 diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
104264 index 127f140..553d652 100644
104265 --- a/net/netfilter/ipvs/ip_vs_lblc.c
104266 +++ b/net/netfilter/ipvs/ip_vs_lblc.c
104267 @@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
104268 * IPVS LBLC sysctl table
104269 */
104270 #ifdef CONFIG_SYSCTL
104271 -static struct ctl_table vs_vars_table[] = {
104272 +static ctl_table_no_const vs_vars_table[] __read_only = {
104273 {
104274 .procname = "lblc_expiration",
104275 .data = NULL,
104276 diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
104277 index 2229d2d..b32b785 100644
104278 --- a/net/netfilter/ipvs/ip_vs_lblcr.c
104279 +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
104280 @@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
104281 * IPVS LBLCR sysctl table
104282 */
104283
104284 -static struct ctl_table vs_vars_table[] = {
104285 +static ctl_table_no_const vs_vars_table[] __read_only = {
104286 {
104287 .procname = "lblcr_expiration",
104288 .data = NULL,
104289 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
104290 index 7162c86..9eeb60e 100644
104291 --- a/net/netfilter/ipvs/ip_vs_sync.c
104292 +++ b/net/netfilter/ipvs/ip_vs_sync.c
104293 @@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
104294 cp = cp->control;
104295 if (cp) {
104296 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104297 - pkts = atomic_add_return(1, &cp->in_pkts);
104298 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104299 else
104300 pkts = sysctl_sync_threshold(ipvs);
104301 ip_vs_sync_conn(net, cp->control, pkts);
104302 @@ -771,7 +771,7 @@ control:
104303 if (!cp)
104304 return;
104305 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104306 - pkts = atomic_add_return(1, &cp->in_pkts);
104307 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104308 else
104309 pkts = sysctl_sync_threshold(ipvs);
104310 goto sloop;
104311 @@ -901,7 +901,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
104312
104313 if (opt)
104314 memcpy(&cp->in_seq, opt, sizeof(*opt));
104315 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104316 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104317 cp->state = state;
104318 cp->old_state = cp->state;
104319 /*
104320 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
104321 index bd90bf8..816a020d 100644
104322 --- a/net/netfilter/ipvs/ip_vs_xmit.c
104323 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
104324 @@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
104325 else
104326 rc = NF_ACCEPT;
104327 /* do not touch skb anymore */
104328 - atomic_inc(&cp->in_pkts);
104329 + atomic_inc_unchecked(&cp->in_pkts);
104330 goto out;
104331 }
104332
104333 @@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
104334 else
104335 rc = NF_ACCEPT;
104336 /* do not touch skb anymore */
104337 - atomic_inc(&cp->in_pkts);
104338 + atomic_inc_unchecked(&cp->in_pkts);
104339 goto out;
104340 }
104341
104342 diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
104343 index a4b5e2a..13b1de3 100644
104344 --- a/net/netfilter/nf_conntrack_acct.c
104345 +++ b/net/netfilter/nf_conntrack_acct.c
104346 @@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
104347 #ifdef CONFIG_SYSCTL
104348 static int nf_conntrack_acct_init_sysctl(struct net *net)
104349 {
104350 - struct ctl_table *table;
104351 + ctl_table_no_const *table;
104352
104353 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
104354 GFP_KERNEL);
104355 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
104356 index 5016a69..594f8e9 100644
104357 --- a/net/netfilter/nf_conntrack_core.c
104358 +++ b/net/netfilter/nf_conntrack_core.c
104359 @@ -1739,6 +1739,10 @@ void nf_conntrack_init_end(void)
104360 #define DYING_NULLS_VAL ((1<<30)+1)
104361 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
104362
104363 +#ifdef CONFIG_GRKERNSEC_HIDESYM
104364 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
104365 +#endif
104366 +
104367 int nf_conntrack_init_net(struct net *net)
104368 {
104369 int ret = -ENOMEM;
104370 @@ -1764,7 +1768,11 @@ int nf_conntrack_init_net(struct net *net)
104371 if (!net->ct.stat)
104372 goto err_pcpu_lists;
104373
104374 +#ifdef CONFIG_GRKERNSEC_HIDESYM
104375 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
104376 +#else
104377 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
104378 +#endif
104379 if (!net->ct.slabname)
104380 goto err_slabname;
104381
104382 diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
104383 index 4e78c57..ec8fb74 100644
104384 --- a/net/netfilter/nf_conntrack_ecache.c
104385 +++ b/net/netfilter/nf_conntrack_ecache.c
104386 @@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
104387 #ifdef CONFIG_SYSCTL
104388 static int nf_conntrack_event_init_sysctl(struct net *net)
104389 {
104390 - struct ctl_table *table;
104391 + ctl_table_no_const *table;
104392
104393 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
104394 GFP_KERNEL);
104395 diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
104396 index 5b3eae7..dd4b8fe 100644
104397 --- a/net/netfilter/nf_conntrack_helper.c
104398 +++ b/net/netfilter/nf_conntrack_helper.c
104399 @@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
104400
104401 static int nf_conntrack_helper_init_sysctl(struct net *net)
104402 {
104403 - struct ctl_table *table;
104404 + ctl_table_no_const *table;
104405
104406 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
104407 GFP_KERNEL);
104408 diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
104409 index b65d586..beec902 100644
104410 --- a/net/netfilter/nf_conntrack_proto.c
104411 +++ b/net/netfilter/nf_conntrack_proto.c
104412 @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
104413
104414 static void
104415 nf_ct_unregister_sysctl(struct ctl_table_header **header,
104416 - struct ctl_table **table,
104417 + ctl_table_no_const **table,
104418 unsigned int users)
104419 {
104420 if (users > 0)
104421 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
104422 index cf65a1e..2f291e9 100644
104423 --- a/net/netfilter/nf_conntrack_standalone.c
104424 +++ b/net/netfilter/nf_conntrack_standalone.c
104425 @@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
104426
104427 static int nf_conntrack_standalone_init_sysctl(struct net *net)
104428 {
104429 - struct ctl_table *table;
104430 + ctl_table_no_const *table;
104431
104432 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
104433 GFP_KERNEL);
104434 diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
104435 index 7a394df..bd91a8a 100644
104436 --- a/net/netfilter/nf_conntrack_timestamp.c
104437 +++ b/net/netfilter/nf_conntrack_timestamp.c
104438 @@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
104439 #ifdef CONFIG_SYSCTL
104440 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
104441 {
104442 - struct ctl_table *table;
104443 + ctl_table_no_const *table;
104444
104445 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
104446 GFP_KERNEL);
104447 diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
104448 index d719764..311bc60 100644
104449 --- a/net/netfilter/nf_log.c
104450 +++ b/net/netfilter/nf_log.c
104451 @@ -353,7 +353,7 @@ static const struct file_operations nflog_file_ops = {
104452
104453 #ifdef CONFIG_SYSCTL
104454 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
104455 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
104456 +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
104457
104458 static int nf_log_proc_dostring(struct ctl_table *table, int write,
104459 void __user *buffer, size_t *lenp, loff_t *ppos)
104460 @@ -384,14 +384,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
104461 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
104462 mutex_unlock(&nf_log_mutex);
104463 } else {
104464 + ctl_table_no_const nf_log_table = *table;
104465 +
104466 mutex_lock(&nf_log_mutex);
104467 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
104468 lockdep_is_held(&nf_log_mutex));
104469 if (!logger)
104470 - table->data = "NONE";
104471 + nf_log_table.data = "NONE";
104472 else
104473 - table->data = logger->name;
104474 - r = proc_dostring(table, write, buffer, lenp, ppos);
104475 + nf_log_table.data = logger->name;
104476 + r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
104477 mutex_unlock(&nf_log_mutex);
104478 }
104479
104480 diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
104481 index c68c1e5..8b5d670 100644
104482 --- a/net/netfilter/nf_sockopt.c
104483 +++ b/net/netfilter/nf_sockopt.c
104484 @@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
104485 }
104486 }
104487
104488 - list_add(&reg->list, &nf_sockopts);
104489 + pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
104490 out:
104491 mutex_unlock(&nf_sockopt_mutex);
104492 return ret;
104493 @@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
104494 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
104495 {
104496 mutex_lock(&nf_sockopt_mutex);
104497 - list_del(&reg->list);
104498 + pax_list_del((struct list_head *)&reg->list);
104499 mutex_unlock(&nf_sockopt_mutex);
104500 }
104501 EXPORT_SYMBOL(nf_unregister_sockopt);
104502 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
104503 index 5f1be5b..2cba8cd 100644
104504 --- a/net/netfilter/nfnetlink_log.c
104505 +++ b/net/netfilter/nfnetlink_log.c
104506 @@ -80,7 +80,7 @@ static int nfnl_log_net_id __read_mostly;
104507 struct nfnl_log_net {
104508 spinlock_t instances_lock;
104509 struct hlist_head instance_table[INSTANCE_BUCKETS];
104510 - atomic_t global_seq;
104511 + atomic_unchecked_t global_seq;
104512 };
104513
104514 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
104515 @@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
104516 /* global sequence number */
104517 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
104518 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
104519 - htonl(atomic_inc_return(&log->global_seq))))
104520 + htonl(atomic_inc_return_unchecked(&log->global_seq))))
104521 goto nla_put_failure;
104522
104523 if (data_len) {
104524 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
104525 new file mode 100644
104526 index 0000000..c566332
104527 --- /dev/null
104528 +++ b/net/netfilter/xt_gradm.c
104529 @@ -0,0 +1,51 @@
104530 +/*
104531 + * gradm match for netfilter
104532 + * Copyright © Zbigniew Krzystolik, 2010
104533 + *
104534 + * This program is free software; you can redistribute it and/or modify
104535 + * it under the terms of the GNU General Public License; either version
104536 + * 2 or 3 as published by the Free Software Foundation.
104537 + */
104538 +#include <linux/module.h>
104539 +#include <linux/moduleparam.h>
104540 +#include <linux/skbuff.h>
104541 +#include <linux/netfilter/x_tables.h>
104542 +#include <linux/grsecurity.h>
104543 +#include <linux/netfilter/xt_gradm.h>
104544 +
104545 +static bool
104546 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
104547 +{
104548 + const struct xt_gradm_mtinfo *info = par->matchinfo;
104549 + bool retval = false;
104550 + if (gr_acl_is_enabled())
104551 + retval = true;
104552 + return retval ^ info->invflags;
104553 +}
104554 +
104555 +static struct xt_match gradm_mt_reg __read_mostly = {
104556 + .name = "gradm",
104557 + .revision = 0,
104558 + .family = NFPROTO_UNSPEC,
104559 + .match = gradm_mt,
104560 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
104561 + .me = THIS_MODULE,
104562 +};
104563 +
104564 +static int __init gradm_mt_init(void)
104565 +{
104566 + return xt_register_match(&gradm_mt_reg);
104567 +}
104568 +
104569 +static void __exit gradm_mt_exit(void)
104570 +{
104571 + xt_unregister_match(&gradm_mt_reg);
104572 +}
104573 +
104574 +module_init(gradm_mt_init);
104575 +module_exit(gradm_mt_exit);
104576 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
104577 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
104578 +MODULE_LICENSE("GPL");
104579 +MODULE_ALIAS("ipt_gradm");
104580 +MODULE_ALIAS("ip6t_gradm");
104581 diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
104582 index 05fbc2a..4424b5c 100644
104583 --- a/net/netfilter/xt_hashlimit.c
104584 +++ b/net/netfilter/xt_hashlimit.c
104585 @@ -871,11 +871,11 @@ static int __net_init hashlimit_proc_net_init(struct net *net)
104586 {
104587 struct hashlimit_net *hashlimit_net = hashlimit_pernet(net);
104588
104589 - hashlimit_net->ipt_hashlimit = proc_mkdir("ipt_hashlimit", net->proc_net);
104590 + hashlimit_net->ipt_hashlimit = proc_mkdir_restrict("ipt_hashlimit", net->proc_net);
104591 if (!hashlimit_net->ipt_hashlimit)
104592 return -ENOMEM;
104593 #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
104594 - hashlimit_net->ip6t_hashlimit = proc_mkdir("ip6t_hashlimit", net->proc_net);
104595 + hashlimit_net->ip6t_hashlimit = proc_mkdir_restrict("ip6t_hashlimit", net->proc_net);
104596 if (!hashlimit_net->ip6t_hashlimit) {
104597 remove_proc_entry("ipt_hashlimit", net->proc_net);
104598 return -ENOMEM;
104599 diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
104600 index a9faae8..1ea30e0 100644
104601 --- a/net/netfilter/xt_recent.c
104602 +++ b/net/netfilter/xt_recent.c
104603 @@ -615,7 +615,7 @@ static int __net_init recent_proc_net_init(struct net *net)
104604 {
104605 struct recent_net *recent_net = recent_pernet(net);
104606
104607 - recent_net->xt_recent = proc_mkdir("xt_recent", net->proc_net);
104608 + recent_net->xt_recent = proc_mkdir_restrict("xt_recent", net->proc_net);
104609 if (!recent_net->xt_recent)
104610 return -ENOMEM;
104611 return 0;
104612 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
104613 index 11de55e..f25e448 100644
104614 --- a/net/netfilter/xt_statistic.c
104615 +++ b/net/netfilter/xt_statistic.c
104616 @@ -19,7 +19,7 @@
104617 #include <linux/module.h>
104618
104619 struct xt_statistic_priv {
104620 - atomic_t count;
104621 + atomic_unchecked_t count;
104622 } ____cacheline_aligned_in_smp;
104623
104624 MODULE_LICENSE("GPL");
104625 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
104626 break;
104627 case XT_STATISTIC_MODE_NTH:
104628 do {
104629 - oval = atomic_read(&info->master->count);
104630 + oval = atomic_read_unchecked(&info->master->count);
104631 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
104632 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
104633 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
104634 if (nval == 0)
104635 ret = !ret;
104636 break;
104637 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
104638 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
104639 if (info->master == NULL)
104640 return -ENOMEM;
104641 - atomic_set(&info->master->count, info->u.nth.count);
104642 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
104643
104644 return 0;
104645 }
104646 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
104647 index b6bf8e8..7884ddf 100644
104648 --- a/net/netlink/af_netlink.c
104649 +++ b/net/netlink/af_netlink.c
104650 @@ -273,7 +273,7 @@ static void netlink_overrun(struct sock *sk)
104651 sk->sk_error_report(sk);
104652 }
104653 }
104654 - atomic_inc(&sk->sk_drops);
104655 + atomic_inc_unchecked(&sk->sk_drops);
104656 }
104657
104658 static void netlink_rcv_wake(struct sock *sk)
104659 @@ -3010,7 +3010,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
104660 sk_wmem_alloc_get(s),
104661 nlk->cb_running,
104662 atomic_read(&s->sk_refcnt),
104663 - atomic_read(&s->sk_drops),
104664 + atomic_read_unchecked(&s->sk_drops),
104665 sock_i_ino(s)
104666 );
104667
104668 diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
104669 index 8451612..c8872bc 100644
104670 --- a/net/openvswitch/vport-internal_dev.c
104671 +++ b/net/openvswitch/vport-internal_dev.c
104672 @@ -122,7 +122,7 @@ static const struct net_device_ops internal_dev_netdev_ops = {
104673 .ndo_get_stats64 = internal_dev_get_stats,
104674 };
104675
104676 -static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
104677 +static struct rtnl_link_ops internal_dev_link_ops = {
104678 .kind = "openvswitch",
104679 };
104680
104681 diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
104682 index 6015802..e81e8bf 100644
104683 --- a/net/openvswitch/vport.c
104684 +++ b/net/openvswitch/vport.c
104685 @@ -269,10 +269,10 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
104686 * netdev-stats can be directly read over netlink-ioctl.
104687 */
104688
104689 - stats->rx_errors = atomic_long_read(&vport->err_stats.rx_errors);
104690 - stats->tx_errors = atomic_long_read(&vport->err_stats.tx_errors);
104691 - stats->tx_dropped = atomic_long_read(&vport->err_stats.tx_dropped);
104692 - stats->rx_dropped = atomic_long_read(&vport->err_stats.rx_dropped);
104693 + stats->rx_errors = atomic_long_read_unchecked(&vport->err_stats.rx_errors);
104694 + stats->tx_errors = atomic_long_read_unchecked(&vport->err_stats.tx_errors);
104695 + stats->tx_dropped = atomic_long_read_unchecked(&vport->err_stats.tx_dropped);
104696 + stats->rx_dropped = atomic_long_read_unchecked(&vport->err_stats.rx_dropped);
104697
104698 for_each_possible_cpu(i) {
104699 const struct pcpu_sw_netstats *percpu_stats;
104700 @@ -503,19 +503,19 @@ static void ovs_vport_record_error(struct vport *vport,
104701 {
104702 switch (err_type) {
104703 case VPORT_E_RX_DROPPED:
104704 - atomic_long_inc(&vport->err_stats.rx_dropped);
104705 + atomic_long_inc_unchecked(&vport->err_stats.rx_dropped);
104706 break;
104707
104708 case VPORT_E_RX_ERROR:
104709 - atomic_long_inc(&vport->err_stats.rx_errors);
104710 + atomic_long_inc_unchecked(&vport->err_stats.rx_errors);
104711 break;
104712
104713 case VPORT_E_TX_DROPPED:
104714 - atomic_long_inc(&vport->err_stats.tx_dropped);
104715 + atomic_long_inc_unchecked(&vport->err_stats.tx_dropped);
104716 break;
104717
104718 case VPORT_E_TX_ERROR:
104719 - atomic_long_inc(&vport->err_stats.tx_errors);
104720 + atomic_long_inc_unchecked(&vport->err_stats.tx_errors);
104721 break;
104722 }
104723
104724 diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
104725 index 8942125..03ed887 100644
104726 --- a/net/openvswitch/vport.h
104727 +++ b/net/openvswitch/vport.h
104728 @@ -61,10 +61,10 @@ int ovs_vport_send(struct vport *, struct sk_buff *);
104729 /* The following definitions are for implementers of vport devices: */
104730
104731 struct vport_err_stats {
104732 - atomic_long_t rx_dropped;
104733 - atomic_long_t rx_errors;
104734 - atomic_long_t tx_dropped;
104735 - atomic_long_t tx_errors;
104736 + atomic_long_unchecked_t rx_dropped;
104737 + atomic_long_unchecked_t rx_errors;
104738 + atomic_long_unchecked_t tx_dropped;
104739 + atomic_long_unchecked_t tx_errors;
104740 };
104741 /**
104742 * struct vport_portids - array of netlink portids of a vport.
104743 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
104744 index 07c04a8..3ca11eb 100644
104745 --- a/net/packet/af_packet.c
104746 +++ b/net/packet/af_packet.c
104747 @@ -269,7 +269,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
104748
104749 return ret;
104750 drop:
104751 - atomic_long_inc(&dev->tx_dropped);
104752 + atomic_long_inc_unchecked(&dev->tx_dropped);
104753 kfree_skb(skb);
104754 return NET_XMIT_DROP;
104755 }
104756 @@ -1836,7 +1836,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
104757
104758 spin_lock(&sk->sk_receive_queue.lock);
104759 po->stats.stats1.tp_packets++;
104760 - skb->dropcount = atomic_read(&sk->sk_drops);
104761 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
104762 __skb_queue_tail(&sk->sk_receive_queue, skb);
104763 spin_unlock(&sk->sk_receive_queue.lock);
104764 sk->sk_data_ready(sk);
104765 @@ -1845,7 +1845,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
104766 drop_n_acct:
104767 spin_lock(&sk->sk_receive_queue.lock);
104768 po->stats.stats1.tp_drops++;
104769 - atomic_inc(&sk->sk_drops);
104770 + atomic_inc_unchecked(&sk->sk_drops);
104771 spin_unlock(&sk->sk_receive_queue.lock);
104772
104773 drop_n_restore:
104774 @@ -3460,7 +3460,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
104775 case PACKET_HDRLEN:
104776 if (len > sizeof(int))
104777 len = sizeof(int);
104778 - if (copy_from_user(&val, optval, len))
104779 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
104780 return -EFAULT;
104781 switch (val) {
104782 case TPACKET_V1:
104783 @@ -3506,7 +3506,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
104784 len = lv;
104785 if (put_user(len, optlen))
104786 return -EFAULT;
104787 - if (copy_to_user(optval, data, len))
104788 + if (len > sizeof(st) || copy_to_user(optval, data, len))
104789 return -EFAULT;
104790 return 0;
104791 }
104792 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
104793 index 70a547e..23477fe 100644
104794 --- a/net/phonet/pep.c
104795 +++ b/net/phonet/pep.c
104796 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
104797
104798 case PNS_PEP_CTRL_REQ:
104799 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
104800 - atomic_inc(&sk->sk_drops);
104801 + atomic_inc_unchecked(&sk->sk_drops);
104802 break;
104803 }
104804 __skb_pull(skb, 4);
104805 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
104806 }
104807
104808 if (pn->rx_credits == 0) {
104809 - atomic_inc(&sk->sk_drops);
104810 + atomic_inc_unchecked(&sk->sk_drops);
104811 err = -ENOBUFS;
104812 break;
104813 }
104814 @@ -579,7 +579,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
104815 }
104816
104817 if (pn->rx_credits == 0) {
104818 - atomic_inc(&sk->sk_drops);
104819 + atomic_inc_unchecked(&sk->sk_drops);
104820 err = NET_RX_DROP;
104821 break;
104822 }
104823 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
104824 index 008214a..bb68240 100644
104825 --- a/net/phonet/socket.c
104826 +++ b/net/phonet/socket.c
104827 @@ -611,7 +611,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
104828 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
104829 sock_i_ino(sk),
104830 atomic_read(&sk->sk_refcnt), sk,
104831 - atomic_read(&sk->sk_drops));
104832 + atomic_read_unchecked(&sk->sk_drops));
104833 }
104834 seq_pad(seq, '\n');
104835 return 0;
104836 diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
104837 index c02a8c4..3c5b600 100644
104838 --- a/net/phonet/sysctl.c
104839 +++ b/net/phonet/sysctl.c
104840 @@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
104841 {
104842 int ret;
104843 int range[2] = {local_port_range[0], local_port_range[1]};
104844 - struct ctl_table tmp = {
104845 + ctl_table_no_const tmp = {
104846 .data = &range,
104847 .maxlen = sizeof(range),
104848 .mode = table->mode,
104849 diff --git a/net/rds/cong.c b/net/rds/cong.c
104850 index e5b65ac..f3b6fb7 100644
104851 --- a/net/rds/cong.c
104852 +++ b/net/rds/cong.c
104853 @@ -78,7 +78,7 @@
104854 * finds that the saved generation number is smaller than the global generation
104855 * number, it wakes up the process.
104856 */
104857 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
104858 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
104859
104860 /*
104861 * Congestion monitoring
104862 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
104863 rdsdebug("waking map %p for %pI4\n",
104864 map, &map->m_addr);
104865 rds_stats_inc(s_cong_update_received);
104866 - atomic_inc(&rds_cong_generation);
104867 + atomic_inc_unchecked(&rds_cong_generation);
104868 if (waitqueue_active(&map->m_waitq))
104869 wake_up(&map->m_waitq);
104870 if (waitqueue_active(&rds_poll_waitq))
104871 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
104872
104873 int rds_cong_updated_since(unsigned long *recent)
104874 {
104875 - unsigned long gen = atomic_read(&rds_cong_generation);
104876 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
104877
104878 if (likely(*recent == gen))
104879 return 0;
104880 diff --git a/net/rds/ib.h b/net/rds/ib.h
104881 index 7280ab8..e04f4ea 100644
104882 --- a/net/rds/ib.h
104883 +++ b/net/rds/ib.h
104884 @@ -128,7 +128,7 @@ struct rds_ib_connection {
104885 /* sending acks */
104886 unsigned long i_ack_flags;
104887 #ifdef KERNEL_HAS_ATOMIC64
104888 - atomic64_t i_ack_next; /* next ACK to send */
104889 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
104890 #else
104891 spinlock_t i_ack_lock; /* protect i_ack_next */
104892 u64 i_ack_next; /* next ACK to send */
104893 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
104894 index 31b74f5..dc1fbfa 100644
104895 --- a/net/rds/ib_cm.c
104896 +++ b/net/rds/ib_cm.c
104897 @@ -717,7 +717,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
104898 /* Clear the ACK state */
104899 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
104900 #ifdef KERNEL_HAS_ATOMIC64
104901 - atomic64_set(&ic->i_ack_next, 0);
104902 + atomic64_set_unchecked(&ic->i_ack_next, 0);
104903 #else
104904 ic->i_ack_next = 0;
104905 #endif
104906 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
104907 index d67de45..73dbf51 100644
104908 --- a/net/rds/ib_recv.c
104909 +++ b/net/rds/ib_recv.c
104910 @@ -596,7 +596,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
104911 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
104912 int ack_required)
104913 {
104914 - atomic64_set(&ic->i_ack_next, seq);
104915 + atomic64_set_unchecked(&ic->i_ack_next, seq);
104916 if (ack_required) {
104917 smp_mb__before_atomic();
104918 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104919 @@ -608,7 +608,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
104920 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104921 smp_mb__after_atomic();
104922
104923 - return atomic64_read(&ic->i_ack_next);
104924 + return atomic64_read_unchecked(&ic->i_ack_next);
104925 }
104926 #endif
104927
104928 diff --git a/net/rds/iw.h b/net/rds/iw.h
104929 index 04ce3b1..48119a6 100644
104930 --- a/net/rds/iw.h
104931 +++ b/net/rds/iw.h
104932 @@ -134,7 +134,7 @@ struct rds_iw_connection {
104933 /* sending acks */
104934 unsigned long i_ack_flags;
104935 #ifdef KERNEL_HAS_ATOMIC64
104936 - atomic64_t i_ack_next; /* next ACK to send */
104937 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
104938 #else
104939 spinlock_t i_ack_lock; /* protect i_ack_next */
104940 u64 i_ack_next; /* next ACK to send */
104941 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
104942 index a91e1db..cf3053f 100644
104943 --- a/net/rds/iw_cm.c
104944 +++ b/net/rds/iw_cm.c
104945 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
104946 /* Clear the ACK state */
104947 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
104948 #ifdef KERNEL_HAS_ATOMIC64
104949 - atomic64_set(&ic->i_ack_next, 0);
104950 + atomic64_set_unchecked(&ic->i_ack_next, 0);
104951 #else
104952 ic->i_ack_next = 0;
104953 #endif
104954 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
104955 index aa8bf67..b70133c 100644
104956 --- a/net/rds/iw_recv.c
104957 +++ b/net/rds/iw_recv.c
104958 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
104959 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
104960 int ack_required)
104961 {
104962 - atomic64_set(&ic->i_ack_next, seq);
104963 + atomic64_set_unchecked(&ic->i_ack_next, seq);
104964 if (ack_required) {
104965 smp_mb__before_atomic();
104966 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104967 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
104968 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104969 smp_mb__after_atomic();
104970
104971 - return atomic64_read(&ic->i_ack_next);
104972 + return atomic64_read_unchecked(&ic->i_ack_next);
104973 }
104974 #endif
104975
104976 diff --git a/net/rds/rds.h b/net/rds/rds.h
104977 index 48f8ffc..0ef3eec 100644
104978 --- a/net/rds/rds.h
104979 +++ b/net/rds/rds.h
104980 @@ -449,7 +449,7 @@ struct rds_transport {
104981 void (*sync_mr)(void *trans_private, int direction);
104982 void (*free_mr)(void *trans_private, int invalidate);
104983 void (*flush_mrs)(void);
104984 -};
104985 +} __do_const;
104986
104987 struct rds_sock {
104988 struct sock rs_sk;
104989 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
104990 index edac9ef..16bcb98 100644
104991 --- a/net/rds/tcp.c
104992 +++ b/net/rds/tcp.c
104993 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
104994 int val = 1;
104995
104996 set_fs(KERNEL_DS);
104997 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
104998 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
104999 sizeof(val));
105000 set_fs(oldfs);
105001 }
105002 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
105003 index 53b17ca..45463e7 100644
105004 --- a/net/rds/tcp_send.c
105005 +++ b/net/rds/tcp_send.c
105006 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
105007
105008 oldfs = get_fs();
105009 set_fs(KERNEL_DS);
105010 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
105011 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
105012 sizeof(val));
105013 set_fs(oldfs);
105014 }
105015 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
105016 index 7b16704..9628ec6 100644
105017 --- a/net/rxrpc/af_rxrpc.c
105018 +++ b/net/rxrpc/af_rxrpc.c
105019 @@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
105020 __be32 rxrpc_epoch;
105021
105022 /* current debugging ID */
105023 -atomic_t rxrpc_debug_id;
105024 +atomic_unchecked_t rxrpc_debug_id;
105025
105026 /* count of skbs currently in use */
105027 atomic_t rxrpc_n_skbs;
105028 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
105029 index c6be17a..2a6200a 100644
105030 --- a/net/rxrpc/ar-ack.c
105031 +++ b/net/rxrpc/ar-ack.c
105032 @@ -223,7 +223,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
105033
105034 _enter("{%d,%d,%d,%d},",
105035 call->acks_hard, call->acks_unacked,
105036 - atomic_read(&call->sequence),
105037 + atomic_read_unchecked(&call->sequence),
105038 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
105039
105040 stop = 0;
105041 @@ -247,7 +247,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
105042
105043 /* each Tx packet has a new serial number */
105044 sp->hdr.serial =
105045 - htonl(atomic_inc_return(&call->conn->serial));
105046 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
105047
105048 hdr = (struct rxrpc_header *) txb->head;
105049 hdr->serial = sp->hdr.serial;
105050 @@ -451,7 +451,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
105051 */
105052 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
105053 {
105054 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
105055 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
105056 }
105057
105058 /*
105059 @@ -677,7 +677,7 @@ process_further:
105060
105061 latest = ntohl(sp->hdr.serial);
105062 hard = ntohl(ack.firstPacket);
105063 - tx = atomic_read(&call->sequence);
105064 + tx = atomic_read_unchecked(&call->sequence);
105065
105066 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
105067 latest,
105068 @@ -1209,7 +1209,7 @@ void rxrpc_process_call(struct work_struct *work)
105069 goto maybe_reschedule;
105070
105071 send_ACK_with_skew:
105072 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
105073 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
105074 ntohl(ack.serial));
105075 send_ACK:
105076 mtu = call->conn->trans->peer->if_mtu;
105077 @@ -1221,7 +1221,7 @@ send_ACK:
105078 ackinfo.rxMTU = htonl(rxrpc_rx_mtu);
105079 ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
105080
105081 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
105082 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
105083 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
105084 ntohl(hdr.serial),
105085 ntohs(ack.maxSkew),
105086 @@ -1239,7 +1239,7 @@ send_ACK:
105087 send_message:
105088 _debug("send message");
105089
105090 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
105091 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
105092 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
105093 send_message_2:
105094
105095 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
105096 index a9e05db..194e793 100644
105097 --- a/net/rxrpc/ar-call.c
105098 +++ b/net/rxrpc/ar-call.c
105099 @@ -232,7 +232,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
105100 spin_lock_init(&call->lock);
105101 rwlock_init(&call->state_lock);
105102 atomic_set(&call->usage, 1);
105103 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
105104 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105105 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
105106
105107 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
105108 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
105109 index 6631f4f..bfdf056 100644
105110 --- a/net/rxrpc/ar-connection.c
105111 +++ b/net/rxrpc/ar-connection.c
105112 @@ -210,7 +210,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
105113 rwlock_init(&conn->lock);
105114 spin_lock_init(&conn->state_lock);
105115 atomic_set(&conn->usage, 1);
105116 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
105117 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105118 conn->avail_calls = RXRPC_MAXCALLS;
105119 conn->size_align = 4;
105120 conn->header_size = sizeof(struct rxrpc_header);
105121 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
105122 index e7ed43a..6afa140 100644
105123 --- a/net/rxrpc/ar-connevent.c
105124 +++ b/net/rxrpc/ar-connevent.c
105125 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
105126
105127 len = iov[0].iov_len + iov[1].iov_len;
105128
105129 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
105130 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105131 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
105132
105133 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
105134 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
105135 index 481f89f..ceeaf8d 100644
105136 --- a/net/rxrpc/ar-input.c
105137 +++ b/net/rxrpc/ar-input.c
105138 @@ -331,9 +331,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
105139 /* track the latest serial number on this connection for ACK packet
105140 * information */
105141 serial = ntohl(sp->hdr.serial);
105142 - hi_serial = atomic_read(&call->conn->hi_serial);
105143 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
105144 while (serial > hi_serial)
105145 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
105146 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
105147 serial);
105148
105149 /* request ACK generation for any ACK or DATA packet that requests
105150 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
105151 index ba9fd36..9bbfe01 100644
105152 --- a/net/rxrpc/ar-internal.h
105153 +++ b/net/rxrpc/ar-internal.h
105154 @@ -272,8 +272,8 @@ struct rxrpc_connection {
105155 int error; /* error code for local abort */
105156 int debug_id; /* debug ID for printks */
105157 unsigned int call_counter; /* call ID counter */
105158 - atomic_t serial; /* packet serial number counter */
105159 - atomic_t hi_serial; /* highest serial number received */
105160 + atomic_unchecked_t serial; /* packet serial number counter */
105161 + atomic_unchecked_t hi_serial; /* highest serial number received */
105162 u8 avail_calls; /* number of calls available */
105163 u8 size_align; /* data size alignment (for security) */
105164 u8 header_size; /* rxrpc + security header size */
105165 @@ -346,7 +346,7 @@ struct rxrpc_call {
105166 spinlock_t lock;
105167 rwlock_t state_lock; /* lock for state transition */
105168 atomic_t usage;
105169 - atomic_t sequence; /* Tx data packet sequence counter */
105170 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
105171 u32 abort_code; /* local/remote abort code */
105172 enum { /* current state of call */
105173 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
105174 @@ -431,7 +431,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
105175 */
105176 extern atomic_t rxrpc_n_skbs;
105177 extern __be32 rxrpc_epoch;
105178 -extern atomic_t rxrpc_debug_id;
105179 +extern atomic_unchecked_t rxrpc_debug_id;
105180 extern struct workqueue_struct *rxrpc_workqueue;
105181
105182 /*
105183 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
105184 index 87f7135..74d3703 100644
105185 --- a/net/rxrpc/ar-local.c
105186 +++ b/net/rxrpc/ar-local.c
105187 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
105188 spin_lock_init(&local->lock);
105189 rwlock_init(&local->services_lock);
105190 atomic_set(&local->usage, 1);
105191 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
105192 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105193 memcpy(&local->srx, srx, sizeof(*srx));
105194 }
105195
105196 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
105197 index 0b4b9a7..966ffbb 100644
105198 --- a/net/rxrpc/ar-output.c
105199 +++ b/net/rxrpc/ar-output.c
105200 @@ -682,14 +682,14 @@ static int rxrpc_send_data(struct kiocb *iocb,
105201 memset(skb_put(skb, pad), 0, pad);
105202 }
105203
105204 - seq = atomic_inc_return(&call->sequence);
105205 + seq = atomic_inc_return_unchecked(&call->sequence);
105206
105207 sp->hdr.epoch = conn->epoch;
105208 sp->hdr.cid = call->cid;
105209 sp->hdr.callNumber = call->call_id;
105210 sp->hdr.seq = htonl(seq);
105211 sp->hdr.serial =
105212 - htonl(atomic_inc_return(&conn->serial));
105213 + htonl(atomic_inc_return_unchecked(&conn->serial));
105214 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
105215 sp->hdr.userStatus = 0;
105216 sp->hdr.securityIndex = conn->security_ix;
105217 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
105218 index bebaa43..2644591 100644
105219 --- a/net/rxrpc/ar-peer.c
105220 +++ b/net/rxrpc/ar-peer.c
105221 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
105222 INIT_LIST_HEAD(&peer->error_targets);
105223 spin_lock_init(&peer->lock);
105224 atomic_set(&peer->usage, 1);
105225 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
105226 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105227 memcpy(&peer->srx, srx, sizeof(*srx));
105228
105229 rxrpc_assess_MTU_size(peer);
105230 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
105231 index 38047f7..9f48511 100644
105232 --- a/net/rxrpc/ar-proc.c
105233 +++ b/net/rxrpc/ar-proc.c
105234 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
105235 atomic_read(&conn->usage),
105236 rxrpc_conn_states[conn->state],
105237 key_serial(conn->key),
105238 - atomic_read(&conn->serial),
105239 - atomic_read(&conn->hi_serial));
105240 + atomic_read_unchecked(&conn->serial),
105241 + atomic_read_unchecked(&conn->hi_serial));
105242
105243 return 0;
105244 }
105245 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
105246 index 1976dec..aa70be5 100644
105247 --- a/net/rxrpc/ar-transport.c
105248 +++ b/net/rxrpc/ar-transport.c
105249 @@ -51,7 +51,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
105250 spin_lock_init(&trans->client_lock);
105251 rwlock_init(&trans->conn_lock);
105252 atomic_set(&trans->usage, 1);
105253 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
105254 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105255
105256 if (peer->srx.transport.family == AF_INET) {
105257 switch (peer->srx.transport_type) {
105258 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
105259 index f226709..0e735a8 100644
105260 --- a/net/rxrpc/rxkad.c
105261 +++ b/net/rxrpc/rxkad.c
105262 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
105263
105264 len = iov[0].iov_len + iov[1].iov_len;
105265
105266 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
105267 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105268 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
105269
105270 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
105271 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
105272
105273 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
105274
105275 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
105276 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105277 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
105278
105279 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
105280 diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
105281 index 6efca30..1259f82 100644
105282 --- a/net/sched/sch_generic.c
105283 +++ b/net/sched/sch_generic.c
105284 @@ -349,7 +349,7 @@ void netif_carrier_on(struct net_device *dev)
105285 if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
105286 if (dev->reg_state == NETREG_UNINITIALIZED)
105287 return;
105288 - atomic_inc(&dev->carrier_changes);
105289 + atomic_inc_unchecked(&dev->carrier_changes);
105290 linkwatch_fire_event(dev);
105291 if (netif_running(dev))
105292 __netdev_watchdog_up(dev);
105293 @@ -368,7 +368,7 @@ void netif_carrier_off(struct net_device *dev)
105294 if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
105295 if (dev->reg_state == NETREG_UNINITIALIZED)
105296 return;
105297 - atomic_inc(&dev->carrier_changes);
105298 + atomic_inc_unchecked(&dev->carrier_changes);
105299 linkwatch_fire_event(dev);
105300 }
105301 }
105302 diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
105303 index 0e4198e..f94193e 100644
105304 --- a/net/sctp/ipv6.c
105305 +++ b/net/sctp/ipv6.c
105306 @@ -972,7 +972,7 @@ static const struct inet6_protocol sctpv6_protocol = {
105307 .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
105308 };
105309
105310 -static struct sctp_af sctp_af_inet6 = {
105311 +static struct sctp_af sctp_af_inet6 __read_only = {
105312 .sa_family = AF_INET6,
105313 .sctp_xmit = sctp_v6_xmit,
105314 .setsockopt = ipv6_setsockopt,
105315 @@ -1002,7 +1002,7 @@ static struct sctp_af sctp_af_inet6 = {
105316 #endif
105317 };
105318
105319 -static struct sctp_pf sctp_pf_inet6 = {
105320 +static struct sctp_pf sctp_pf_inet6 __read_only = {
105321 .event_msgname = sctp_inet6_event_msgname,
105322 .skb_msgname = sctp_inet6_skb_msgname,
105323 .af_supported = sctp_inet6_af_supported,
105324 @@ -1029,7 +1029,7 @@ void sctp_v6_pf_init(void)
105325
105326 void sctp_v6_pf_exit(void)
105327 {
105328 - list_del(&sctp_af_inet6.list);
105329 + pax_list_del(&sctp_af_inet6.list);
105330 }
105331
105332 /* Initialize IPv6 support and register with socket layer. */
105333 diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
105334 index 8f34b27..b105385 100644
105335 --- a/net/sctp/protocol.c
105336 +++ b/net/sctp/protocol.c
105337 @@ -836,8 +836,10 @@ int sctp_register_af(struct sctp_af *af)
105338 return 0;
105339 }
105340
105341 + pax_open_kernel();
105342 INIT_LIST_HEAD(&af->list);
105343 - list_add_tail(&af->list, &sctp_address_families);
105344 + pax_close_kernel();
105345 + pax_list_add_tail(&af->list, &sctp_address_families);
105346 return 1;
105347 }
105348
105349 @@ -967,7 +969,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
105350
105351 static struct sctp_af sctp_af_inet;
105352
105353 -static struct sctp_pf sctp_pf_inet = {
105354 +static struct sctp_pf sctp_pf_inet __read_only = {
105355 .event_msgname = sctp_inet_event_msgname,
105356 .skb_msgname = sctp_inet_skb_msgname,
105357 .af_supported = sctp_inet_af_supported,
105358 @@ -1039,7 +1041,7 @@ static const struct net_protocol sctp_protocol = {
105359 };
105360
105361 /* IPv4 address related functions. */
105362 -static struct sctp_af sctp_af_inet = {
105363 +static struct sctp_af sctp_af_inet __read_only = {
105364 .sa_family = AF_INET,
105365 .sctp_xmit = sctp_v4_xmit,
105366 .setsockopt = ip_setsockopt,
105367 @@ -1123,7 +1125,7 @@ static void sctp_v4_pf_init(void)
105368
105369 static void sctp_v4_pf_exit(void)
105370 {
105371 - list_del(&sctp_af_inet.list);
105372 + pax_list_del(&sctp_af_inet.list);
105373 }
105374
105375 static int sctp_v4_protosw_init(void)
105376 diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
105377 index fef2acd..c705c4f 100644
105378 --- a/net/sctp/sm_sideeffect.c
105379 +++ b/net/sctp/sm_sideeffect.c
105380 @@ -439,7 +439,7 @@ static void sctp_generate_sack_event(unsigned long data)
105381 sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
105382 }
105383
105384 -sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
105385 +sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
105386 NULL,
105387 sctp_generate_t1_cookie_event,
105388 sctp_generate_t1_init_event,
105389 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
105390 index 634a2ab..8e93929 100644
105391 --- a/net/sctp/socket.c
105392 +++ b/net/sctp/socket.c
105393 @@ -2199,11 +2199,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
105394 {
105395 struct sctp_association *asoc;
105396 struct sctp_ulpevent *event;
105397 + struct sctp_event_subscribe subscribe;
105398
105399 if (optlen > sizeof(struct sctp_event_subscribe))
105400 return -EINVAL;
105401 - if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
105402 + if (copy_from_user(&subscribe, optval, optlen))
105403 return -EFAULT;
105404 + sctp_sk(sk)->subscribe = subscribe;
105405
105406 if (sctp_sk(sk)->subscribe.sctp_data_io_event)
105407 pr_warn_ratelimited(DEPRECATED "%s (pid %d) "
105408 @@ -4372,13 +4374,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
105409 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
105410 int __user *optlen)
105411 {
105412 + struct sctp_event_subscribe subscribe;
105413 +
105414 if (len <= 0)
105415 return -EINVAL;
105416 if (len > sizeof(struct sctp_event_subscribe))
105417 len = sizeof(struct sctp_event_subscribe);
105418 if (put_user(len, optlen))
105419 return -EFAULT;
105420 - if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
105421 + subscribe = sctp_sk(sk)->subscribe;
105422 + if (copy_to_user(optval, &subscribe, len))
105423 return -EFAULT;
105424 return 0;
105425 }
105426 @@ -4396,6 +4401,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
105427 */
105428 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
105429 {
105430 + __u32 autoclose;
105431 +
105432 /* Applicable to UDP-style socket only */
105433 if (sctp_style(sk, TCP))
105434 return -EOPNOTSUPP;
105435 @@ -4404,7 +4411,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
105436 len = sizeof(int);
105437 if (put_user(len, optlen))
105438 return -EFAULT;
105439 - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int)))
105440 + autoclose = sctp_sk(sk)->autoclose;
105441 + if (copy_to_user(optval, &autoclose, sizeof(int)))
105442 return -EFAULT;
105443 return 0;
105444 }
105445 @@ -4778,12 +4786,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
105446 */
105447 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
105448 {
105449 + struct sctp_initmsg initmsg;
105450 +
105451 if (len < sizeof(struct sctp_initmsg))
105452 return -EINVAL;
105453 len = sizeof(struct sctp_initmsg);
105454 if (put_user(len, optlen))
105455 return -EFAULT;
105456 - if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
105457 + initmsg = sctp_sk(sk)->initmsg;
105458 + if (copy_to_user(optval, &initmsg, len))
105459 return -EFAULT;
105460 return 0;
105461 }
105462 @@ -4824,6 +4835,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
105463 ->addr_to_user(sp, &temp);
105464 if (space_left < addrlen)
105465 return -ENOMEM;
105466 + if (addrlen > sizeof(temp) || addrlen < 0)
105467 + return -EFAULT;
105468 if (copy_to_user(to, &temp, addrlen))
105469 return -EFAULT;
105470 to += addrlen;
105471 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
105472 index 2e9ada1..40f425d 100644
105473 --- a/net/sctp/sysctl.c
105474 +++ b/net/sctp/sysctl.c
105475 @@ -321,7 +321,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,
105476 loff_t *ppos)
105477 {
105478 struct net *net = current->nsproxy->net_ns;
105479 - struct ctl_table tbl;
105480 + ctl_table_no_const tbl;
105481 bool changed = false;
105482 char *none = "none";
105483 char tmp[8];
105484 @@ -369,7 +369,7 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write,
105485 struct net *net = current->nsproxy->net_ns;
105486 unsigned int min = *(unsigned int *) ctl->extra1;
105487 unsigned int max = *(unsigned int *) ctl->extra2;
105488 - struct ctl_table tbl;
105489 + ctl_table_no_const tbl;
105490 int ret, new_value;
105491
105492 memset(&tbl, 0, sizeof(struct ctl_table));
105493 @@ -398,7 +398,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
105494 struct net *net = current->nsproxy->net_ns;
105495 unsigned int min = *(unsigned int *) ctl->extra1;
105496 unsigned int max = *(unsigned int *) ctl->extra2;
105497 - struct ctl_table tbl;
105498 + ctl_table_no_const tbl;
105499 int ret, new_value;
105500
105501 memset(&tbl, 0, sizeof(struct ctl_table));
105502 @@ -436,7 +436,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
105503 loff_t *ppos)
105504 {
105505 struct net *net = current->nsproxy->net_ns;
105506 - struct ctl_table tbl;
105507 + ctl_table_no_const tbl;
105508 int new_value, ret;
105509
105510 memset(&tbl, 0, sizeof(struct ctl_table));
105511 @@ -463,7 +463,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
105512
105513 int sctp_sysctl_net_register(struct net *net)
105514 {
105515 - struct ctl_table *table;
105516 + ctl_table_no_const *table;
105517 int i;
105518
105519 table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
105520 diff --git a/net/socket.c b/net/socket.c
105521 index fe20c31..83a0ed6 100644
105522 --- a/net/socket.c
105523 +++ b/net/socket.c
105524 @@ -89,6 +89,7 @@
105525 #include <linux/magic.h>
105526 #include <linux/slab.h>
105527 #include <linux/xattr.h>
105528 +#include <linux/in.h>
105529
105530 #include <asm/uaccess.h>
105531 #include <asm/unistd.h>
105532 @@ -113,6 +114,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
105533 unsigned int sysctl_net_busy_poll __read_mostly;
105534 #endif
105535
105536 +#include <linux/grsock.h>
105537 +
105538 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
105539 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
105540 unsigned long nr_segs, loff_t pos);
105541 @@ -164,7 +167,7 @@ static const struct file_operations socket_file_ops = {
105542 */
105543
105544 static DEFINE_SPINLOCK(net_family_lock);
105545 -static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
105546 +const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
105547
105548 /*
105549 * Statistics counters of the socket lists
105550 @@ -330,7 +333,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
105551 &sockfs_dentry_operations, SOCKFS_MAGIC);
105552 }
105553
105554 -static struct vfsmount *sock_mnt __read_mostly;
105555 +struct vfsmount *sock_mnt __read_mostly;
105556
105557 static struct file_system_type sock_fs_type = {
105558 .name = "sockfs",
105559 @@ -1263,6 +1266,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
105560 return -EAFNOSUPPORT;
105561 if (type < 0 || type >= SOCK_MAX)
105562 return -EINVAL;
105563 + if (protocol < 0)
105564 + return -EINVAL;
105565
105566 /* Compatibility.
105567
105568 @@ -1283,6 +1288,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
105569 if (err)
105570 return err;
105571
105572 + if(!kern && !gr_search_socket(family, type, protocol)) {
105573 + if (rcu_access_pointer(net_families[family]) == NULL)
105574 + return -EAFNOSUPPORT;
105575 + else
105576 + return -EACCES;
105577 + }
105578 +
105579 + if (!kern && gr_handle_sock_all(family, type, protocol)) {
105580 + if (rcu_access_pointer(net_families[family]) == NULL)
105581 + return -EAFNOSUPPORT;
105582 + else
105583 + return -EACCES;
105584 + }
105585 +
105586 /*
105587 * Allocate the socket and allow the family to set things up. if
105588 * the protocol is 0, the family is instructed to select an appropriate
105589 @@ -1534,6 +1553,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
105590 if (sock) {
105591 err = move_addr_to_kernel(umyaddr, addrlen, &address);
105592 if (err >= 0) {
105593 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
105594 + err = -EACCES;
105595 + goto error;
105596 + }
105597 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
105598 + if (err)
105599 + goto error;
105600 +
105601 err = security_socket_bind(sock,
105602 (struct sockaddr *)&address,
105603 addrlen);
105604 @@ -1542,6 +1569,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
105605 (struct sockaddr *)
105606 &address, addrlen);
105607 }
105608 +error:
105609 fput_light(sock->file, fput_needed);
105610 }
105611 return err;
105612 @@ -1565,10 +1593,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
105613 if ((unsigned int)backlog > somaxconn)
105614 backlog = somaxconn;
105615
105616 + if (gr_handle_sock_server_other(sock->sk)) {
105617 + err = -EPERM;
105618 + goto error;
105619 + }
105620 +
105621 + err = gr_search_listen(sock);
105622 + if (err)
105623 + goto error;
105624 +
105625 err = security_socket_listen(sock, backlog);
105626 if (!err)
105627 err = sock->ops->listen(sock, backlog);
105628
105629 +error:
105630 fput_light(sock->file, fput_needed);
105631 }
105632 return err;
105633 @@ -1612,6 +1650,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
105634 newsock->type = sock->type;
105635 newsock->ops = sock->ops;
105636
105637 + if (gr_handle_sock_server_other(sock->sk)) {
105638 + err = -EPERM;
105639 + sock_release(newsock);
105640 + goto out_put;
105641 + }
105642 +
105643 + err = gr_search_accept(sock);
105644 + if (err) {
105645 + sock_release(newsock);
105646 + goto out_put;
105647 + }
105648 +
105649 /*
105650 * We don't need try_module_get here, as the listening socket (sock)
105651 * has the protocol module (sock->ops->owner) held.
105652 @@ -1657,6 +1707,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
105653 fd_install(newfd, newfile);
105654 err = newfd;
105655
105656 + gr_attach_curr_ip(newsock->sk);
105657 +
105658 out_put:
105659 fput_light(sock->file, fput_needed);
105660 out:
105661 @@ -1689,6 +1741,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
105662 int, addrlen)
105663 {
105664 struct socket *sock;
105665 + struct sockaddr *sck;
105666 struct sockaddr_storage address;
105667 int err, fput_needed;
105668
105669 @@ -1699,6 +1752,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
105670 if (err < 0)
105671 goto out_put;
105672
105673 + sck = (struct sockaddr *)&address;
105674 +
105675 + if (gr_handle_sock_client(sck)) {
105676 + err = -EACCES;
105677 + goto out_put;
105678 + }
105679 +
105680 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
105681 + if (err)
105682 + goto out_put;
105683 +
105684 err =
105685 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
105686 if (err)
105687 @@ -1780,6 +1844,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
105688 * the protocol.
105689 */
105690
105691 +asmlinkage long sys_sendto(int, void __user *, size_t, unsigned, struct sockaddr __user *, int);
105692 +
105693 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
105694 unsigned int, flags, struct sockaddr __user *, addr,
105695 int, addr_len)
105696 @@ -1846,7 +1912,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
105697 struct socket *sock;
105698 struct iovec iov;
105699 struct msghdr msg;
105700 - struct sockaddr_storage address;
105701 + struct sockaddr_storage address = { };
105702 int err, err2;
105703 int fput_needed;
105704
105705 @@ -2075,7 +2141,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
105706 * checking falls down on this.
105707 */
105708 if (copy_from_user(ctl_buf,
105709 - (void __user __force *)msg_sys->msg_control,
105710 + (void __force_user *)msg_sys->msg_control,
105711 ctl_len))
105712 goto out_freectl;
105713 msg_sys->msg_control = ctl_buf;
105714 @@ -2226,7 +2292,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
105715 int err, total_len, len;
105716
105717 /* kernel mode address */
105718 - struct sockaddr_storage addr;
105719 + struct sockaddr_storage addr = { };
105720
105721 /* user mode address pointers */
105722 struct sockaddr __user *uaddr;
105723 @@ -2255,7 +2321,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
105724 /* Save the user-mode address (verify_iovec will change the
105725 * kernel msghdr to use the kernel address space)
105726 */
105727 - uaddr = (__force void __user *)msg_sys->msg_name;
105728 + uaddr = (void __force_user *)msg_sys->msg_name;
105729 uaddr_len = COMPAT_NAMELEN(msg);
105730 if (MSG_CMSG_COMPAT & flags)
105731 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
105732 @@ -2896,7 +2962,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
105733 ifr = compat_alloc_user_space(buf_size);
105734 rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
105735
105736 - if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
105737 + if (copy_in_user(ifr->ifr_name, ifr32->ifr_name, IFNAMSIZ))
105738 return -EFAULT;
105739
105740 if (put_user(convert_in ? rxnfc : compat_ptr(data),
105741 @@ -3007,7 +3073,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
105742 old_fs = get_fs();
105743 set_fs(KERNEL_DS);
105744 err = dev_ioctl(net, cmd,
105745 - (struct ifreq __user __force *) &kifr);
105746 + (struct ifreq __force_user *) &kifr);
105747 set_fs(old_fs);
105748
105749 return err;
105750 @@ -3100,7 +3166,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
105751
105752 old_fs = get_fs();
105753 set_fs(KERNEL_DS);
105754 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
105755 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
105756 set_fs(old_fs);
105757
105758 if (cmd == SIOCGIFMAP && !err) {
105759 @@ -3184,7 +3250,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
105760 ret |= get_user(rtdev, &(ur4->rt_dev));
105761 if (rtdev) {
105762 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
105763 - r4.rt_dev = (char __user __force *)devname;
105764 + r4.rt_dev = (char __force_user *)devname;
105765 devname[15] = 0;
105766 } else
105767 r4.rt_dev = NULL;
105768 @@ -3411,8 +3477,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
105769 int __user *uoptlen;
105770 int err;
105771
105772 - uoptval = (char __user __force *) optval;
105773 - uoptlen = (int __user __force *) optlen;
105774 + uoptval = (char __force_user *) optval;
105775 + uoptlen = (int __force_user *) optlen;
105776
105777 set_fs(KERNEL_DS);
105778 if (level == SOL_SOCKET)
105779 @@ -3432,7 +3498,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
105780 char __user *uoptval;
105781 int err;
105782
105783 - uoptval = (char __user __force *) optval;
105784 + uoptval = (char __force_user *) optval;
105785
105786 set_fs(KERNEL_DS);
105787 if (level == SOL_SOCKET)
105788 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
105789 index c548ab2..4e1b68b 100644
105790 --- a/net/sunrpc/auth_gss/svcauth_gss.c
105791 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
105792 @@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
105793 uint64_t *handle)
105794 {
105795 struct rsc rsci, *rscp = NULL;
105796 - static atomic64_t ctxhctr;
105797 + static atomic64_unchecked_t ctxhctr = ATOMIC64_INIT(0);
105798 long long ctxh;
105799 struct gss_api_mech *gm = NULL;
105800 time_t expiry;
105801 @@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
105802 status = -ENOMEM;
105803 /* the handle needs to be just a unique id,
105804 * use a static counter */
105805 - ctxh = atomic64_inc_return(&ctxhctr);
105806 + ctxh = atomic64_inc_return_unchecked(&ctxhctr);
105807
105808 /* make a copy for the caller */
105809 *handle = ctxh;
105810 diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
105811 index 0663621..c4928d4 100644
105812 --- a/net/sunrpc/cache.c
105813 +++ b/net/sunrpc/cache.c
105814 @@ -1609,7 +1609,7 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
105815 struct sunrpc_net *sn;
105816
105817 sn = net_generic(net, sunrpc_net_id);
105818 - cd->u.procfs.proc_ent = proc_mkdir(cd->name, sn->proc_net_rpc);
105819 + cd->u.procfs.proc_ent = proc_mkdir_restrict(cd->name, sn->proc_net_rpc);
105820 if (cd->u.procfs.proc_ent == NULL)
105821 goto out_nomem;
105822 cd->u.procfs.channel_ent = NULL;
105823 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
105824 index 9acd6ce..4353a72 100644
105825 --- a/net/sunrpc/clnt.c
105826 +++ b/net/sunrpc/clnt.c
105827 @@ -1428,7 +1428,9 @@ call_start(struct rpc_task *task)
105828 (RPC_IS_ASYNC(task) ? "async" : "sync"));
105829
105830 /* Increment call count */
105831 - task->tk_msg.rpc_proc->p_count++;
105832 + pax_open_kernel();
105833 + (*(unsigned int *)&task->tk_msg.rpc_proc->p_count)++;
105834 + pax_close_kernel();
105835 clnt->cl_stats->rpccnt++;
105836 task->tk_action = call_reserve;
105837 }
105838 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
105839 index fe3441a..922c29e 100644
105840 --- a/net/sunrpc/sched.c
105841 +++ b/net/sunrpc/sched.c
105842 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)
105843 #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
105844 static void rpc_task_set_debuginfo(struct rpc_task *task)
105845 {
105846 - static atomic_t rpc_pid;
105847 + static atomic_unchecked_t rpc_pid;
105848
105849 - task->tk_pid = atomic_inc_return(&rpc_pid);
105850 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
105851 }
105852 #else
105853 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
105854 diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
105855 index 5453049..465669a 100644
105856 --- a/net/sunrpc/stats.c
105857 +++ b/net/sunrpc/stats.c
105858 @@ -267,7 +267,7 @@ int rpc_proc_init(struct net *net)
105859
105860 dprintk("RPC: registering /proc/net/rpc\n");
105861 sn = net_generic(net, sunrpc_net_id);
105862 - sn->proc_net_rpc = proc_mkdir("rpc", net->proc_net);
105863 + sn->proc_net_rpc = proc_mkdir_restrict("rpc", net->proc_net);
105864 if (sn->proc_net_rpc == NULL)
105865 return -ENOMEM;
105866
105867 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
105868 index ca8a795..ddfc41b 100644
105869 --- a/net/sunrpc/svc.c
105870 +++ b/net/sunrpc/svc.c
105871 @@ -1165,7 +1165,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
105872 svc_putnl(resv, RPC_SUCCESS);
105873
105874 /* Bump per-procedure stats counter */
105875 - procp->pc_count++;
105876 + pax_open_kernel();
105877 + (*(unsigned int *)&procp->pc_count)++;
105878 + pax_close_kernel();
105879
105880 /* Initialize storage for argp and resp */
105881 memset(rqstp->rq_argp, 0, procp->pc_argsize);
105882 diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
105883 index 621ca7b..59421dd 100644
105884 --- a/net/sunrpc/svcauth_unix.c
105885 +++ b/net/sunrpc/svcauth_unix.c
105886 @@ -414,7 +414,7 @@ struct unix_gid {
105887 struct group_info *gi;
105888 };
105889
105890 -static int unix_gid_hash(kuid_t uid)
105891 +static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
105892 {
105893 return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
105894 }
105895 @@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
105896 (*bpp)[-1] = '\n';
105897 }
105898
105899 -static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
105900 +static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
105901
105902 static int unix_gid_parse(struct cache_detail *cd,
105903 char *mesg, int mlen)
105904 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
105905 index c1b6270..05089c1 100644
105906 --- a/net/sunrpc/xprtrdma/svc_rdma.c
105907 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
105908 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
105909 static unsigned int min_max_inline = 4096;
105910 static unsigned int max_max_inline = 65536;
105911
105912 -atomic_t rdma_stat_recv;
105913 -atomic_t rdma_stat_read;
105914 -atomic_t rdma_stat_write;
105915 -atomic_t rdma_stat_sq_starve;
105916 -atomic_t rdma_stat_rq_starve;
105917 -atomic_t rdma_stat_rq_poll;
105918 -atomic_t rdma_stat_rq_prod;
105919 -atomic_t rdma_stat_sq_poll;
105920 -atomic_t rdma_stat_sq_prod;
105921 +atomic_unchecked_t rdma_stat_recv;
105922 +atomic_unchecked_t rdma_stat_read;
105923 +atomic_unchecked_t rdma_stat_write;
105924 +atomic_unchecked_t rdma_stat_sq_starve;
105925 +atomic_unchecked_t rdma_stat_rq_starve;
105926 +atomic_unchecked_t rdma_stat_rq_poll;
105927 +atomic_unchecked_t rdma_stat_rq_prod;
105928 +atomic_unchecked_t rdma_stat_sq_poll;
105929 +atomic_unchecked_t rdma_stat_sq_prod;
105930
105931 /* Temporary NFS request map and context caches */
105932 struct kmem_cache *svc_rdma_map_cachep;
105933 @@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
105934 len -= *ppos;
105935 if (len > *lenp)
105936 len = *lenp;
105937 - if (len && copy_to_user(buffer, str_buf, len))
105938 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
105939 return -EFAULT;
105940 *lenp = len;
105941 *ppos += len;
105942 @@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
105943 {
105944 .procname = "rdma_stat_read",
105945 .data = &rdma_stat_read,
105946 - .maxlen = sizeof(atomic_t),
105947 + .maxlen = sizeof(atomic_unchecked_t),
105948 .mode = 0644,
105949 .proc_handler = read_reset_stat,
105950 },
105951 {
105952 .procname = "rdma_stat_recv",
105953 .data = &rdma_stat_recv,
105954 - .maxlen = sizeof(atomic_t),
105955 + .maxlen = sizeof(atomic_unchecked_t),
105956 .mode = 0644,
105957 .proc_handler = read_reset_stat,
105958 },
105959 {
105960 .procname = "rdma_stat_write",
105961 .data = &rdma_stat_write,
105962 - .maxlen = sizeof(atomic_t),
105963 + .maxlen = sizeof(atomic_unchecked_t),
105964 .mode = 0644,
105965 .proc_handler = read_reset_stat,
105966 },
105967 {
105968 .procname = "rdma_stat_sq_starve",
105969 .data = &rdma_stat_sq_starve,
105970 - .maxlen = sizeof(atomic_t),
105971 + .maxlen = sizeof(atomic_unchecked_t),
105972 .mode = 0644,
105973 .proc_handler = read_reset_stat,
105974 },
105975 {
105976 .procname = "rdma_stat_rq_starve",
105977 .data = &rdma_stat_rq_starve,
105978 - .maxlen = sizeof(atomic_t),
105979 + .maxlen = sizeof(atomic_unchecked_t),
105980 .mode = 0644,
105981 .proc_handler = read_reset_stat,
105982 },
105983 {
105984 .procname = "rdma_stat_rq_poll",
105985 .data = &rdma_stat_rq_poll,
105986 - .maxlen = sizeof(atomic_t),
105987 + .maxlen = sizeof(atomic_unchecked_t),
105988 .mode = 0644,
105989 .proc_handler = read_reset_stat,
105990 },
105991 {
105992 .procname = "rdma_stat_rq_prod",
105993 .data = &rdma_stat_rq_prod,
105994 - .maxlen = sizeof(atomic_t),
105995 + .maxlen = sizeof(atomic_unchecked_t),
105996 .mode = 0644,
105997 .proc_handler = read_reset_stat,
105998 },
105999 {
106000 .procname = "rdma_stat_sq_poll",
106001 .data = &rdma_stat_sq_poll,
106002 - .maxlen = sizeof(atomic_t),
106003 + .maxlen = sizeof(atomic_unchecked_t),
106004 .mode = 0644,
106005 .proc_handler = read_reset_stat,
106006 },
106007 {
106008 .procname = "rdma_stat_sq_prod",
106009 .data = &rdma_stat_sq_prod,
106010 - .maxlen = sizeof(atomic_t),
106011 + .maxlen = sizeof(atomic_unchecked_t),
106012 .mode = 0644,
106013 .proc_handler = read_reset_stat,
106014 },
106015 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
106016 index e011027..9d3c4e1 100644
106017 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
106018 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
106019 @@ -220,7 +220,7 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
106020 *page_no = pg_no;
106021 *page_offset = pg_off;
106022 ret = read;
106023 - atomic_inc(&rdma_stat_read);
106024 + atomic_inc_unchecked(&rdma_stat_read);
106025 return ret;
106026 err:
106027 svc_rdma_unmap_dma(ctxt);
106028 @@ -356,7 +356,7 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
106029 *page_no = pg_no;
106030 *page_offset = pg_off;
106031 ret = read;
106032 - atomic_inc(&rdma_stat_read);
106033 + atomic_inc_unchecked(&rdma_stat_read);
106034 return ret;
106035 err:
106036 svc_rdma_unmap_dma(ctxt);
106037 @@ -540,7 +540,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
106038 dto_q);
106039 list_del_init(&ctxt->dto_q);
106040 } else {
106041 - atomic_inc(&rdma_stat_rq_starve);
106042 + atomic_inc_unchecked(&rdma_stat_rq_starve);
106043 clear_bit(XPT_DATA, &xprt->xpt_flags);
106044 ctxt = NULL;
106045 }
106046 @@ -559,7 +559,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
106047 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
106048 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
106049 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
106050 - atomic_inc(&rdma_stat_recv);
106051 + atomic_inc_unchecked(&rdma_stat_recv);
106052
106053 /* Build up the XDR from the receive buffers. */
106054 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
106055 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
106056 index 9f1b506..2e0b321 100644
106057 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
106058 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
106059 @@ -208,7 +208,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
106060 write_wr.wr.rdma.remote_addr = to;
106061
106062 /* Post It */
106063 - atomic_inc(&rdma_stat_write);
106064 + atomic_inc_unchecked(&rdma_stat_write);
106065 if (svc_rdma_send(xprt, &write_wr))
106066 goto err;
106067 return write_len - bc;
106068 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
106069 index 4e61880..1f0d963 100644
106070 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
106071 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
106072 @@ -295,7 +295,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
106073 return;
106074
106075 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
106076 - atomic_inc(&rdma_stat_rq_poll);
106077 + atomic_inc_unchecked(&rdma_stat_rq_poll);
106078
106079 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
106080 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
106081 @@ -317,7 +317,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
106082 }
106083
106084 if (ctxt)
106085 - atomic_inc(&rdma_stat_rq_prod);
106086 + atomic_inc_unchecked(&rdma_stat_rq_prod);
106087
106088 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
106089 /*
106090 @@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
106091 return;
106092
106093 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
106094 - atomic_inc(&rdma_stat_sq_poll);
106095 + atomic_inc_unchecked(&rdma_stat_sq_poll);
106096 while ((ret = ib_poll_cq(cq, ARRAY_SIZE(wc_a), wc_a)) > 0) {
106097 int i;
106098
106099 @@ -420,7 +420,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
106100 }
106101
106102 if (ctxt)
106103 - atomic_inc(&rdma_stat_sq_prod);
106104 + atomic_inc_unchecked(&rdma_stat_sq_prod);
106105 }
106106
106107 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
106108 @@ -1264,7 +1264,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
106109 spin_lock_bh(&xprt->sc_lock);
106110 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
106111 spin_unlock_bh(&xprt->sc_lock);
106112 - atomic_inc(&rdma_stat_sq_starve);
106113 + atomic_inc_unchecked(&rdma_stat_sq_starve);
106114
106115 /* See if we can opportunistically reap SQ WR to make room */
106116 sq_cq_reap(xprt);
106117 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
106118 index e7000be..e3b0ba7 100644
106119 --- a/net/sysctl_net.c
106120 +++ b/net/sysctl_net.c
106121 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_header *head,
106122 kgid_t root_gid = make_kgid(net->user_ns, 0);
106123
106124 /* Allow network administrator to have same access as root. */
106125 - if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
106126 + if (ns_capable_nolog(net->user_ns, CAP_NET_ADMIN) ||
106127 uid_eq(root_uid, current_euid())) {
106128 int mode = (table->mode >> 6) & 7;
106129 return (mode << 6) | (mode << 3) | mode;
106130 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
106131 index 31b5cb2..566ff01 100644
106132 --- a/net/tipc/subscr.c
106133 +++ b/net/tipc/subscr.c
106134 @@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
106135 struct tipc_subscriber *subscriber = sub->subscriber;
106136 struct kvec msg_sect;
106137
106138 - msg_sect.iov_base = (void *)&sub->evt;
106139 + msg_sect.iov_base = &sub->evt;
106140 msg_sect.iov_len = sizeof(struct tipc_event);
106141 sub->evt.event = htohl(event, sub->swap);
106142 sub->evt.found_lower = htohl(found_lower, sub->swap);
106143 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
106144 index e968843..bc95776 100644
106145 --- a/net/unix/af_unix.c
106146 +++ b/net/unix/af_unix.c
106147 @@ -791,6 +791,12 @@ static struct sock *unix_find_other(struct net *net,
106148 err = -ECONNREFUSED;
106149 if (!S_ISSOCK(inode->i_mode))
106150 goto put_fail;
106151 +
106152 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
106153 + err = -EACCES;
106154 + goto put_fail;
106155 + }
106156 +
106157 u = unix_find_socket_byinode(inode);
106158 if (!u)
106159 goto put_fail;
106160 @@ -811,6 +817,13 @@ static struct sock *unix_find_other(struct net *net,
106161 if (u) {
106162 struct dentry *dentry;
106163 dentry = unix_sk(u)->path.dentry;
106164 +
106165 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
106166 + err = -EPERM;
106167 + sock_put(u);
106168 + goto fail;
106169 + }
106170 +
106171 if (dentry)
106172 touch_atime(&unix_sk(u)->path);
106173 } else
106174 @@ -844,12 +857,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
106175 */
106176 err = security_path_mknod(&path, dentry, mode, 0);
106177 if (!err) {
106178 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
106179 + err = -EACCES;
106180 + goto out;
106181 + }
106182 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
106183 if (!err) {
106184 res->mnt = mntget(path.mnt);
106185 res->dentry = dget(dentry);
106186 + gr_handle_create(dentry, path.mnt);
106187 }
106188 }
106189 +out:
106190 done_path_create(&path, dentry);
106191 return err;
106192 }
106193 @@ -2350,9 +2369,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
106194 seq_puts(seq, "Num RefCount Protocol Flags Type St "
106195 "Inode Path\n");
106196 else {
106197 - struct sock *s = v;
106198 + struct sock *s = v, *peer;
106199 struct unix_sock *u = unix_sk(s);
106200 unix_state_lock(s);
106201 + peer = unix_peer(s);
106202 + unix_state_unlock(s);
106203 +
106204 + unix_state_double_lock(s, peer);
106205
106206 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
106207 s,
106208 @@ -2379,8 +2402,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
106209 }
106210 for ( ; i < len; i++)
106211 seq_putc(seq, u->addr->name->sun_path[i]);
106212 - }
106213 - unix_state_unlock(s);
106214 + } else if (peer)
106215 + seq_printf(seq, " P%lu", sock_i_ino(peer));
106216 +
106217 + unix_state_double_unlock(s, peer);
106218 seq_putc(seq, '\n');
106219 }
106220
106221 diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
106222 index b3d5150..ff3a837 100644
106223 --- a/net/unix/sysctl_net_unix.c
106224 +++ b/net/unix/sysctl_net_unix.c
106225 @@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
106226
106227 int __net_init unix_sysctl_register(struct net *net)
106228 {
106229 - struct ctl_table *table;
106230 + ctl_table_no_const *table;
106231
106232 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
106233 if (table == NULL)
106234 diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
106235 index 9b7f207..2596621 100644
106236 --- a/net/vmw_vsock/vmci_transport_notify.c
106237 +++ b/net/vmw_vsock/vmci_transport_notify.c
106238 @@ -662,19 +662,19 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk)
106239
106240 /* Socket control packet based operations. */
106241 struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {
106242 - vmci_transport_notify_pkt_socket_init,
106243 - vmci_transport_notify_pkt_socket_destruct,
106244 - vmci_transport_notify_pkt_poll_in,
106245 - vmci_transport_notify_pkt_poll_out,
106246 - vmci_transport_notify_pkt_handle_pkt,
106247 - vmci_transport_notify_pkt_recv_init,
106248 - vmci_transport_notify_pkt_recv_pre_block,
106249 - vmci_transport_notify_pkt_recv_pre_dequeue,
106250 - vmci_transport_notify_pkt_recv_post_dequeue,
106251 - vmci_transport_notify_pkt_send_init,
106252 - vmci_transport_notify_pkt_send_pre_block,
106253 - vmci_transport_notify_pkt_send_pre_enqueue,
106254 - vmci_transport_notify_pkt_send_post_enqueue,
106255 - vmci_transport_notify_pkt_process_request,
106256 - vmci_transport_notify_pkt_process_negotiate,
106257 + .socket_init = vmci_transport_notify_pkt_socket_init,
106258 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
106259 + .poll_in = vmci_transport_notify_pkt_poll_in,
106260 + .poll_out = vmci_transport_notify_pkt_poll_out,
106261 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
106262 + .recv_init = vmci_transport_notify_pkt_recv_init,
106263 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
106264 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
106265 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
106266 + .send_init = vmci_transport_notify_pkt_send_init,
106267 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
106268 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
106269 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
106270 + .process_request = vmci_transport_notify_pkt_process_request,
106271 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
106272 };
106273 diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
106274 index dc9c792..3089de0 100644
106275 --- a/net/vmw_vsock/vmci_transport_notify_qstate.c
106276 +++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
106277 @@ -420,19 +420,19 @@ vmci_transport_notify_pkt_send_pre_enqueue(
106278
106279 /* Socket always on control packet based operations. */
106280 struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {
106281 - vmci_transport_notify_pkt_socket_init,
106282 - vmci_transport_notify_pkt_socket_destruct,
106283 - vmci_transport_notify_pkt_poll_in,
106284 - vmci_transport_notify_pkt_poll_out,
106285 - vmci_transport_notify_pkt_handle_pkt,
106286 - vmci_transport_notify_pkt_recv_init,
106287 - vmci_transport_notify_pkt_recv_pre_block,
106288 - vmci_transport_notify_pkt_recv_pre_dequeue,
106289 - vmci_transport_notify_pkt_recv_post_dequeue,
106290 - vmci_transport_notify_pkt_send_init,
106291 - vmci_transport_notify_pkt_send_pre_block,
106292 - vmci_transport_notify_pkt_send_pre_enqueue,
106293 - vmci_transport_notify_pkt_send_post_enqueue,
106294 - vmci_transport_notify_pkt_process_request,
106295 - vmci_transport_notify_pkt_process_negotiate,
106296 + .socket_init = vmci_transport_notify_pkt_socket_init,
106297 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
106298 + .poll_in = vmci_transport_notify_pkt_poll_in,
106299 + .poll_out = vmci_transport_notify_pkt_poll_out,
106300 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
106301 + .recv_init = vmci_transport_notify_pkt_recv_init,
106302 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
106303 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
106304 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
106305 + .send_init = vmci_transport_notify_pkt_send_init,
106306 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
106307 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
106308 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
106309 + .process_request = vmci_transport_notify_pkt_process_request,
106310 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
106311 };
106312 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
106313 index c8717c1..08539f5 100644
106314 --- a/net/wireless/wext-core.c
106315 +++ b/net/wireless/wext-core.c
106316 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
106317 */
106318
106319 /* Support for very large requests */
106320 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
106321 - (user_length > descr->max_tokens)) {
106322 + if (user_length > descr->max_tokens) {
106323 /* Allow userspace to GET more than max so
106324 * we can support any size GET requests.
106325 * There is still a limit : -ENOMEM.
106326 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
106327 }
106328 }
106329
106330 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
106331 - /*
106332 - * If this is a GET, but not NOMAX, it means that the extra
106333 - * data is not bounded by userspace, but by max_tokens. Thus
106334 - * set the length to max_tokens. This matches the extra data
106335 - * allocation.
106336 - * The driver should fill it with the number of tokens it
106337 - * provided, and it may check iwp->length rather than having
106338 - * knowledge of max_tokens. If the driver doesn't change the
106339 - * iwp->length, this ioctl just copies back max_token tokens
106340 - * filled with zeroes. Hopefully the driver isn't claiming
106341 - * them to be valid data.
106342 - */
106343 - iwp->length = descr->max_tokens;
106344 - }
106345 -
106346 err = handler(dev, info, (union iwreq_data *) iwp, extra);
106347
106348 iwp->length += essid_compat;
106349 diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
106350 index 4323952..a06dfe1 100644
106351 --- a/net/x25/sysctl_net_x25.c
106352 +++ b/net/x25/sysctl_net_x25.c
106353 @@ -70,7 +70,7 @@ static struct ctl_table x25_table[] = {
106354 .mode = 0644,
106355 .proc_handler = proc_dointvec,
106356 },
106357 - { 0, },
106358 + { },
106359 };
106360
106361 void __init x25_register_sysctl(void)
106362 diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
106363 index 0917f04..f4e3d8c 100644
106364 --- a/net/x25/x25_proc.c
106365 +++ b/net/x25/x25_proc.c
106366 @@ -209,7 +209,7 @@ static const struct file_operations x25_seq_forward_fops = {
106367
106368 int __init x25_proc_init(void)
106369 {
106370 - if (!proc_mkdir("x25", init_net.proc_net))
106371 + if (!proc_mkdir_restrict("x25", init_net.proc_net))
106372 return -ENOMEM;
106373
106374 if (!proc_create("x25/route", S_IRUGO, init_net.proc_net,
106375 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
106376 index 88bf289..7b0741b 100644
106377 --- a/net/xfrm/xfrm_policy.c
106378 +++ b/net/xfrm/xfrm_policy.c
106379 @@ -330,7 +330,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
106380 {
106381 policy->walk.dead = 1;
106382
106383 - atomic_inc(&policy->genid);
106384 + atomic_inc_unchecked(&policy->genid);
106385
106386 if (del_timer(&policy->polq.hold_timer))
106387 xfrm_pol_put(policy);
106388 @@ -781,7 +781,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
106389 hlist_add_head(&policy->bydst, chain);
106390 xfrm_pol_hold(policy);
106391 net->xfrm.policy_count[dir]++;
106392 - atomic_inc(&net->xfrm.flow_cache_genid);
106393 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
106394
106395 /* After previous checking, family can either be AF_INET or AF_INET6 */
106396 if (policy->family == AF_INET)
106397 @@ -1871,7 +1871,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
106398
106399 xdst->num_pols = num_pols;
106400 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
106401 - xdst->policy_genid = atomic_read(&pols[0]->genid);
106402 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
106403
106404 return xdst;
106405 }
106406 @@ -2685,10 +2685,11 @@ void xfrm_garbage_collect(struct net *net)
106407 }
106408 EXPORT_SYMBOL(xfrm_garbage_collect);
106409
106410 -static void xfrm_garbage_collect_deferred(struct net *net)
106411 +void xfrm_garbage_collect_deferred(struct net *net)
106412 {
106413 flow_cache_flush_deferred(net);
106414 }
106415 +EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
106416
106417 static void xfrm_init_pmtu(struct dst_entry *dst)
106418 {
106419 @@ -2738,7 +2739,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
106420 if (xdst->xfrm_genid != dst->xfrm->genid)
106421 return 0;
106422 if (xdst->num_pols > 0 &&
106423 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
106424 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
106425 return 0;
106426
106427 mtu = dst_mtu(dst->child);
106428 @@ -2826,8 +2827,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
106429 dst_ops->link_failure = xfrm_link_failure;
106430 if (likely(dst_ops->neigh_lookup == NULL))
106431 dst_ops->neigh_lookup = xfrm_neigh_lookup;
106432 - if (likely(afinfo->garbage_collect == NULL))
106433 - afinfo->garbage_collect = xfrm_garbage_collect_deferred;
106434 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
106435 }
106436 spin_unlock(&xfrm_policy_afinfo_lock);
106437 @@ -2881,7 +2880,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
106438 dst_ops->check = NULL;
106439 dst_ops->negative_advice = NULL;
106440 dst_ops->link_failure = NULL;
106441 - afinfo->garbage_collect = NULL;
106442 }
106443 return err;
106444 }
106445 @@ -3277,7 +3275,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
106446 sizeof(pol->xfrm_vec[i].saddr));
106447 pol->xfrm_vec[i].encap_family = mp->new_family;
106448 /* flush bundles */
106449 - atomic_inc(&pol->genid);
106450 + atomic_inc_unchecked(&pol->genid);
106451 }
106452 }
106453
106454 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
106455 index de971b6..b843409 100644
106456 --- a/net/xfrm/xfrm_state.c
106457 +++ b/net/xfrm/xfrm_state.c
106458 @@ -166,12 +166,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
106459
106460 if (unlikely(afinfo == NULL))
106461 return -EAFNOSUPPORT;
106462 - typemap = afinfo->type_map;
106463 + typemap = (const struct xfrm_type **)afinfo->type_map;
106464 spin_lock_bh(&xfrm_type_lock);
106465
106466 - if (likely(typemap[type->proto] == NULL))
106467 + if (likely(typemap[type->proto] == NULL)) {
106468 + pax_open_kernel();
106469 typemap[type->proto] = type;
106470 - else
106471 + pax_close_kernel();
106472 + } else
106473 err = -EEXIST;
106474 spin_unlock_bh(&xfrm_type_lock);
106475 xfrm_state_put_afinfo(afinfo);
106476 @@ -187,13 +189,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
106477
106478 if (unlikely(afinfo == NULL))
106479 return -EAFNOSUPPORT;
106480 - typemap = afinfo->type_map;
106481 + typemap = (const struct xfrm_type **)afinfo->type_map;
106482 spin_lock_bh(&xfrm_type_lock);
106483
106484 if (unlikely(typemap[type->proto] != type))
106485 err = -ENOENT;
106486 - else
106487 + else {
106488 + pax_open_kernel();
106489 typemap[type->proto] = NULL;
106490 + pax_close_kernel();
106491 + }
106492 spin_unlock_bh(&xfrm_type_lock);
106493 xfrm_state_put_afinfo(afinfo);
106494 return err;
106495 @@ -203,7 +208,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
106496 static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
106497 {
106498 struct xfrm_state_afinfo *afinfo;
106499 - const struct xfrm_type **typemap;
106500 const struct xfrm_type *type;
106501 int modload_attempted = 0;
106502
106503 @@ -211,9 +215,8 @@ retry:
106504 afinfo = xfrm_state_get_afinfo(family);
106505 if (unlikely(afinfo == NULL))
106506 return NULL;
106507 - typemap = afinfo->type_map;
106508
106509 - type = typemap[proto];
106510 + type = afinfo->type_map[proto];
106511 if (unlikely(type && !try_module_get(type->owner)))
106512 type = NULL;
106513 if (!type && !modload_attempted) {
106514 @@ -247,7 +250,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
106515 return -EAFNOSUPPORT;
106516
106517 err = -EEXIST;
106518 - modemap = afinfo->mode_map;
106519 + modemap = (struct xfrm_mode **)afinfo->mode_map;
106520 spin_lock_bh(&xfrm_mode_lock);
106521 if (modemap[mode->encap])
106522 goto out;
106523 @@ -256,8 +259,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
106524 if (!try_module_get(afinfo->owner))
106525 goto out;
106526
106527 - mode->afinfo = afinfo;
106528 + pax_open_kernel();
106529 + *(const void **)&mode->afinfo = afinfo;
106530 modemap[mode->encap] = mode;
106531 + pax_close_kernel();
106532 err = 0;
106533
106534 out:
106535 @@ -281,10 +286,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
106536 return -EAFNOSUPPORT;
106537
106538 err = -ENOENT;
106539 - modemap = afinfo->mode_map;
106540 + modemap = (struct xfrm_mode **)afinfo->mode_map;
106541 spin_lock_bh(&xfrm_mode_lock);
106542 if (likely(modemap[mode->encap] == mode)) {
106543 + pax_open_kernel();
106544 modemap[mode->encap] = NULL;
106545 + pax_close_kernel();
106546 module_put(mode->afinfo->owner);
106547 err = 0;
106548 }
106549 @@ -1505,10 +1512,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
106550 u32 xfrm_get_acqseq(void)
106551 {
106552 u32 res;
106553 - static atomic_t acqseq;
106554 + static atomic_unchecked_t acqseq;
106555
106556 do {
106557 - res = atomic_inc_return(&acqseq);
106558 + res = atomic_inc_return_unchecked(&acqseq);
106559 } while (!res);
106560
106561 return res;
106562 diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c
106563 index 05a6e3d..6716ec9 100644
106564 --- a/net/xfrm/xfrm_sysctl.c
106565 +++ b/net/xfrm/xfrm_sysctl.c
106566 @@ -42,7 +42,7 @@ static struct ctl_table xfrm_table[] = {
106567
106568 int __net_init xfrm_sysctl_init(struct net *net)
106569 {
106570 - struct ctl_table *table;
106571 + ctl_table_no_const *table;
106572
106573 __xfrm_sysctl_init(net);
106574
106575 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
106576 index 649ce68..f6bc05c 100644
106577 --- a/scripts/Makefile.build
106578 +++ b/scripts/Makefile.build
106579 @@ -60,7 +60,7 @@ endif
106580 endif
106581
106582 # Do not include host rules unless needed
106583 -ifneq ($(hostprogs-y)$(hostprogs-m),)
106584 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
106585 include scripts/Makefile.host
106586 endif
106587
106588 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
106589 index b1c668d..638055f 100644
106590 --- a/scripts/Makefile.clean
106591 +++ b/scripts/Makefile.clean
106592 @@ -41,7 +41,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
106593 __clean-files := $(extra-y) $(extra-m) $(extra-) \
106594 $(always) $(targets) $(clean-files) \
106595 $(host-progs) \
106596 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
106597 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
106598 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
106599
106600 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
106601
106602 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
106603 index 133edfa..c9aa07f 100644
106604 --- a/scripts/Makefile.host
106605 +++ b/scripts/Makefile.host
106606 @@ -20,7 +20,19 @@
106607 # Will compile qconf as a C++ program, and menu as a C program.
106608 # They are linked as C++ code to the executable qconf
106609
106610 +# hostprogs-y := conf
106611 +# conf-objs := conf.o libkconfig.so
106612 +# libkconfig-objs := expr.o type.o
106613 +# Will create a shared library named libkconfig.so that consists of
106614 +# expr.o and type.o (they are both compiled as C code and the object files
106615 +# are made as position independent code).
106616 +# conf.c is compiled as a C program, and conf.o is linked together with
106617 +# libkconfig.so as the executable conf.
106618 +# Note: Shared libraries consisting of C++ files are not supported
106619 +
106620 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
106621 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
106622 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
106623
106624 # C code
106625 # Executables compiled from a single .c file
106626 @@ -42,6 +54,19 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
106627 # C++ Object (.o) files compiled from .cc files
106628 host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
106629
106630 +# Shared libaries (only .c supported)
106631 +# Shared libraries (.so) - all .so files referenced in "xxx-objs"
106632 +host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
106633 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
106634 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
106635 +# Remove .so files from "xxx-objs"
106636 +host-cobjs := $(filter-out %.so,$(host-cobjs))
106637 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
106638 +
106639 +# Object (.o) files used by the shared libaries
106640 +host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
106641 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
106642 +
106643 # output directory for programs/.o files
106644 # hostprogs-y := tools/build may have been specified.
106645 # Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
106646 @@ -56,6 +81,10 @@ host-cmulti := $(addprefix $(obj)/,$(host-cmulti))
106647 host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
106648 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
106649 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
106650 +host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
106651 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
106652 +host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
106653 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
106654 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
106655
106656 obj-dirs += $(host-objdirs)
106657 @@ -124,5 +153,37 @@ quiet_cmd_host-cxxobjs = HOSTCXX $@
106658 $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE
106659 $(call if_changed_dep,host-cxxobjs)
106660
106661 +# Compile .c file, create position independent .o file
106662 +# host-cshobjs -> .o
106663 +quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
106664 + cmd_host-cshobjs = $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $<
106665 +$(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
106666 + $(call if_changed_dep,host-cshobjs)
106667 +
106668 +# Compile .c file, create position independent .o file
106669 +# host-cxxshobjs -> .o
106670 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
106671 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
106672 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
106673 + $(call if_changed_dep,host-cxxshobjs)
106674 +
106675 +# Link a shared library, based on position independent .o files
106676 +# *.o -> .so shared library (host-cshlib)
106677 +quiet_cmd_host-cshlib = HOSTLLD -shared $@
106678 + cmd_host-cshlib = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
106679 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
106680 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
106681 +$(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
106682 + $(call if_changed,host-cshlib)
106683 +
106684 +# Link a shared library, based on position independent .o files
106685 +# *.o -> .so shared library (host-cxxshlib)
106686 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
106687 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
106688 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
106689 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
106690 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
106691 + $(call if_changed,host-cxxshlib)
106692 +
106693 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
106694 - $(host-cxxmulti) $(host-cxxobjs)
106695 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
106696 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
106697 index b304068..462d24e 100644
106698 --- a/scripts/basic/fixdep.c
106699 +++ b/scripts/basic/fixdep.c
106700 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
106701 /*
106702 * Lookup a value in the configuration string.
106703 */
106704 -static int is_defined_config(const char *name, int len, unsigned int hash)
106705 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
106706 {
106707 struct item *aux;
106708
106709 @@ -211,10 +211,10 @@ static void clear_config(void)
106710 /*
106711 * Record the use of a CONFIG_* word.
106712 */
106713 -static void use_config(const char *m, int slen)
106714 +static void use_config(const char *m, unsigned int slen)
106715 {
106716 unsigned int hash = strhash(m, slen);
106717 - int c, i;
106718 + unsigned int c, i;
106719
106720 if (is_defined_config(m, slen, hash))
106721 return;
106722 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
106723
106724 static void parse_config_file(const char *map, size_t len)
106725 {
106726 - const int *end = (const int *) (map + len);
106727 + const unsigned int *end = (const unsigned int *) (map + len);
106728 /* start at +1, so that p can never be < map */
106729 - const int *m = (const int *) map + 1;
106730 + const unsigned int *m = (const unsigned int *) map + 1;
106731 const char *p, *q;
106732
106733 for (; m < end; m++) {
106734 @@ -435,7 +435,7 @@ static void print_deps(void)
106735 static void traps(void)
106736 {
106737 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
106738 - int *p = (int *)test;
106739 + unsigned int *p = (unsigned int *)test;
106740
106741 if (*p != INT_CONF) {
106742 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
106743 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
106744 new file mode 100644
106745 index 0000000..42018ed
106746 --- /dev/null
106747 +++ b/scripts/gcc-plugin.sh
106748 @@ -0,0 +1,51 @@
106749 +#!/bin/sh
106750 +srctree=$(dirname "$0")
106751 +gccplugins_dir=$($3 -print-file-name=plugin)
106752 +plugincc=$($1 -E - -o /dev/null -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
106753 +#include "gcc-common.h"
106754 +#if BUILDING_GCC_VERSION >= 4008 || defined(ENABLE_BUILD_WITH_CXX)
106755 +#warning $2 CXX
106756 +#else
106757 +#warning $1 CC
106758 +#endif
106759 +EOF
106760 +)
106761 +
106762 +if [ $? -ne 0 ]
106763 +then
106764 + exit 1
106765 +fi
106766 +
106767 +case "$plugincc" in
106768 + *"$1 CC"*)
106769 + echo "$1"
106770 + exit 0
106771 + ;;
106772 +
106773 + *"$2 CXX"*)
106774 + # the c++ compiler needs another test, see below
106775 + ;;
106776 +
106777 + *)
106778 + exit 1
106779 + ;;
106780 +esac
106781 +
106782 +# we need a c++ compiler that supports the designated initializer GNU extension
106783 +plugincc=$($2 -c -x c++ -std=gnu++98 - -fsyntax-only -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
106784 +#include "gcc-common.h"
106785 +class test {
106786 +public:
106787 + int test;
106788 +} test = {
106789 + .test = 1
106790 +};
106791 +EOF
106792 +)
106793 +
106794 +if [ $? -eq 0 ]
106795 +then
106796 + echo "$2"
106797 + exit 0
106798 +fi
106799 +exit 1
106800 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
106801 index fdebd66..a349e33 100755
106802 --- a/scripts/headers_install.sh
106803 +++ b/scripts/headers_install.sh
106804 @@ -32,6 +32,7 @@ do
106805 FILE="$(basename "$i")"
106806 sed -r \
106807 -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
106808 + -e 's/__intentional_overflow\([- \t,0-9]*\)//g' \
106809 -e 's/__attribute_const__([ \t]|$)/\1/g' \
106810 -e 's@^#include <linux/compiler.h>@@' \
106811 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
106812 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
106813 index 86a4fe7..99e91f9 100755
106814 --- a/scripts/link-vmlinux.sh
106815 +++ b/scripts/link-vmlinux.sh
106816 @@ -166,7 +166,7 @@ else
106817 fi;
106818
106819 # final build of init/
106820 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
106821 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
106822
106823 kallsymso=""
106824 kallsyms_vmlinux=""
106825 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
106826 index e614ef6..d9d2b01 100644
106827 --- a/scripts/mod/file2alias.c
106828 +++ b/scripts/mod/file2alias.c
106829 @@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
106830 unsigned long size, unsigned long id_size,
106831 void *symval)
106832 {
106833 - int i;
106834 + unsigned int i;
106835
106836 if (size % id_size || size < id_size) {
106837 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
106838 @@ -171,7 +171,7 @@ static void device_id_check(const char *modname, const char *device_id,
106839 /* USB is special because the bcdDevice can be matched against a numeric range */
106840 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
106841 static void do_usb_entry(void *symval,
106842 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
106843 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
106844 unsigned char range_lo, unsigned char range_hi,
106845 unsigned char max, struct module *mod)
106846 {
106847 @@ -281,7 +281,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
106848 {
106849 unsigned int devlo, devhi;
106850 unsigned char chi, clo, max;
106851 - int ndigits;
106852 + unsigned int ndigits;
106853
106854 DEF_FIELD(symval, usb_device_id, match_flags);
106855 DEF_FIELD(symval, usb_device_id, idVendor);
106856 @@ -534,7 +534,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
106857 for (i = 0; i < count; i++) {
106858 DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
106859 char acpi_id[sizeof(*id)];
106860 - int j;
106861 + unsigned int j;
106862
106863 buf_printf(&mod->dev_table_buf,
106864 "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
106865 @@ -563,7 +563,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
106866
106867 for (j = 0; j < PNP_MAX_DEVICES; j++) {
106868 const char *id = (char *)(*devs)[j].id;
106869 - int i2, j2;
106870 + unsigned int i2, j2;
106871 int dup = 0;
106872
106873 if (!id[0])
106874 @@ -589,7 +589,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
106875 /* add an individual alias for every device entry */
106876 if (!dup) {
106877 char acpi_id[PNP_ID_LEN];
106878 - int k;
106879 + unsigned int k;
106880
106881 buf_printf(&mod->dev_table_buf,
106882 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
106883 @@ -939,7 +939,7 @@ static void dmi_ascii_filter(char *d, const char *s)
106884 static int do_dmi_entry(const char *filename, void *symval,
106885 char *alias)
106886 {
106887 - int i, j;
106888 + unsigned int i, j;
106889 DEF_FIELD_ADDR(symval, dmi_system_id, matches);
106890 sprintf(alias, "dmi*");
106891
106892 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
106893 index d439856..10c1eac 100644
106894 --- a/scripts/mod/modpost.c
106895 +++ b/scripts/mod/modpost.c
106896 @@ -921,6 +921,7 @@ enum mismatch {
106897 ANY_INIT_TO_ANY_EXIT,
106898 ANY_EXIT_TO_ANY_INIT,
106899 EXPORT_TO_INIT_EXIT,
106900 + DATA_TO_TEXT
106901 };
106902
106903 struct sectioncheck {
106904 @@ -1007,6 +1008,12 @@ static const struct sectioncheck sectioncheck[] = {
106905 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
106906 .mismatch = EXPORT_TO_INIT_EXIT,
106907 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
106908 +},
106909 +/* Do not reference code from writable data */
106910 +{
106911 + .fromsec = { DATA_SECTIONS, NULL },
106912 + .tosec = { TEXT_SECTIONS, NULL },
106913 + .mismatch = DATA_TO_TEXT
106914 }
106915 };
106916
106917 @@ -1127,10 +1134,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
106918 continue;
106919 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
106920 continue;
106921 - if (sym->st_value == addr)
106922 - return sym;
106923 /* Find a symbol nearby - addr are maybe negative */
106924 d = sym->st_value - addr;
106925 + if (d == 0)
106926 + return sym;
106927 if (d < 0)
106928 d = addr - sym->st_value;
106929 if (d < distance) {
106930 @@ -1408,6 +1415,14 @@ static void report_sec_mismatch(const char *modname,
106931 tosym, prl_to, prl_to, tosym);
106932 free(prl_to);
106933 break;
106934 + case DATA_TO_TEXT:
106935 +#if 0
106936 + fprintf(stderr,
106937 + "The %s %s:%s references\n"
106938 + "the %s %s:%s%s\n",
106939 + from, fromsec, fromsym, to, tosec, tosym, to_p);
106940 +#endif
106941 + break;
106942 }
106943 fprintf(stderr, "\n");
106944 }
106945 @@ -1659,7 +1674,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
106946 static void check_sec_ref(struct module *mod, const char *modname,
106947 struct elf_info *elf)
106948 {
106949 - int i;
106950 + unsigned int i;
106951 Elf_Shdr *sechdrs = elf->sechdrs;
106952
106953 /* Walk through all sections */
106954 @@ -1790,7 +1805,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
106955 va_end(ap);
106956 }
106957
106958 -void buf_write(struct buffer *buf, const char *s, int len)
106959 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
106960 {
106961 if (buf->size - buf->pos < len) {
106962 buf->size += len + SZ;
106963 @@ -2009,7 +2024,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
106964 if (fstat(fileno(file), &st) < 0)
106965 goto close_write;
106966
106967 - if (st.st_size != b->pos)
106968 + if (st.st_size != (off_t)b->pos)
106969 goto close_write;
106970
106971 tmp = NOFAIL(malloc(b->pos));
106972 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
106973 index 168b43d..77914bf 100644
106974 --- a/scripts/mod/modpost.h
106975 +++ b/scripts/mod/modpost.h
106976 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
106977
106978 struct buffer {
106979 char *p;
106980 - int pos;
106981 - int size;
106982 + unsigned int pos;
106983 + unsigned int size;
106984 };
106985
106986 void __attribute__((format(printf, 2, 3)))
106987 buf_printf(struct buffer *buf, const char *fmt, ...);
106988
106989 void
106990 -buf_write(struct buffer *buf, const char *s, int len);
106991 +buf_write(struct buffer *buf, const char *s, unsigned int len);
106992
106993 struct module {
106994 struct module *next;
106995 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
106996 index 944418d..15291e4 100644
106997 --- a/scripts/mod/sumversion.c
106998 +++ b/scripts/mod/sumversion.c
106999 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
107000 goto out;
107001 }
107002
107003 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
107004 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
107005 warn("writing sum in %s failed: %s\n",
107006 filename, strerror(errno));
107007 goto out;
107008 diff --git a/scripts/module-common.lds b/scripts/module-common.lds
107009 index 0865b3e..7235dd4 100644
107010 --- a/scripts/module-common.lds
107011 +++ b/scripts/module-common.lds
107012 @@ -6,6 +6,10 @@
107013 SECTIONS {
107014 /DISCARD/ : { *(.discard) }
107015
107016 + .rodata : {
107017 + *(.rodata) *(.rodata.*)
107018 + *(.data..read_only)
107019 + }
107020 __ksymtab : { *(SORT(___ksymtab+*)) }
107021 __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
107022 __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
107023 diff --git a/scripts/package/Makefile b/scripts/package/Makefile
107024 index 99ca6e7..3a1a1a1 100644
107025 --- a/scripts/package/Makefile
107026 +++ b/scripts/package/Makefile
107027 @@ -46,7 +46,7 @@ rpm-pkg rpm: FORCE
107028 ln -sf $(srctree) $(KERNELPATH)
107029 $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
107030 $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
107031 - tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)
107032 + tar --owner=root --group=root -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)
107033 rm $(KERNELPATH)
107034 rm -f $(objtree)/.scmversion
107035 $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
107036 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
107037 index 5972624..4028795 100755
107038 --- a/scripts/package/builddeb
107039 +++ b/scripts/package/builddeb
107040 @@ -293,6 +293,7 @@ fi
107041 (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
107042 (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
107043 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
107044 +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
107045 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
107046 mkdir -p "$destdir"
107047 (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
107048 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
107049 index 1395760..bca2734 100755
107050 --- a/scripts/package/mkspec
107051 +++ b/scripts/package/mkspec
107052 @@ -121,29 +121,40 @@ echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
107053 echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
107054 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\""
107055 echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
107056 -echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
107057 -echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
107058 -echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
107059
107060 echo ""
107061 echo "%clean"
107062 echo 'rm -rf $RPM_BUILD_ROOT'
107063 echo ""
107064 +echo "%pre"
107065 +echo 'chmod -f 0500 /boot'
107066 +echo 'if [ -d /lib/modules ]; then'
107067 +echo 'chmod -f 0500 /lib/modules'
107068 +echo 'fi'
107069 +echo 'if [ -d /lib32/modules ]; then'
107070 +echo 'chmod -f 0500 /lib32/modules'
107071 +echo 'fi'
107072 +echo 'if [ -d /lib64/modules ]; then'
107073 +echo 'chmod -f 0500 /lib64/modules'
107074 +echo 'fi'
107075 +echo ""
107076 +echo "%post devel"
107077 +echo "ln -sf /usr/src/kernels/$KERNELRELEASE /lib/modules/$KERNELRELEASE/build"
107078 +echo "ln -sf /usr/src/kernels/$KERNELRELEASE /lib/modules/$KERNELRELEASE/source"
107079 +echo ""
107080 echo "%post"
107081 -echo "if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"
107082 -echo "cp /boot/vmlinuz-$KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm"
107083 -echo "cp /boot/System.map-$KERNELRELEASE /boot/System.map-$KERNELRELEASE-rpm"
107084 -echo "rm -f /boot/vmlinuz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"
107085 -echo "/sbin/installkernel $KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
107086 -echo "rm -f /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
107087 +echo "if [ -x /sbin/dracut ]; then"
107088 +echo '/sbin/new-kernel-pkg --dracut --mkinitrd --depmod --install --make-default '"$KERNELRELEASE"' || exit $?'
107089 +echo "else"
107090 +echo '/sbin/new-kernel-pkg --mkinitrd --depmod --install --make-default '"$KERNELRELEASE"' || exit $?'
107091 echo "fi"
107092 echo ""
107093 echo "%files"
107094 -echo '%defattr (-, root, root)'
107095 +echo '%defattr (400, root, root, 500)'
107096 echo "%dir /lib/modules"
107097 -echo "/lib/modules/$KERNELRELEASE"
107098 echo "%exclude /lib/modules/$KERNELRELEASE/build"
107099 echo "%exclude /lib/modules/$KERNELRELEASE/source"
107100 +echo "/lib/modules/$KERNELRELEASE"
107101 echo "/lib/firmware/$KERNELRELEASE"
107102 echo "/boot/*"
107103 echo ""
107104 @@ -152,8 +163,7 @@ echo '%defattr (-, root, root)'
107105 echo "/usr/include"
107106 echo ""
107107 echo "%files devel"
107108 -echo '%defattr (-, root, root)'
107109 +echo '%defattr (400, root, root, 500)'
107110 +echo "%dir /lib/modules/$KERNELRELEASE"
107111 echo "/usr/src/kernels/$KERNELRELEASE"
107112 -echo "/lib/modules/$KERNELRELEASE/build"
107113 -echo "/lib/modules/$KERNELRELEASE/source"
107114 echo ""
107115 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
107116 index 4718d78..9220d58 100644
107117 --- a/scripts/pnmtologo.c
107118 +++ b/scripts/pnmtologo.c
107119 @@ -244,14 +244,14 @@ static void write_header(void)
107120 fprintf(out, " * Linux logo %s\n", logoname);
107121 fputs(" */\n\n", out);
107122 fputs("#include <linux/linux_logo.h>\n\n", out);
107123 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
107124 + fprintf(out, "static unsigned char %s_data[] = {\n",
107125 logoname);
107126 }
107127
107128 static void write_footer(void)
107129 {
107130 fputs("\n};\n\n", out);
107131 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
107132 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
107133 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
107134 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
107135 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
107136 @@ -381,7 +381,7 @@ static void write_logo_clut224(void)
107137 fputs("\n};\n\n", out);
107138
107139 /* write logo clut */
107140 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
107141 + fprintf(out, "static unsigned char %s_clut[] = {\n",
107142 logoname);
107143 write_hex_cnt = 0;
107144 for (i = 0; i < logo_clutsize; i++) {
107145 diff --git a/scripts/sortextable.h b/scripts/sortextable.h
107146 index ba87004..3f4852c 100644
107147 --- a/scripts/sortextable.h
107148 +++ b/scripts/sortextable.h
107149 @@ -108,9 +108,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
107150 const char *secstrtab;
107151 const char *strtab;
107152 char *extab_image;
107153 - int extab_index = 0;
107154 - int i;
107155 - int idx;
107156 + unsigned int extab_index = 0;
107157 + unsigned int i;
107158 + unsigned int idx;
107159 unsigned int num_sections;
107160 unsigned int secindex_strings;
107161
107162 diff --git a/scripts/tags.sh b/scripts/tags.sh
107163 index cdb491d..8d32bfc 100755
107164 --- a/scripts/tags.sh
107165 +++ b/scripts/tags.sh
107166 @@ -26,7 +26,7 @@ else
107167 fi
107168
107169 # ignore userspace tools
107170 -ignore="$ignore ( -path ${tree}tools ) -prune -o"
107171 +ignore="$ignore ( -path \"${tree}tools/[^g]*\" ) -prune -o"
107172
107173 # Find all available archs
107174 find_all_archs()
107175 diff --git a/security/Kconfig b/security/Kconfig
107176 index beb86b5..1a953b1 100644
107177 --- a/security/Kconfig
107178 +++ b/security/Kconfig
107179 @@ -4,6 +4,974 @@
107180
107181 menu "Security options"
107182
107183 +menu "Grsecurity"
107184 +
107185 + config ARCH_TRACK_EXEC_LIMIT
107186 + bool
107187 +
107188 + config PAX_KERNEXEC_PLUGIN
107189 + bool
107190 +
107191 + config PAX_PER_CPU_PGD
107192 + bool
107193 +
107194 + config TASK_SIZE_MAX_SHIFT
107195 + int
107196 + depends on X86_64
107197 + default 47 if !PAX_PER_CPU_PGD
107198 + default 42 if PAX_PER_CPU_PGD
107199 +
107200 + config PAX_ENABLE_PAE
107201 + bool
107202 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
107203 +
107204 + config PAX_USERCOPY_SLABS
107205 + bool
107206 +
107207 +config GRKERNSEC
107208 + bool "Grsecurity"
107209 + select CRYPTO
107210 + select CRYPTO_SHA256
107211 + select PROC_FS
107212 + select STOP_MACHINE
107213 + select TTY
107214 + select DEBUG_KERNEL
107215 + select DEBUG_LIST
107216 + help
107217 + If you say Y here, you will be able to configure many features
107218 + that will enhance the security of your system. It is highly
107219 + recommended that you say Y here and read through the help
107220 + for each option so that you fully understand the features and
107221 + can evaluate their usefulness for your machine.
107222 +
107223 +choice
107224 + prompt "Configuration Method"
107225 + depends on GRKERNSEC
107226 + default GRKERNSEC_CONFIG_CUSTOM
107227 + help
107228 +
107229 +config GRKERNSEC_CONFIG_AUTO
107230 + bool "Automatic"
107231 + help
107232 + If you choose this configuration method, you'll be able to answer a small
107233 + number of simple questions about how you plan to use this kernel.
107234 + The settings of grsecurity and PaX will be automatically configured for
107235 + the highest commonly-used settings within the provided constraints.
107236 +
107237 + If you require additional configuration, custom changes can still be made
107238 + from the "custom configuration" menu.
107239 +
107240 +config GRKERNSEC_CONFIG_CUSTOM
107241 + bool "Custom"
107242 + help
107243 + If you choose this configuration method, you'll be able to configure all
107244 + grsecurity and PaX settings manually. Via this method, no options are
107245 + automatically enabled.
107246 +
107247 +endchoice
107248 +
107249 +choice
107250 + prompt "Usage Type"
107251 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107252 + default GRKERNSEC_CONFIG_SERVER
107253 + help
107254 +
107255 +config GRKERNSEC_CONFIG_SERVER
107256 + bool "Server"
107257 + help
107258 + Choose this option if you plan to use this kernel on a server.
107259 +
107260 +config GRKERNSEC_CONFIG_DESKTOP
107261 + bool "Desktop"
107262 + help
107263 + Choose this option if you plan to use this kernel on a desktop.
107264 +
107265 +endchoice
107266 +
107267 +choice
107268 + prompt "Virtualization Type"
107269 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
107270 + default GRKERNSEC_CONFIG_VIRT_NONE
107271 + help
107272 +
107273 +config GRKERNSEC_CONFIG_VIRT_NONE
107274 + bool "None"
107275 + help
107276 + Choose this option if this kernel will be run on bare metal.
107277 +
107278 +config GRKERNSEC_CONFIG_VIRT_GUEST
107279 + bool "Guest"
107280 + help
107281 + Choose this option if this kernel will be run as a VM guest.
107282 +
107283 +config GRKERNSEC_CONFIG_VIRT_HOST
107284 + bool "Host"
107285 + help
107286 + Choose this option if this kernel will be run as a VM host.
107287 +
107288 +endchoice
107289 +
107290 +choice
107291 + prompt "Virtualization Hardware"
107292 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
107293 + help
107294 +
107295 +config GRKERNSEC_CONFIG_VIRT_EPT
107296 + bool "EPT/RVI Processor Support"
107297 + depends on X86
107298 + help
107299 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
107300 + hardware virtualization. This allows for additional kernel hardening protections
107301 + to operate without additional performance impact.
107302 +
107303 + To see if your Intel processor supports EPT, see:
107304 + http://ark.intel.com/Products/VirtualizationTechnology
107305 + (Most Core i3/5/7 support EPT)
107306 +
107307 + To see if your AMD processor supports RVI, see:
107308 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
107309 +
107310 +config GRKERNSEC_CONFIG_VIRT_SOFT
107311 + bool "First-gen/No Hardware Virtualization"
107312 + help
107313 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
107314 + support hardware virtualization or doesn't support the EPT/RVI extensions.
107315 +
107316 +endchoice
107317 +
107318 +choice
107319 + prompt "Virtualization Software"
107320 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
107321 + help
107322 +
107323 +config GRKERNSEC_CONFIG_VIRT_XEN
107324 + bool "Xen"
107325 + help
107326 + Choose this option if this kernel is running as a Xen guest or host.
107327 +
107328 +config GRKERNSEC_CONFIG_VIRT_VMWARE
107329 + bool "VMWare"
107330 + help
107331 + Choose this option if this kernel is running as a VMWare guest or host.
107332 +
107333 +config GRKERNSEC_CONFIG_VIRT_KVM
107334 + bool "KVM"
107335 + help
107336 + Choose this option if this kernel is running as a KVM guest or host.
107337 +
107338 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
107339 + bool "VirtualBox"
107340 + help
107341 + Choose this option if this kernel is running as a VirtualBox guest or host.
107342 +
107343 +config GRKERNSEC_CONFIG_VIRT_HYPERV
107344 + bool "Hyper-V"
107345 + help
107346 + Choose this option if this kernel is running as a Hyper-V guest.
107347 +
107348 +endchoice
107349 +
107350 +choice
107351 + prompt "Required Priorities"
107352 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107353 + default GRKERNSEC_CONFIG_PRIORITY_PERF
107354 + help
107355 +
107356 +config GRKERNSEC_CONFIG_PRIORITY_PERF
107357 + bool "Performance"
107358 + help
107359 + Choose this option if performance is of highest priority for this deployment
107360 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
107361 + clearing of structures intended for userland, and freed memory sanitizing will
107362 + be disabled.
107363 +
107364 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
107365 + bool "Security"
107366 + help
107367 + Choose this option if security is of highest priority for this deployment of
107368 + grsecurity. UDEREF, kernel stack clearing, clearing of structures intended
107369 + for userland, and freed memory sanitizing will be enabled for this kernel.
107370 + In a worst-case scenario, these features can introduce a 20% performance hit
107371 + (UDEREF on x64 contributing half of this hit).
107372 +
107373 +endchoice
107374 +
107375 +menu "Default Special Groups"
107376 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107377 +
107378 +config GRKERNSEC_PROC_GID
107379 + int "GID exempted from /proc restrictions"
107380 + default 1001
107381 + help
107382 + Setting this GID determines which group will be exempted from
107383 + grsecurity's /proc restrictions, allowing users of the specified
107384 + group to view network statistics and the existence of other users'
107385 + processes on the system. This GID may also be chosen at boot time
107386 + via "grsec_proc_gid=" on the kernel commandline.
107387 +
107388 +config GRKERNSEC_TPE_UNTRUSTED_GID
107389 + int "GID for TPE-untrusted users"
107390 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
107391 + default 1005
107392 + help
107393 + Setting this GID determines which group untrusted users should
107394 + be added to. These users will be placed under grsecurity's Trusted Path
107395 + Execution mechanism, preventing them from executing their own binaries.
107396 + The users will only be able to execute binaries in directories owned and
107397 + writable only by the root user. If the sysctl option is enabled, a sysctl
107398 + option with name "tpe_gid" is created.
107399 +
107400 +config GRKERNSEC_TPE_TRUSTED_GID
107401 + int "GID for TPE-trusted users"
107402 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
107403 + default 1005
107404 + help
107405 + Setting this GID determines what group TPE restrictions will be
107406 + *disabled* for. If the sysctl option is enabled, a sysctl option
107407 + with name "tpe_gid" is created.
107408 +
107409 +config GRKERNSEC_SYMLINKOWN_GID
107410 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
107411 + depends on GRKERNSEC_CONFIG_SERVER
107412 + default 1006
107413 + help
107414 + Setting this GID determines what group kernel-enforced
107415 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
107416 + is enabled, a sysctl option with name "symlinkown_gid" is created.
107417 +
107418 +
107419 +endmenu
107420 +
107421 +menu "Customize Configuration"
107422 +depends on GRKERNSEC
107423 +
107424 +menu "PaX"
107425 +
107426 +config PAX
107427 + bool "Enable various PaX features"
107428 + default y if GRKERNSEC_CONFIG_AUTO
107429 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
107430 + help
107431 + This allows you to enable various PaX features. PaX adds
107432 + intrusion prevention mechanisms to the kernel that reduce
107433 + the risks posed by exploitable memory corruption bugs.
107434 +
107435 +menu "PaX Control"
107436 + depends on PAX
107437 +
107438 +config PAX_SOFTMODE
107439 + bool 'Support soft mode'
107440 + help
107441 + Enabling this option will allow you to run PaX in soft mode, that
107442 + is, PaX features will not be enforced by default, only on executables
107443 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
107444 + support as they are the only way to mark executables for soft mode use.
107445 +
107446 + Soft mode can be activated by using the "pax_softmode=1" kernel command
107447 + line option on boot. Furthermore you can control various PaX features
107448 + at runtime via the entries in /proc/sys/kernel/pax.
107449 +
107450 +config PAX_EI_PAX
107451 + bool 'Use legacy ELF header marking'
107452 + default y if GRKERNSEC_CONFIG_AUTO
107453 + help
107454 + Enabling this option will allow you to control PaX features on
107455 + a per executable basis via the 'chpax' utility available at
107456 + http://pax.grsecurity.net/. The control flags will be read from
107457 + an otherwise reserved part of the ELF header. This marking has
107458 + numerous drawbacks (no support for soft-mode, toolchain does not
107459 + know about the non-standard use of the ELF header) therefore it
107460 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
107461 + support.
107462 +
107463 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
107464 + support as well, they will override the legacy EI_PAX marks.
107465 +
107466 + If you enable none of the marking options then all applications
107467 + will run with PaX enabled on them by default.
107468 +
107469 +config PAX_PT_PAX_FLAGS
107470 + bool 'Use ELF program header marking'
107471 + default y if GRKERNSEC_CONFIG_AUTO
107472 + help
107473 + Enabling this option will allow you to control PaX features on
107474 + a per executable basis via the 'paxctl' utility available at
107475 + http://pax.grsecurity.net/. The control flags will be read from
107476 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
107477 + has the benefits of supporting both soft mode and being fully
107478 + integrated into the toolchain (the binutils patch is available
107479 + from http://pax.grsecurity.net).
107480 +
107481 + Note that if you enable the legacy EI_PAX marking support as well,
107482 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
107483 +
107484 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
107485 + must make sure that the marks are the same if a binary has both marks.
107486 +
107487 + If you enable none of the marking options then all applications
107488 + will run with PaX enabled on them by default.
107489 +
107490 +config PAX_XATTR_PAX_FLAGS
107491 + bool 'Use filesystem extended attributes marking'
107492 + default y if GRKERNSEC_CONFIG_AUTO
107493 + select CIFS_XATTR if CIFS
107494 + select F2FS_FS_XATTR if F2FS_FS
107495 + select EXT2_FS_XATTR if EXT2_FS
107496 + select EXT3_FS_XATTR if EXT3_FS
107497 + select JFFS2_FS_XATTR if JFFS2_FS
107498 + select REISERFS_FS_XATTR if REISERFS_FS
107499 + select SQUASHFS_XATTR if SQUASHFS
107500 + select TMPFS_XATTR if TMPFS
107501 + help
107502 + Enabling this option will allow you to control PaX features on
107503 + a per executable basis via the 'setfattr' utility. The control
107504 + flags will be read from the user.pax.flags extended attribute of
107505 + the file. This marking has the benefit of supporting binary-only
107506 + applications that self-check themselves (e.g., skype) and would
107507 + not tolerate chpax/paxctl changes. The main drawback is that
107508 + extended attributes are not supported by some filesystems (e.g.,
107509 + isofs, udf, vfat) so copying files through such filesystems will
107510 + lose the extended attributes and these PaX markings.
107511 +
107512 + Note that if you enable the legacy EI_PAX marking support as well,
107513 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
107514 +
107515 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
107516 + must make sure that the marks are the same if a binary has both marks.
107517 +
107518 + If you enable none of the marking options then all applications
107519 + will run with PaX enabled on them by default.
107520 +
107521 +choice
107522 + prompt 'MAC system integration'
107523 + default PAX_HAVE_ACL_FLAGS
107524 + help
107525 + Mandatory Access Control systems have the option of controlling
107526 + PaX flags on a per executable basis, choose the method supported
107527 + by your particular system.
107528 +
107529 + - "none": if your MAC system does not interact with PaX,
107530 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
107531 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
107532 +
107533 + NOTE: this option is for developers/integrators only.
107534 +
107535 + config PAX_NO_ACL_FLAGS
107536 + bool 'none'
107537 +
107538 + config PAX_HAVE_ACL_FLAGS
107539 + bool 'direct'
107540 +
107541 + config PAX_HOOK_ACL_FLAGS
107542 + bool 'hook'
107543 +endchoice
107544 +
107545 +endmenu
107546 +
107547 +menu "Non-executable pages"
107548 + depends on PAX
107549 +
107550 +config PAX_NOEXEC
107551 + bool "Enforce non-executable pages"
107552 + default y if GRKERNSEC_CONFIG_AUTO
107553 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
107554 + help
107555 + By design some architectures do not allow for protecting memory
107556 + pages against execution or even if they do, Linux does not make
107557 + use of this feature. In practice this means that if a page is
107558 + readable (such as the stack or heap) it is also executable.
107559 +
107560 + There is a well known exploit technique that makes use of this
107561 + fact and a common programming mistake where an attacker can
107562 + introduce code of his choice somewhere in the attacked program's
107563 + memory (typically the stack or the heap) and then execute it.
107564 +
107565 + If the attacked program was running with different (typically
107566 + higher) privileges than that of the attacker, then he can elevate
107567 + his own privilege level (e.g. get a root shell, write to files for
107568 + which he does not have write access to, etc).
107569 +
107570 + Enabling this option will let you choose from various features
107571 + that prevent the injection and execution of 'foreign' code in
107572 + a program.
107573 +
107574 + This will also break programs that rely on the old behaviour and
107575 + expect that dynamically allocated memory via the malloc() family
107576 + of functions is executable (which it is not). Notable examples
107577 + are the XFree86 4.x server, the java runtime and wine.
107578 +
107579 +config PAX_PAGEEXEC
107580 + bool "Paging based non-executable pages"
107581 + default y if GRKERNSEC_CONFIG_AUTO
107582 + 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)
107583 + select ARCH_TRACK_EXEC_LIMIT if X86_32
107584 + help
107585 + This implementation is based on the paging feature of the CPU.
107586 + On i386 without hardware non-executable bit support there is a
107587 + variable but usually low performance impact, however on Intel's
107588 + P4 core based CPUs it is very high so you should not enable this
107589 + for kernels meant to be used on such CPUs.
107590 +
107591 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
107592 + with hardware non-executable bit support there is no performance
107593 + impact, on ppc the impact is negligible.
107594 +
107595 + Note that several architectures require various emulations due to
107596 + badly designed userland ABIs, this will cause a performance impact
107597 + but will disappear as soon as userland is fixed. For example, ppc
107598 + userland MUST have been built with secure-plt by a recent toolchain.
107599 +
107600 +config PAX_SEGMEXEC
107601 + bool "Segmentation based non-executable pages"
107602 + default y if GRKERNSEC_CONFIG_AUTO
107603 + depends on PAX_NOEXEC && X86_32
107604 + help
107605 + This implementation is based on the segmentation feature of the
107606 + CPU and has a very small performance impact, however applications
107607 + will be limited to a 1.5 GB address space instead of the normal
107608 + 3 GB.
107609 +
107610 +config PAX_EMUTRAMP
107611 + bool "Emulate trampolines"
107612 + default y if PARISC || GRKERNSEC_CONFIG_AUTO
107613 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
107614 + help
107615 + There are some programs and libraries that for one reason or
107616 + another attempt to execute special small code snippets from
107617 + non-executable memory pages. Most notable examples are the
107618 + signal handler return code generated by the kernel itself and
107619 + the GCC trampolines.
107620 +
107621 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
107622 + such programs will no longer work under your kernel.
107623 +
107624 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
107625 + utilities to enable trampoline emulation for the affected programs
107626 + yet still have the protection provided by the non-executable pages.
107627 +
107628 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
107629 + your system will not even boot.
107630 +
107631 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
107632 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
107633 + for the affected files.
107634 +
107635 + NOTE: enabling this feature *may* open up a loophole in the
107636 + protection provided by non-executable pages that an attacker
107637 + could abuse. Therefore the best solution is to not have any
107638 + files on your system that would require this option. This can
107639 + be achieved by not using libc5 (which relies on the kernel
107640 + signal handler return code) and not using or rewriting programs
107641 + that make use of the nested function implementation of GCC.
107642 + Skilled users can just fix GCC itself so that it implements
107643 + nested function calls in a way that does not interfere with PaX.
107644 +
107645 +config PAX_EMUSIGRT
107646 + bool "Automatically emulate sigreturn trampolines"
107647 + depends on PAX_EMUTRAMP && PARISC
107648 + default y
107649 + help
107650 + Enabling this option will have the kernel automatically detect
107651 + and emulate signal return trampolines executing on the stack
107652 + that would otherwise lead to task termination.
107653 +
107654 + This solution is intended as a temporary one for users with
107655 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
107656 + Modula-3 runtime, etc) or executables linked to such, basically
107657 + everything that does not specify its own SA_RESTORER function in
107658 + normal executable memory like glibc 2.1+ does.
107659 +
107660 + On parisc you MUST enable this option, otherwise your system will
107661 + not even boot.
107662 +
107663 + NOTE: this feature cannot be disabled on a per executable basis
107664 + and since it *does* open up a loophole in the protection provided
107665 + by non-executable pages, the best solution is to not have any
107666 + files on your system that would require this option.
107667 +
107668 +config PAX_MPROTECT
107669 + bool "Restrict mprotect()"
107670 + default y if GRKERNSEC_CONFIG_AUTO
107671 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
107672 + help
107673 + Enabling this option will prevent programs from
107674 + - changing the executable status of memory pages that were
107675 + not originally created as executable,
107676 + - making read-only executable pages writable again,
107677 + - creating executable pages from anonymous memory,
107678 + - making read-only-after-relocations (RELRO) data pages writable again.
107679 +
107680 + You should say Y here to complete the protection provided by
107681 + the enforcement of non-executable pages.
107682 +
107683 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
107684 + this feature on a per file basis.
107685 +
107686 +config PAX_MPROTECT_COMPAT
107687 + bool "Use legacy/compat protection demoting (read help)"
107688 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
107689 + depends on PAX_MPROTECT
107690 + help
107691 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
107692 + by sending the proper error code to the application. For some broken
107693 + userland, this can cause problems with Python or other applications. The
107694 + current implementation however allows for applications like clamav to
107695 + detect if JIT compilation/execution is allowed and to fall back gracefully
107696 + to an interpreter-based mode if it does not. While we encourage everyone
107697 + to use the current implementation as-is and push upstream to fix broken
107698 + userland (note that the RWX logging option can assist with this), in some
107699 + environments this may not be possible. Having to disable MPROTECT
107700 + completely on certain binaries reduces the security benefit of PaX,
107701 + so this option is provided for those environments to revert to the old
107702 + behavior.
107703 +
107704 +config PAX_ELFRELOCS
107705 + bool "Allow ELF text relocations (read help)"
107706 + depends on PAX_MPROTECT
107707 + default n
107708 + help
107709 + Non-executable pages and mprotect() restrictions are effective
107710 + in preventing the introduction of new executable code into an
107711 + attacked task's address space. There remain only two venues
107712 + for this kind of attack: if the attacker can execute already
107713 + existing code in the attacked task then he can either have it
107714 + create and mmap() a file containing his code or have it mmap()
107715 + an already existing ELF library that does not have position
107716 + independent code in it and use mprotect() on it to make it
107717 + writable and copy his code there. While protecting against
107718 + the former approach is beyond PaX, the latter can be prevented
107719 + by having only PIC ELF libraries on one's system (which do not
107720 + need to relocate their code). If you are sure this is your case,
107721 + as is the case with all modern Linux distributions, then leave
107722 + this option disabled. You should say 'n' here.
107723 +
107724 +config PAX_ETEXECRELOCS
107725 + bool "Allow ELF ET_EXEC text relocations"
107726 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
107727 + select PAX_ELFRELOCS
107728 + default y
107729 + help
107730 + On some architectures there are incorrectly created applications
107731 + that require text relocations and would not work without enabling
107732 + this option. If you are an alpha, ia64 or parisc user, you should
107733 + enable this option and disable it once you have made sure that
107734 + none of your applications need it.
107735 +
107736 +config PAX_EMUPLT
107737 + bool "Automatically emulate ELF PLT"
107738 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
107739 + default y
107740 + help
107741 + Enabling this option will have the kernel automatically detect
107742 + and emulate the Procedure Linkage Table entries in ELF files.
107743 + On some architectures such entries are in writable memory, and
107744 + become non-executable leading to task termination. Therefore
107745 + it is mandatory that you enable this option on alpha, parisc,
107746 + sparc and sparc64, otherwise your system would not even boot.
107747 +
107748 + NOTE: this feature *does* open up a loophole in the protection
107749 + provided by the non-executable pages, therefore the proper
107750 + solution is to modify the toolchain to produce a PLT that does
107751 + not need to be writable.
107752 +
107753 +config PAX_DLRESOLVE
107754 + bool 'Emulate old glibc resolver stub'
107755 + depends on PAX_EMUPLT && SPARC
107756 + default n
107757 + help
107758 + This option is needed if userland has an old glibc (before 2.4)
107759 + that puts a 'save' instruction into the runtime generated resolver
107760 + stub that needs special emulation.
107761 +
107762 +config PAX_KERNEXEC
107763 + bool "Enforce non-executable kernel pages"
107764 + 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))
107765 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !(ARM_LPAE && MODULES))) && !XEN
107766 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
107767 + select PAX_KERNEXEC_PLUGIN if X86_64
107768 + help
107769 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
107770 + that is, enabling this option will make it harder to inject
107771 + and execute 'foreign' code in kernel memory itself.
107772 +
107773 + Note that on amd64, CONFIG_EFI enabled with "efi=old_map" on
107774 + the kernel command-line will result in an RWX physical map.
107775 +
107776 + Likewise, the EFI runtime services are necessarily mapped as
107777 + RWX. If CONFIG_EFI is enabled on an EFI-capable system, it
107778 + is recommended that you boot with "noefi" on the kernel
107779 + command-line if possible to eliminate the mapping.
107780 +
107781 +choice
107782 + prompt "Return Address Instrumentation Method"
107783 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
107784 + depends on PAX_KERNEXEC_PLUGIN
107785 + help
107786 + Select the method used to instrument function pointer dereferences.
107787 + Note that binary modules cannot be instrumented by this approach.
107788 +
107789 + Note that the implementation requires a gcc with plugin support,
107790 + i.e., gcc 4.5 or newer. You may need to install the supporting
107791 + headers explicitly in addition to the normal gcc package.
107792 +
107793 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
107794 + bool "bts"
107795 + help
107796 + This method is compatible with binary only modules but has
107797 + a higher runtime overhead.
107798 +
107799 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
107800 + bool "or"
107801 + depends on !PARAVIRT
107802 + help
107803 + This method is incompatible with binary only modules but has
107804 + a lower runtime overhead.
107805 +endchoice
107806 +
107807 +config PAX_KERNEXEC_PLUGIN_METHOD
107808 + string
107809 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
107810 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
107811 + default ""
107812 +
107813 +config PAX_KERNEXEC_MODULE_TEXT
107814 + int "Minimum amount of memory reserved for module code"
107815 + default "8" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
107816 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
107817 + depends on PAX_KERNEXEC && X86_32
107818 + help
107819 + Due to implementation details the kernel must reserve a fixed
107820 + amount of memory for runtime allocated code (such as modules)
107821 + at compile time that cannot be changed at runtime. Here you
107822 + can specify the minimum amount in MB that will be reserved.
107823 + Due to the same implementation details this size will always
107824 + be rounded up to the next 2/4 MB boundary (depends on PAE) so
107825 + the actually available memory for runtime allocated code will
107826 + usually be more than this minimum.
107827 +
107828 + The default 4 MB should be enough for most users but if you have
107829 + an excessive number of modules (e.g., most distribution configs
107830 + compile many drivers as modules) or use huge modules such as
107831 + nvidia's kernel driver, you will need to adjust this amount.
107832 + A good rule of thumb is to look at your currently loaded kernel
107833 + modules and add up their sizes.
107834 +
107835 +endmenu
107836 +
107837 +menu "Address Space Layout Randomization"
107838 + depends on PAX
107839 +
107840 +config PAX_ASLR
107841 + bool "Address Space Layout Randomization"
107842 + default y if GRKERNSEC_CONFIG_AUTO
107843 + help
107844 + Many if not most exploit techniques rely on the knowledge of
107845 + certain addresses in the attacked program. The following options
107846 + will allow the kernel to apply a certain amount of randomization
107847 + to specific parts of the program thereby forcing an attacker to
107848 + guess them in most cases. Any failed guess will most likely crash
107849 + the attacked program which allows the kernel to detect such attempts
107850 + and react on them. PaX itself provides no reaction mechanisms,
107851 + instead it is strongly encouraged that you make use of grsecurity's
107852 + (http://www.grsecurity.net/) built-in crash detection features or
107853 + develop one yourself.
107854 +
107855 + By saying Y here you can choose to randomize the following areas:
107856 + - top of the task's kernel stack
107857 + - top of the task's userland stack
107858 + - base address for mmap() requests that do not specify one
107859 + (this includes all libraries)
107860 + - base address of the main executable
107861 +
107862 + It is strongly recommended to say Y here as address space layout
107863 + randomization has negligible impact on performance yet it provides
107864 + a very effective protection.
107865 +
107866 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
107867 + this feature on a per file basis.
107868 +
107869 +config PAX_RANDKSTACK
107870 + bool "Randomize kernel stack base"
107871 + default y if GRKERNSEC_CONFIG_AUTO && !(GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_VIRTUALBOX)
107872 + depends on X86_TSC && X86
107873 + help
107874 + By saying Y here the kernel will randomize every task's kernel
107875 + stack on every system call. This will not only force an attacker
107876 + to guess it but also prevent him from making use of possible
107877 + leaked information about it.
107878 +
107879 + Since the kernel stack is a rather scarce resource, randomization
107880 + may cause unexpected stack overflows, therefore you should very
107881 + carefully test your system. Note that once enabled in the kernel
107882 + configuration, this feature cannot be disabled on a per file basis.
107883 +
107884 +config PAX_RANDUSTACK
107885 + bool
107886 +
107887 +config PAX_RANDMMAP
107888 + bool "Randomize user stack and mmap() bases"
107889 + default y if GRKERNSEC_CONFIG_AUTO
107890 + depends on PAX_ASLR
107891 + select PAX_RANDUSTACK
107892 + help
107893 + By saying Y here the kernel will randomize every task's userland
107894 + stack and use a randomized base address for mmap() requests that
107895 + do not specify one themselves.
107896 +
107897 + The stack randomization is done in two steps where the second
107898 + one may apply a big amount of shift to the top of the stack and
107899 + cause problems for programs that want to use lots of memory (more
107900 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
107901 +
107902 + As a result of mmap randomization all dynamically loaded libraries
107903 + will appear at random addresses and therefore be harder to exploit
107904 + by a technique where an attacker attempts to execute library code
107905 + for his purposes (e.g. spawn a shell from an exploited program that
107906 + is running at an elevated privilege level).
107907 +
107908 + Furthermore, if a program is relinked as a dynamic ELF file, its
107909 + base address will be randomized as well, completing the full
107910 + randomization of the address space layout. Attacking such programs
107911 + becomes a guess game. You can find an example of doing this at
107912 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
107913 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
107914 +
107915 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
107916 + feature on a per file basis.
107917 +
107918 +endmenu
107919 +
107920 +menu "Miscellaneous hardening features"
107921 +
107922 +config PAX_MEMORY_SANITIZE
107923 + bool "Sanitize all freed memory"
107924 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
107925 + help
107926 + By saying Y here the kernel will erase memory pages and slab objects
107927 + as soon as they are freed. This in turn reduces the lifetime of data
107928 + stored in them, making it less likely that sensitive information such
107929 + as passwords, cryptographic secrets, etc stay in memory for too long.
107930 +
107931 + This is especially useful for programs whose runtime is short, long
107932 + lived processes and the kernel itself benefit from this as long as
107933 + they ensure timely freeing of memory that may hold sensitive
107934 + information.
107935 +
107936 + A nice side effect of the sanitization of slab objects is the
107937 + reduction of possible info leaks caused by padding bytes within the
107938 + leaky structures. Use-after-free bugs for structures containing
107939 + pointers can also be detected as dereferencing the sanitized pointer
107940 + will generate an access violation.
107941 +
107942 + The tradeoff is performance impact, on a single CPU system kernel
107943 + compilation sees a 3% slowdown, other systems and workloads may vary
107944 + and you are advised to test this feature on your expected workload
107945 + before deploying it.
107946 +
107947 + The slab sanitization feature excludes a few slab caches per default
107948 + for performance reasons. To extend the feature to cover those as
107949 + well, pass "pax_sanitize_slab=full" as kernel command line parameter.
107950 +
107951 + To reduce the performance penalty by sanitizing pages only, albeit
107952 + limiting the effectiveness of this feature at the same time, slab
107953 + sanitization can be disabled with the kernel command line parameter
107954 + "pax_sanitize_slab=off".
107955 +
107956 + Note that this feature does not protect data stored in live pages,
107957 + e.g., process memory swapped to disk may stay there for a long time.
107958 +
107959 +config PAX_MEMORY_STACKLEAK
107960 + bool "Sanitize kernel stack"
107961 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
107962 + depends on X86
107963 + help
107964 + By saying Y here the kernel will erase the kernel stack before it
107965 + returns from a system call. This in turn reduces the information
107966 + that a kernel stack leak bug can reveal.
107967 +
107968 + Note that such a bug can still leak information that was put on
107969 + the stack by the current system call (the one eventually triggering
107970 + the bug) but traces of earlier system calls on the kernel stack
107971 + cannot leak anymore.
107972 +
107973 + The tradeoff is performance impact: on a single CPU system kernel
107974 + compilation sees a 1% slowdown, other systems and workloads may vary
107975 + and you are advised to test this feature on your expected workload
107976 + before deploying it.
107977 +
107978 + Note that the full feature requires a gcc with plugin support,
107979 + i.e., gcc 4.5 or newer. You may need to install the supporting
107980 + headers explicitly in addition to the normal gcc package. Using
107981 + older gcc versions means that functions with large enough stack
107982 + frames may leave uninitialized memory behind that may be exposed
107983 + to a later syscall leaking the stack.
107984 +
107985 +config PAX_MEMORY_STRUCTLEAK
107986 + bool "Forcibly initialize local variables copied to userland"
107987 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
107988 + help
107989 + By saying Y here the kernel will zero initialize some local
107990 + variables that are going to be copied to userland. This in
107991 + turn prevents unintended information leakage from the kernel
107992 + stack should later code forget to explicitly set all parts of
107993 + the copied variable.
107994 +
107995 + The tradeoff is less performance impact than PAX_MEMORY_STACKLEAK
107996 + at a much smaller coverage.
107997 +
107998 + Note that the implementation requires a gcc with plugin support,
107999 + i.e., gcc 4.5 or newer. You may need to install the supporting
108000 + headers explicitly in addition to the normal gcc package.
108001 +
108002 +config PAX_MEMORY_UDEREF
108003 + bool "Prevent invalid userland pointer dereference"
108004 + default y if GRKERNSEC_CONFIG_AUTO && !(X86_64 && GRKERNSEC_CONFIG_PRIORITY_PERF) && (!X86 || GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
108005 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !ARM_LPAE)) && !UML_X86 && !XEN
108006 + select PAX_PER_CPU_PGD if X86_64
108007 + help
108008 + By saying Y here the kernel will be prevented from dereferencing
108009 + userland pointers in contexts where the kernel expects only kernel
108010 + pointers. This is both a useful runtime debugging feature and a
108011 + security measure that prevents exploiting a class of kernel bugs.
108012 +
108013 + The tradeoff is that some virtualization solutions may experience
108014 + a huge slowdown and therefore you should not enable this feature
108015 + for kernels meant to run in such environments. Whether a given VM
108016 + solution is affected or not is best determined by simply trying it
108017 + out, the performance impact will be obvious right on boot as this
108018 + mechanism engages from very early on. A good rule of thumb is that
108019 + VMs running on CPUs without hardware virtualization support (i.e.,
108020 + the majority of IA-32 CPUs) will likely experience the slowdown.
108021 +
108022 + On X86_64 the kernel will make use of PCID support when available
108023 + (Intel's Westmere, Sandy Bridge, etc) for better security (default)
108024 + or performance impact. Pass pax_weakuderef on the kernel command
108025 + line to choose the latter.
108026 +
108027 +config PAX_REFCOUNT
108028 + bool "Prevent various kernel object reference counter overflows"
108029 + default y if GRKERNSEC_CONFIG_AUTO
108030 + depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || PPC || SPARC64 || X86)
108031 + help
108032 + By saying Y here the kernel will detect and prevent overflowing
108033 + various (but not all) kinds of object reference counters. Such
108034 + overflows can normally occur due to bugs only and are often, if
108035 + not always, exploitable.
108036 +
108037 + The tradeoff is that data structures protected by an overflowed
108038 + refcount will never be freed and therefore will leak memory. Note
108039 + that this leak also happens even without this protection but in
108040 + that case the overflow can eventually trigger the freeing of the
108041 + data structure while it is still being used elsewhere, resulting
108042 + in the exploitable situation that this feature prevents.
108043 +
108044 + Since this has a negligible performance impact, you should enable
108045 + this feature.
108046 +
108047 +config PAX_CONSTIFY_PLUGIN
108048 + bool "Automatically constify eligible structures"
108049 + default y
108050 + depends on !UML && PAX_KERNEXEC
108051 + help
108052 + By saying Y here the compiler will automatically constify a class
108053 + of types that contain only function pointers. This reduces the
108054 + kernel's attack surface and also produces a better memory layout.
108055 +
108056 + Note that the implementation requires a gcc with plugin support,
108057 + i.e., gcc 4.5 or newer. You may need to install the supporting
108058 + headers explicitly in addition to the normal gcc package.
108059 +
108060 + Note that if some code really has to modify constified variables
108061 + then the source code will have to be patched to allow it. Examples
108062 + can be found in PaX itself (the no_const attribute) and for some
108063 + out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
108064 +
108065 +config PAX_USERCOPY
108066 + bool "Harden heap object copies between kernel and userland"
108067 + default y if GRKERNSEC_CONFIG_AUTO
108068 + depends on ARM || IA64 || PPC || SPARC || X86
108069 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
108070 + select PAX_USERCOPY_SLABS
108071 + help
108072 + By saying Y here the kernel will enforce the size of heap objects
108073 + when they are copied in either direction between the kernel and
108074 + userland, even if only a part of the heap object is copied.
108075 +
108076 + Specifically, this checking prevents information leaking from the
108077 + kernel heap during kernel to userland copies (if the kernel heap
108078 + object is otherwise fully initialized) and prevents kernel heap
108079 + overflows during userland to kernel copies.
108080 +
108081 + Note that the current implementation provides the strictest bounds
108082 + checks for the SLUB allocator.
108083 +
108084 + Enabling this option also enables per-slab cache protection against
108085 + data in a given cache being copied into/out of via userland
108086 + accessors. Though the whitelist of regions will be reduced over
108087 + time, it notably protects important data structures like task structs.
108088 +
108089 + If frame pointers are enabled on x86, this option will also restrict
108090 + copies into and out of the kernel stack to local variables within a
108091 + single frame.
108092 +
108093 + Since this has a negligible performance impact, you should enable
108094 + this feature.
108095 +
108096 +config PAX_USERCOPY_DEBUG
108097 + bool
108098 + depends on X86 && PAX_USERCOPY
108099 + default n
108100 +
108101 +config PAX_SIZE_OVERFLOW
108102 + bool "Prevent various integer overflows in function size parameters"
108103 + default y if GRKERNSEC_CONFIG_AUTO
108104 + depends on X86
108105 + help
108106 + By saying Y here the kernel recomputes expressions of function
108107 + arguments marked by a size_overflow attribute with double integer
108108 + precision (DImode/TImode for 32/64 bit integer types).
108109 +
108110 + The recomputed argument is checked against TYPE_MAX and an event
108111 + is logged on overflow and the triggering process is killed.
108112 +
108113 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
108114 +
108115 + Note that the implementation requires a gcc with plugin support,
108116 + i.e., gcc 4.5 or newer. You may need to install the supporting
108117 + headers explicitly in addition to the normal gcc package.
108118 +
108119 +config PAX_LATENT_ENTROPY
108120 + bool "Generate some entropy during boot and runtime"
108121 + default y if GRKERNSEC_CONFIG_AUTO
108122 + help
108123 + By saying Y here the kernel will instrument some kernel code to
108124 + extract some entropy from both original and artificially created
108125 + program state. This will help especially embedded systems where
108126 + there is little 'natural' source of entropy normally. The cost
108127 + is some slowdown of the boot process and fork and irq processing.
108128 +
108129 + When pax_extra_latent_entropy is passed on the kernel command line,
108130 + entropy will be extracted from up to the first 4GB of RAM while the
108131 + runtime memory allocator is being initialized. This costs even more
108132 + slowdown of the boot process.
108133 +
108134 + Note that the implementation requires a gcc with plugin support,
108135 + i.e., gcc 4.5 or newer. You may need to install the supporting
108136 + headers explicitly in addition to the normal gcc package.
108137 +
108138 + Note that entropy extracted this way is not cryptographically
108139 + secure!
108140 +
108141 +endmenu
108142 +
108143 +endmenu
108144 +
108145 +source grsecurity/Kconfig
108146 +
108147 +endmenu
108148 +
108149 +endmenu
108150 +
108151 source security/keys/Kconfig
108152
108153 config SECURITY_DMESG_RESTRICT
108154 @@ -103,7 +1071,7 @@ config INTEL_TXT
108155 config LSM_MMAP_MIN_ADDR
108156 int "Low address space for LSM to protect from user allocation"
108157 depends on SECURITY && SECURITY_SELINUX
108158 - default 32768 if ARM || (ARM64 && COMPAT)
108159 + default 32768 if ALPHA || ARM || (ARM64 && COMPAT) || PARISC || SPARC32
108160 default 65536
108161 help
108162 This is the portion of low virtual memory which should be protected
108163 diff --git a/security/apparmor/file.c b/security/apparmor/file.c
108164 index fdaa50c..2761dcb 100644
108165 --- a/security/apparmor/file.c
108166 +++ b/security/apparmor/file.c
108167 @@ -348,8 +348,8 @@ static inline bool xindex_is_subset(u32 link, u32 target)
108168 int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
108169 struct path *new_dir, struct dentry *new_dentry)
108170 {
108171 - struct path link = { new_dir->mnt, new_dentry };
108172 - struct path target = { new_dir->mnt, old_dentry };
108173 + struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry };
108174 + struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry };
108175 struct path_cond cond = {
108176 old_dentry->d_inode->i_uid,
108177 old_dentry->d_inode->i_mode
108178 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
108179 index 65ca451..ad6f22d 100644
108180 --- a/security/apparmor/lsm.c
108181 +++ b/security/apparmor/lsm.c
108182 @@ -186,7 +186,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
108183 struct dentry *dentry, u32 mask,
108184 struct path_cond *cond)
108185 {
108186 - struct path path = { dir->mnt, dentry };
108187 + struct path path = { .mnt = dir->mnt, .dentry = dentry };
108188
108189 return common_perm(op, &path, mask, cond);
108190 }
108191 @@ -203,7 +203,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
108192 static int common_perm_mnt_dentry(int op, struct vfsmount *mnt,
108193 struct dentry *dentry, u32 mask)
108194 {
108195 - struct path path = { mnt, dentry };
108196 + struct path path = { .mnt = mnt, .dentry = dentry };
108197 struct path_cond cond = { dentry->d_inode->i_uid,
108198 dentry->d_inode->i_mode
108199 };
108200 @@ -325,8 +325,8 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
108201
108202 profile = aa_current_profile();
108203 if (!unconfined(profile)) {
108204 - struct path old_path = { old_dir->mnt, old_dentry };
108205 - struct path new_path = { new_dir->mnt, new_dentry };
108206 + struct path old_path = { .mnt = old_dir->mnt, .dentry = old_dentry };
108207 + struct path new_path = { .mnt = new_dir->mnt, .dentry = new_dentry };
108208 struct path_cond cond = { old_dentry->d_inode->i_uid,
108209 old_dentry->d_inode->i_mode
108210 };
108211 @@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
108212 return error;
108213 }
108214
108215 -static struct security_operations apparmor_ops = {
108216 +static struct security_operations apparmor_ops __read_only = {
108217 .name = "apparmor",
108218
108219 .ptrace_access_check = apparmor_ptrace_access_check,
108220 diff --git a/security/commoncap.c b/security/commoncap.c
108221 index bab0611..f9a0ff5 100644
108222 --- a/security/commoncap.c
108223 +++ b/security/commoncap.c
108224 @@ -427,6 +427,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
108225 return 0;
108226 }
108227
108228 +/* returns:
108229 + 1 for suid privilege
108230 + 2 for sgid privilege
108231 + 3 for fscap privilege
108232 +*/
108233 +int is_privileged_binary(const struct dentry *dentry)
108234 +{
108235 + struct cpu_vfs_cap_data capdata;
108236 + struct inode *inode = dentry->d_inode;
108237 +
108238 + if (!inode || S_ISDIR(inode->i_mode))
108239 + return 0;
108240 +
108241 + if (inode->i_mode & S_ISUID)
108242 + return 1;
108243 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
108244 + return 2;
108245 +
108246 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
108247 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
108248 + return 3;
108249 + }
108250 +
108251 + return 0;
108252 +}
108253 +
108254 /*
108255 * Attempt to get the on-exec apply capability sets for an executable file from
108256 * its xattrs and, if present, apply them to the proposed credentials being
108257 @@ -595,6 +621,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
108258 const struct cred *cred = current_cred();
108259 kuid_t root_uid = make_kuid(cred->user_ns, 0);
108260
108261 + if (gr_acl_enable_at_secure())
108262 + return 1;
108263 +
108264 if (!uid_eq(cred->uid, root_uid)) {
108265 if (bprm->cap_effective)
108266 return 1;
108267 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
108268 index 8ee997d..24c174b 100644
108269 --- a/security/integrity/ima/ima.h
108270 +++ b/security/integrity/ima/ima.h
108271 @@ -116,8 +116,8 @@ int ima_init_template(void);
108272 extern spinlock_t ima_queue_lock;
108273
108274 struct ima_h_table {
108275 - atomic_long_t len; /* number of stored measurements in the list */
108276 - atomic_long_t violations;
108277 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
108278 + atomic_long_unchecked_t violations;
108279 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
108280 };
108281 extern struct ima_h_table ima_htable;
108282 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
108283 index 8688597..9fa80d2 100644
108284 --- a/security/integrity/ima/ima_api.c
108285 +++ b/security/integrity/ima/ima_api.c
108286 @@ -137,7 +137,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
108287 int result;
108288
108289 /* can overflow, only indicator */
108290 - atomic_long_inc(&ima_htable.violations);
108291 + atomic_long_inc_unchecked(&ima_htable.violations);
108292
108293 result = ima_alloc_init_template(NULL, file, filename,
108294 NULL, 0, &entry);
108295 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
108296 index da92fcc..8a5d390 100644
108297 --- a/security/integrity/ima/ima_fs.c
108298 +++ b/security/integrity/ima/ima_fs.c
108299 @@ -28,12 +28,12 @@
108300 static int valid_policy = 1;
108301 #define TMPBUFLEN 12
108302 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
108303 - loff_t *ppos, atomic_long_t *val)
108304 + loff_t *ppos, atomic_long_unchecked_t *val)
108305 {
108306 char tmpbuf[TMPBUFLEN];
108307 ssize_t len;
108308
108309 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
108310 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
108311 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
108312 }
108313
108314 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
108315 index 552705d..9920f4fb 100644
108316 --- a/security/integrity/ima/ima_queue.c
108317 +++ b/security/integrity/ima/ima_queue.c
108318 @@ -83,7 +83,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
108319 INIT_LIST_HEAD(&qe->later);
108320 list_add_tail_rcu(&qe->later, &ima_measurements);
108321
108322 - atomic_long_inc(&ima_htable.len);
108323 + atomic_long_inc_unchecked(&ima_htable.len);
108324 key = ima_hash_key(entry->digest);
108325 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
108326 return 0;
108327 diff --git a/security/keys/compat.c b/security/keys/compat.c
108328 index 3478965..ec7bb9e 100644
108329 --- a/security/keys/compat.c
108330 +++ b/security/keys/compat.c
108331 @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
108332 if (ret == 0)
108333 goto no_payload_free;
108334
108335 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
108336 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
108337 err:
108338 if (iov != iovstack)
108339 kfree(iov);
108340 diff --git a/security/keys/internal.h b/security/keys/internal.h
108341 index 200e378..cdc74b5 100644
108342 --- a/security/keys/internal.h
108343 +++ b/security/keys/internal.h
108344 @@ -244,7 +244,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
108345 extern long keyctl_invalidate_key(key_serial_t);
108346
108347 extern long keyctl_instantiate_key_common(key_serial_t,
108348 - const struct iovec *,
108349 + const struct iovec __user *,
108350 unsigned, size_t, key_serial_t);
108351 #ifdef CONFIG_PERSISTENT_KEYRINGS
108352 extern long keyctl_get_persistent(uid_t, key_serial_t);
108353 diff --git a/security/keys/key.c b/security/keys/key.c
108354 index e17ba6a..2cc04a6 100644
108355 --- a/security/keys/key.c
108356 +++ b/security/keys/key.c
108357 @@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
108358
108359 atomic_set(&key->usage, 1);
108360 init_rwsem(&key->sem);
108361 - lockdep_set_class(&key->sem, &type->lock_class);
108362 + lockdep_set_class(&key->sem, (struct lock_class_key *)&type->lock_class);
108363 key->index_key.type = type;
108364 key->user = user;
108365 key->quotalen = quotalen;
108366 @@ -1075,7 +1075,9 @@ int register_key_type(struct key_type *ktype)
108367 struct key_type *p;
108368 int ret;
108369
108370 - memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
108371 + pax_open_kernel();
108372 + memset((void *)&ktype->lock_class, 0, sizeof(ktype->lock_class));
108373 + pax_close_kernel();
108374
108375 ret = -EEXIST;
108376 down_write(&key_types_sem);
108377 @@ -1087,7 +1089,7 @@ int register_key_type(struct key_type *ktype)
108378 }
108379
108380 /* store the type */
108381 - list_add(&ktype->link, &key_types_list);
108382 + pax_list_add((struct list_head *)&ktype->link, &key_types_list);
108383
108384 pr_notice("Key type %s registered\n", ktype->name);
108385 ret = 0;
108386 @@ -1109,7 +1111,7 @@ EXPORT_SYMBOL(register_key_type);
108387 void unregister_key_type(struct key_type *ktype)
108388 {
108389 down_write(&key_types_sem);
108390 - list_del_init(&ktype->link);
108391 + pax_list_del_init((struct list_head *)&ktype->link);
108392 downgrade_write(&key_types_sem);
108393 key_gc_keytype(ktype);
108394 pr_notice("Key type %s unregistered\n", ktype->name);
108395 @@ -1127,10 +1129,10 @@ void __init key_init(void)
108396 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
108397
108398 /* add the special key types */
108399 - list_add_tail(&key_type_keyring.link, &key_types_list);
108400 - list_add_tail(&key_type_dead.link, &key_types_list);
108401 - list_add_tail(&key_type_user.link, &key_types_list);
108402 - list_add_tail(&key_type_logon.link, &key_types_list);
108403 + pax_list_add_tail((struct list_head *)&key_type_keyring.link, &key_types_list);
108404 + pax_list_add_tail((struct list_head *)&key_type_dead.link, &key_types_list);
108405 + pax_list_add_tail((struct list_head *)&key_type_user.link, &key_types_list);
108406 + pax_list_add_tail((struct list_head *)&key_type_logon.link, &key_types_list);
108407
108408 /* record the root user tracking */
108409 rb_link_node(&root_key_user.node,
108410 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
108411 index 4743d71..170a185 100644
108412 --- a/security/keys/keyctl.c
108413 +++ b/security/keys/keyctl.c
108414 @@ -1000,7 +1000,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
108415 /*
108416 * Copy the iovec data from userspace
108417 */
108418 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
108419 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
108420 unsigned ioc)
108421 {
108422 for (; ioc > 0; ioc--) {
108423 @@ -1022,7 +1022,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
108424 * If successful, 0 will be returned.
108425 */
108426 long keyctl_instantiate_key_common(key_serial_t id,
108427 - const struct iovec *payload_iov,
108428 + const struct iovec __user *payload_iov,
108429 unsigned ioc,
108430 size_t plen,
108431 key_serial_t ringid)
108432 @@ -1117,7 +1117,7 @@ long keyctl_instantiate_key(key_serial_t id,
108433 [0].iov_len = plen
108434 };
108435
108436 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
108437 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
108438 }
108439
108440 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
108441 @@ -1150,7 +1150,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
108442 if (ret == 0)
108443 goto no_payload_free;
108444
108445 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
108446 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
108447 err:
108448 if (iov != iovstack)
108449 kfree(iov);
108450 diff --git a/security/min_addr.c b/security/min_addr.c
108451 index f728728..6457a0c 100644
108452 --- a/security/min_addr.c
108453 +++ b/security/min_addr.c
108454 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
108455 */
108456 static void update_mmap_min_addr(void)
108457 {
108458 +#ifndef SPARC
108459 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
108460 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
108461 mmap_min_addr = dac_mmap_min_addr;
108462 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
108463 #else
108464 mmap_min_addr = dac_mmap_min_addr;
108465 #endif
108466 +#endif
108467 }
108468
108469 /*
108470 diff --git a/security/security.c b/security/security.c
108471 index 18b35c6..c9fbc92 100644
108472 --- a/security/security.c
108473 +++ b/security/security.c
108474 @@ -33,8 +33,8 @@
108475 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
108476 CONFIG_DEFAULT_SECURITY;
108477
108478 -static struct security_operations *security_ops;
108479 -static struct security_operations default_security_ops = {
108480 +struct security_operations *security_ops __read_only;
108481 +struct security_operations default_security_ops __read_only = {
108482 .name = "default",
108483 };
108484
108485 @@ -73,11 +73,6 @@ int __init security_init(void)
108486 return 0;
108487 }
108488
108489 -void reset_security_ops(void)
108490 -{
108491 - security_ops = &default_security_ops;
108492 -}
108493 -
108494 /* Save user chosen LSM */
108495 static int __init choose_lsm(char *str)
108496 {
108497 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
108498 index a18f1fa..c9b9fc4 100644
108499 --- a/security/selinux/avc.c
108500 +++ b/security/selinux/avc.c
108501 @@ -59,7 +59,7 @@ struct avc_node {
108502 struct avc_cache {
108503 struct hlist_head slots[AVC_CACHE_SLOTS]; /* head for avc_node->list */
108504 spinlock_t slots_lock[AVC_CACHE_SLOTS]; /* lock for writes */
108505 - atomic_t lru_hint; /* LRU hint for reclaim scan */
108506 + atomic_unchecked_t lru_hint; /* LRU hint for reclaim scan */
108507 atomic_t active_nodes;
108508 u32 latest_notif; /* latest revocation notification */
108509 };
108510 @@ -167,7 +167,7 @@ void __init avc_init(void)
108511 spin_lock_init(&avc_cache.slots_lock[i]);
108512 }
108513 atomic_set(&avc_cache.active_nodes, 0);
108514 - atomic_set(&avc_cache.lru_hint, 0);
108515 + atomic_set_unchecked(&avc_cache.lru_hint, 0);
108516
108517 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
108518 0, SLAB_PANIC, NULL);
108519 @@ -242,7 +242,7 @@ static inline int avc_reclaim_node(void)
108520 spinlock_t *lock;
108521
108522 for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
108523 - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
108524 + hvalue = atomic_inc_return_unchecked(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
108525 head = &avc_cache.slots[hvalue];
108526 lock = &avc_cache.slots_lock[hvalue];
108527
108528 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
108529 index c603b20..8716ec9 100644
108530 --- a/security/selinux/hooks.c
108531 +++ b/security/selinux/hooks.c
108532 @@ -95,8 +95,6 @@
108533 #include "audit.h"
108534 #include "avc_ss.h"
108535
108536 -extern struct security_operations *security_ops;
108537 -
108538 /* SECMARK reference count */
108539 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
108540
108541 @@ -5809,7 +5807,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
108542
108543 #endif
108544
108545 -static struct security_operations selinux_ops = {
108546 +static struct security_operations selinux_ops __read_only = {
108547 .name = "selinux",
108548
108549 .ptrace_access_check = selinux_ptrace_access_check,
108550 @@ -6150,6 +6148,9 @@ static void selinux_nf_ip_exit(void)
108551 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
108552 static int selinux_disabled;
108553
108554 +extern struct security_operations *security_ops;
108555 +extern struct security_operations default_security_ops;
108556 +
108557 int selinux_disable(void)
108558 {
108559 if (ss_initialized) {
108560 @@ -6167,7 +6168,9 @@ int selinux_disable(void)
108561 selinux_disabled = 1;
108562 selinux_enabled = 0;
108563
108564 - reset_security_ops();
108565 + pax_open_kernel();
108566 + security_ops = &default_security_ops;
108567 + pax_close_kernel();
108568
108569 /* Try to destroy the avc node cache */
108570 avc_disable();
108571 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
108572 index 1450f85..a91e0bc 100644
108573 --- a/security/selinux/include/xfrm.h
108574 +++ b/security/selinux/include/xfrm.h
108575 @@ -48,7 +48,7 @@ static inline void selinux_xfrm_notify_policyload(void)
108576
108577 rtnl_lock();
108578 for_each_net(net) {
108579 - atomic_inc(&net->xfrm.flow_cache_genid);
108580 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
108581 rt_genid_bump_all(net);
108582 }
108583 rtnl_unlock();
108584 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
108585 index d515ec2..8a4ca71 100644
108586 --- a/security/smack/smack_lsm.c
108587 +++ b/security/smack/smack_lsm.c
108588 @@ -4079,7 +4079,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
108589 return 0;
108590 }
108591
108592 -struct security_operations smack_ops = {
108593 +struct security_operations smack_ops __read_only = {
108594 .name = "smack",
108595
108596 .ptrace_access_check = smack_ptrace_access_check,
108597 diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
108598 index 4003907..13a2b55 100644
108599 --- a/security/tomoyo/file.c
108600 +++ b/security/tomoyo/file.c
108601 @@ -692,7 +692,7 @@ int tomoyo_path_number_perm(const u8 type, struct path *path,
108602 {
108603 struct tomoyo_request_info r;
108604 struct tomoyo_obj_info obj = {
108605 - .path1 = *path,
108606 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108607 };
108608 int error = -ENOMEM;
108609 struct tomoyo_path_info buf;
108610 @@ -740,7 +740,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
108611 struct tomoyo_path_info buf;
108612 struct tomoyo_request_info r;
108613 struct tomoyo_obj_info obj = {
108614 - .path1 = *path,
108615 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108616 };
108617 int idx;
108618
108619 @@ -786,7 +786,7 @@ int tomoyo_path_perm(const u8 operation, struct path *path, const char *target)
108620 {
108621 struct tomoyo_request_info r;
108622 struct tomoyo_obj_info obj = {
108623 - .path1 = *path,
108624 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108625 };
108626 int error;
108627 struct tomoyo_path_info buf;
108628 @@ -843,7 +843,7 @@ int tomoyo_mkdev_perm(const u8 operation, struct path *path,
108629 {
108630 struct tomoyo_request_info r;
108631 struct tomoyo_obj_info obj = {
108632 - .path1 = *path,
108633 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108634 };
108635 int error = -ENOMEM;
108636 struct tomoyo_path_info buf;
108637 @@ -890,8 +890,8 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
108638 struct tomoyo_path_info buf2;
108639 struct tomoyo_request_info r;
108640 struct tomoyo_obj_info obj = {
108641 - .path1 = *path1,
108642 - .path2 = *path2,
108643 + .path1 = { .mnt = path1->mnt, .dentry = path1->dentry },
108644 + .path2 = { .mnt = path2->mnt, .dentry = path2->dentry }
108645 };
108646 int idx;
108647
108648 diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
108649 index 390c646..f2f8db3 100644
108650 --- a/security/tomoyo/mount.c
108651 +++ b/security/tomoyo/mount.c
108652 @@ -118,6 +118,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
108653 type == tomoyo_mounts[TOMOYO_MOUNT_MOVE]) {
108654 need_dev = -1; /* dev_name is a directory */
108655 } else {
108656 + if (!capable(CAP_SYS_ADMIN)) {
108657 + error = -EPERM;
108658 + goto out;
108659 + }
108660 fstype = get_fs_type(type);
108661 if (!fstype) {
108662 error = -ENODEV;
108663 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
108664 index f0b756e..8aa497b 100644
108665 --- a/security/tomoyo/tomoyo.c
108666 +++ b/security/tomoyo/tomoyo.c
108667 @@ -146,7 +146,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm)
108668 */
108669 static int tomoyo_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
108670 {
108671 - struct path path = { mnt, dentry };
108672 + struct path path = { .mnt = mnt, .dentry = dentry };
108673 return tomoyo_path_perm(TOMOYO_TYPE_GETATTR, &path, NULL);
108674 }
108675
108676 @@ -172,7 +172,7 @@ static int tomoyo_path_truncate(struct path *path)
108677 */
108678 static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
108679 {
108680 - struct path path = { parent->mnt, dentry };
108681 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108682 return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL);
108683 }
108684
108685 @@ -188,7 +188,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
108686 static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
108687 umode_t mode)
108688 {
108689 - struct path path = { parent->mnt, dentry };
108690 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108691 return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,
108692 mode & S_IALLUGO);
108693 }
108694 @@ -203,7 +203,7 @@ static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
108695 */
108696 static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
108697 {
108698 - struct path path = { parent->mnt, dentry };
108699 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108700 return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);
108701 }
108702
108703 @@ -219,7 +219,7 @@ static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
108704 static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
108705 const char *old_name)
108706 {
108707 - struct path path = { parent->mnt, dentry };
108708 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108709 return tomoyo_path_perm(TOMOYO_TYPE_SYMLINK, &path, old_name);
108710 }
108711
108712 @@ -236,7 +236,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
108713 static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
108714 umode_t mode, unsigned int dev)
108715 {
108716 - struct path path = { parent->mnt, dentry };
108717 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108718 int type = TOMOYO_TYPE_CREATE;
108719 const unsigned int perm = mode & S_IALLUGO;
108720
108721 @@ -275,8 +275,8 @@ static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
108722 static int tomoyo_path_link(struct dentry *old_dentry, struct path *new_dir,
108723 struct dentry *new_dentry)
108724 {
108725 - struct path path1 = { new_dir->mnt, old_dentry };
108726 - struct path path2 = { new_dir->mnt, new_dentry };
108727 + struct path path1 = { .mnt = new_dir->mnt, .dentry = old_dentry };
108728 + struct path path2 = { .mnt = new_dir->mnt, .dentry = new_dentry };
108729 return tomoyo_path2_perm(TOMOYO_TYPE_LINK, &path1, &path2);
108730 }
108731
108732 @@ -295,8 +295,8 @@ static int tomoyo_path_rename(struct path *old_parent,
108733 struct path *new_parent,
108734 struct dentry *new_dentry)
108735 {
108736 - struct path path1 = { old_parent->mnt, old_dentry };
108737 - struct path path2 = { new_parent->mnt, new_dentry };
108738 + struct path path1 = { .mnt = old_parent->mnt, .dentry = old_dentry };
108739 + struct path path2 = { .mnt = new_parent->mnt, .dentry = new_dentry };
108740 return tomoyo_path2_perm(TOMOYO_TYPE_RENAME, &path1, &path2);
108741 }
108742
108743 @@ -424,7 +424,7 @@ static int tomoyo_sb_mount(const char *dev_name, struct path *path,
108744 */
108745 static int tomoyo_sb_umount(struct vfsmount *mnt, int flags)
108746 {
108747 - struct path path = { mnt, mnt->mnt_root };
108748 + struct path path = { .mnt = mnt, .dentry = mnt->mnt_root };
108749 return tomoyo_path_perm(TOMOYO_TYPE_UMOUNT, &path, NULL);
108750 }
108751
108752 @@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
108753 * tomoyo_security_ops is a "struct security_operations" which is used for
108754 * registering TOMOYO.
108755 */
108756 -static struct security_operations tomoyo_security_ops = {
108757 +static struct security_operations tomoyo_security_ops __read_only = {
108758 .name = "tomoyo",
108759 .cred_alloc_blank = tomoyo_cred_alloc_blank,
108760 .cred_prepare = tomoyo_cred_prepare,
108761 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
108762 index 20ef514..4182bed 100644
108763 --- a/security/yama/Kconfig
108764 +++ b/security/yama/Kconfig
108765 @@ -1,6 +1,6 @@
108766 config SECURITY_YAMA
108767 bool "Yama support"
108768 - depends on SECURITY
108769 + depends on SECURITY && !GRKERNSEC
108770 select SECURITYFS
108771 select SECURITY_PATH
108772 default n
108773 diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
108774 index 13c88fbc..f8c115e 100644
108775 --- a/security/yama/yama_lsm.c
108776 +++ b/security/yama/yama_lsm.c
108777 @@ -365,7 +365,7 @@ int yama_ptrace_traceme(struct task_struct *parent)
108778 }
108779
108780 #ifndef CONFIG_SECURITY_YAMA_STACKED
108781 -static struct security_operations yama_ops = {
108782 +static struct security_operations yama_ops __read_only = {
108783 .name = "yama",
108784
108785 .ptrace_access_check = yama_ptrace_access_check,
108786 @@ -376,28 +376,24 @@ static struct security_operations yama_ops = {
108787 #endif
108788
108789 #ifdef CONFIG_SYSCTL
108790 +static int zero __read_only;
108791 +static int max_scope __read_only = YAMA_SCOPE_NO_ATTACH;
108792 +
108793 static int yama_dointvec_minmax(struct ctl_table *table, int write,
108794 void __user *buffer, size_t *lenp, loff_t *ppos)
108795 {
108796 - int rc;
108797 + ctl_table_no_const yama_table;
108798
108799 if (write && !capable(CAP_SYS_PTRACE))
108800 return -EPERM;
108801
108802 - rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108803 - if (rc)
108804 - return rc;
108805 -
108806 + yama_table = *table;
108807 /* Lock the max value if it ever gets set. */
108808 - if (write && *(int *)table->data == *(int *)table->extra2)
108809 - table->extra1 = table->extra2;
108810 -
108811 - return rc;
108812 + if (ptrace_scope == max_scope)
108813 + yama_table.extra1 = &max_scope;
108814 + return proc_dointvec_minmax(&yama_table, write, buffer, lenp, ppos);
108815 }
108816
108817 -static int zero;
108818 -static int max_scope = YAMA_SCOPE_NO_ATTACH;
108819 -
108820 struct ctl_path yama_sysctl_path[] = {
108821 { .procname = "kernel", },
108822 { .procname = "yama", },
108823 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
108824 index 401107b..b9c47c6 100644
108825 --- a/sound/aoa/codecs/onyx.c
108826 +++ b/sound/aoa/codecs/onyx.c
108827 @@ -54,7 +54,7 @@ struct onyx {
108828 spdif_locked:1,
108829 analog_locked:1,
108830 original_mute:2;
108831 - int open_count;
108832 + local_t open_count;
108833 struct codec_info *codec_info;
108834
108835 /* mutex serializes concurrent access to the device
108836 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
108837 struct onyx *onyx = cii->codec_data;
108838
108839 mutex_lock(&onyx->mutex);
108840 - onyx->open_count++;
108841 + local_inc(&onyx->open_count);
108842 mutex_unlock(&onyx->mutex);
108843
108844 return 0;
108845 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
108846 struct onyx *onyx = cii->codec_data;
108847
108848 mutex_lock(&onyx->mutex);
108849 - onyx->open_count--;
108850 - if (!onyx->open_count)
108851 + if (local_dec_and_test(&onyx->open_count))
108852 onyx->spdif_locked = onyx->analog_locked = 0;
108853 mutex_unlock(&onyx->mutex);
108854
108855 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
108856 index ffd2025..df062c9 100644
108857 --- a/sound/aoa/codecs/onyx.h
108858 +++ b/sound/aoa/codecs/onyx.h
108859 @@ -11,6 +11,7 @@
108860 #include <linux/i2c.h>
108861 #include <asm/pmac_low_i2c.h>
108862 #include <asm/prom.h>
108863 +#include <asm/local.h>
108864
108865 /* PCM3052 register definitions */
108866
108867 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
108868 index ada69d7..5f65386 100644
108869 --- a/sound/core/oss/pcm_oss.c
108870 +++ b/sound/core/oss/pcm_oss.c
108871 @@ -1190,10 +1190,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
108872 if (in_kernel) {
108873 mm_segment_t fs;
108874 fs = snd_enter_user();
108875 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
108876 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
108877 snd_leave_user(fs);
108878 } else {
108879 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
108880 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
108881 }
108882 if (ret != -EPIPE && ret != -ESTRPIPE)
108883 break;
108884 @@ -1233,10 +1233,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
108885 if (in_kernel) {
108886 mm_segment_t fs;
108887 fs = snd_enter_user();
108888 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
108889 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
108890 snd_leave_user(fs);
108891 } else {
108892 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
108893 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
108894 }
108895 if (ret == -EPIPE) {
108896 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
108897 @@ -1332,7 +1332,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
108898 struct snd_pcm_plugin_channel *channels;
108899 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
108900 if (!in_kernel) {
108901 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
108902 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
108903 return -EFAULT;
108904 buf = runtime->oss.buffer;
108905 }
108906 @@ -1402,7 +1402,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
108907 }
108908 } else {
108909 tmp = snd_pcm_oss_write2(substream,
108910 - (const char __force *)buf,
108911 + (const char __force_kernel *)buf,
108912 runtime->oss.period_bytes, 0);
108913 if (tmp <= 0)
108914 goto err;
108915 @@ -1428,7 +1428,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
108916 struct snd_pcm_runtime *runtime = substream->runtime;
108917 snd_pcm_sframes_t frames, frames1;
108918 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
108919 - char __user *final_dst = (char __force __user *)buf;
108920 + char __user *final_dst = (char __force_user *)buf;
108921 if (runtime->oss.plugin_first) {
108922 struct snd_pcm_plugin_channel *channels;
108923 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
108924 @@ -1490,7 +1490,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
108925 xfer += tmp;
108926 runtime->oss.buffer_used -= tmp;
108927 } else {
108928 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
108929 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
108930 runtime->oss.period_bytes, 0);
108931 if (tmp <= 0)
108932 goto err;
108933 @@ -1659,7 +1659,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
108934 size1);
108935 size1 /= runtime->channels; /* frames */
108936 fs = snd_enter_user();
108937 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
108938 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
108939 snd_leave_user(fs);
108940 }
108941 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
108942 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
108943 index 2d957ba..fda022c 100644
108944 --- a/sound/core/pcm_compat.c
108945 +++ b/sound/core/pcm_compat.c
108946 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
108947 int err;
108948
108949 fs = snd_enter_user();
108950 - err = snd_pcm_delay(substream, &delay);
108951 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
108952 snd_leave_user(fs);
108953 if (err < 0)
108954 return err;
108955 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
108956 index 166d59c..89e3889 100644
108957 --- a/sound/core/pcm_native.c
108958 +++ b/sound/core/pcm_native.c
108959 @@ -2931,11 +2931,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
108960 switch (substream->stream) {
108961 case SNDRV_PCM_STREAM_PLAYBACK:
108962 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
108963 - (void __user *)arg);
108964 + (void __force_user *)arg);
108965 break;
108966 case SNDRV_PCM_STREAM_CAPTURE:
108967 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
108968 - (void __user *)arg);
108969 + (void __force_user *)arg);
108970 break;
108971 default:
108972 result = -EINVAL;
108973 diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
108974 index 16d4267..fe8b49b 100644
108975 --- a/sound/core/seq/oss/seq_oss.c
108976 +++ b/sound/core/seq/oss/seq_oss.c
108977 @@ -69,8 +69,8 @@ static int __init alsa_seq_oss_init(void)
108978 {
108979 int rc;
108980 static struct snd_seq_dev_ops ops = {
108981 - snd_seq_oss_synth_register,
108982 - snd_seq_oss_synth_unregister,
108983 + .init_device = snd_seq_oss_synth_register,
108984 + .free_device = snd_seq_oss_synth_unregister,
108985 };
108986
108987 snd_seq_autoload_lock();
108988 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
108989 index 91a786a..4c07ed4 100644
108990 --- a/sound/core/seq/seq_device.c
108991 +++ b/sound/core/seq/seq_device.c
108992 @@ -64,7 +64,7 @@ struct ops_list {
108993 int argsize; /* argument size */
108994
108995 /* operators */
108996 - struct snd_seq_dev_ops ops;
108997 + struct snd_seq_dev_ops *ops;
108998
108999 /* registered devices */
109000 struct list_head dev_list; /* list of devices */
109001 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
109002
109003 mutex_lock(&ops->reg_mutex);
109004 /* copy driver operators */
109005 - ops->ops = *entry;
109006 + ops->ops = entry;
109007 ops->driver |= DRIVER_LOADED;
109008 ops->argsize = argsize;
109009
109010 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
109011 dev->name, ops->id, ops->argsize, dev->argsize);
109012 return -EINVAL;
109013 }
109014 - if (ops->ops.init_device(dev) >= 0) {
109015 + if (ops->ops->init_device(dev) >= 0) {
109016 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
109017 ops->num_init_devices++;
109018 } else {
109019 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
109020 dev->name, ops->id, ops->argsize, dev->argsize);
109021 return -EINVAL;
109022 }
109023 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
109024 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
109025 dev->status = SNDRV_SEQ_DEVICE_FREE;
109026 dev->driver_data = NULL;
109027 ops->num_init_devices--;
109028 diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
109029 index a1fd77a..69cd659 100644
109030 --- a/sound/core/seq/seq_midi.c
109031 +++ b/sound/core/seq/seq_midi.c
109032 @@ -462,8 +462,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
109033 static int __init alsa_seq_midi_init(void)
109034 {
109035 static struct snd_seq_dev_ops ops = {
109036 - snd_seq_midisynth_register_port,
109037 - snd_seq_midisynth_unregister_port,
109038 + .init_device = snd_seq_midisynth_register_port,
109039 + .free_device = snd_seq_midisynth_unregister_port,
109040 };
109041 memset(&synths, 0, sizeof(synths));
109042 snd_seq_autoload_lock();
109043 diff --git a/sound/core/sound.c b/sound/core/sound.c
109044 index 38ad1a0..5010a40 100644
109045 --- a/sound/core/sound.c
109046 +++ b/sound/core/sound.c
109047 @@ -86,7 +86,7 @@ static void snd_request_other(int minor)
109048 case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
109049 default: return;
109050 }
109051 - request_module(str);
109052 + request_module("%s", str);
109053 }
109054
109055 #endif /* modular kernel */
109056 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
109057 index f5fd448..6ae276da 100644
109058 --- a/sound/drivers/mts64.c
109059 +++ b/sound/drivers/mts64.c
109060 @@ -29,6 +29,7 @@
109061 #include <sound/initval.h>
109062 #include <sound/rawmidi.h>
109063 #include <sound/control.h>
109064 +#include <asm/local.h>
109065
109066 #define CARD_NAME "Miditerminal 4140"
109067 #define DRIVER_NAME "MTS64"
109068 @@ -67,7 +68,7 @@ struct mts64 {
109069 struct pardevice *pardev;
109070 int pardev_claimed;
109071
109072 - int open_count;
109073 + local_t open_count;
109074 int current_midi_output_port;
109075 int current_midi_input_port;
109076 u8 mode[MTS64_NUM_INPUT_PORTS];
109077 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
109078 {
109079 struct mts64 *mts = substream->rmidi->private_data;
109080
109081 - if (mts->open_count == 0) {
109082 + if (local_read(&mts->open_count) == 0) {
109083 /* We don't need a spinlock here, because this is just called
109084 if the device has not been opened before.
109085 So there aren't any IRQs from the device */
109086 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
109087
109088 msleep(50);
109089 }
109090 - ++(mts->open_count);
109091 + local_inc(&mts->open_count);
109092
109093 return 0;
109094 }
109095 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
109096 struct mts64 *mts = substream->rmidi->private_data;
109097 unsigned long flags;
109098
109099 - --(mts->open_count);
109100 - if (mts->open_count == 0) {
109101 + if (local_dec_return(&mts->open_count) == 0) {
109102 /* We need the spinlock_irqsave here because we can still
109103 have IRQs at this point */
109104 spin_lock_irqsave(&mts->lock, flags);
109105 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
109106
109107 msleep(500);
109108
109109 - } else if (mts->open_count < 0)
109110 - mts->open_count = 0;
109111 + } else if (local_read(&mts->open_count) < 0)
109112 + local_set(&mts->open_count, 0);
109113
109114 return 0;
109115 }
109116 diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
109117 index 6839953..7a0f4b9 100644
109118 --- a/sound/drivers/opl3/opl3_seq.c
109119 +++ b/sound/drivers/opl3/opl3_seq.c
109120 @@ -281,8 +281,8 @@ static int __init alsa_opl3_seq_init(void)
109121 {
109122 static struct snd_seq_dev_ops ops =
109123 {
109124 - snd_opl3_seq_new_device,
109125 - snd_opl3_seq_delete_device
109126 + .init_device = snd_opl3_seq_new_device,
109127 + .free_device = snd_opl3_seq_delete_device
109128 };
109129
109130 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops,
109131 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
109132 index b953fb4..1999c01 100644
109133 --- a/sound/drivers/opl4/opl4_lib.c
109134 +++ b/sound/drivers/opl4/opl4_lib.c
109135 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
109136 MODULE_DESCRIPTION("OPL4 driver");
109137 MODULE_LICENSE("GPL");
109138
109139 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
109140 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
109141 {
109142 int timeout = 10;
109143 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
109144 diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
109145 index 9919769..d7de36c 100644
109146 --- a/sound/drivers/opl4/opl4_seq.c
109147 +++ b/sound/drivers/opl4/opl4_seq.c
109148 @@ -198,8 +198,8 @@ static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)
109149 static int __init alsa_opl4_synth_init(void)
109150 {
109151 static struct snd_seq_dev_ops ops = {
109152 - snd_opl4_seq_new_device,
109153 - snd_opl4_seq_delete_device
109154 + .init_device = snd_opl4_seq_new_device,
109155 + .free_device = snd_opl4_seq_delete_device
109156 };
109157
109158 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &ops,
109159 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
109160 index 78ccfa4..7a0857b 100644
109161 --- a/sound/drivers/portman2x4.c
109162 +++ b/sound/drivers/portman2x4.c
109163 @@ -48,6 +48,7 @@
109164 #include <sound/initval.h>
109165 #include <sound/rawmidi.h>
109166 #include <sound/control.h>
109167 +#include <asm/local.h>
109168
109169 #define CARD_NAME "Portman 2x4"
109170 #define DRIVER_NAME "portman"
109171 @@ -85,7 +86,7 @@ struct portman {
109172 struct pardevice *pardev;
109173 int pardev_claimed;
109174
109175 - int open_count;
109176 + local_t open_count;
109177 int mode[PORTMAN_NUM_INPUT_PORTS];
109178 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
109179 };
109180 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
109181 index 95fc2eaf..ea5d6a7 100644
109182 --- a/sound/firewire/amdtp.c
109183 +++ b/sound/firewire/amdtp.c
109184 @@ -521,7 +521,7 @@ static void update_pcm_pointers(struct amdtp_stream *s,
109185 ptr = s->pcm_buffer_pointer + frames;
109186 if (ptr >= pcm->runtime->buffer_size)
109187 ptr -= pcm->runtime->buffer_size;
109188 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
109189 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
109190
109191 s->pcm_period_pointer += frames;
109192 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
109193 @@ -961,7 +961,7 @@ EXPORT_SYMBOL(amdtp_stream_pcm_pointer);
109194 */
109195 void amdtp_stream_update(struct amdtp_stream *s)
109196 {
109197 - ACCESS_ONCE(s->source_node_id_field) =
109198 + ACCESS_ONCE_RW(s->source_node_id_field) =
109199 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
109200 }
109201 EXPORT_SYMBOL(amdtp_stream_update);
109202 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
109203 index 4823c08..47a5f7c 100644
109204 --- a/sound/firewire/amdtp.h
109205 +++ b/sound/firewire/amdtp.h
109206 @@ -212,7 +212,7 @@ static inline bool amdtp_stream_pcm_running(struct amdtp_stream *s)
109207 static inline void amdtp_stream_pcm_trigger(struct amdtp_stream *s,
109208 struct snd_pcm_substream *pcm)
109209 {
109210 - ACCESS_ONCE(s->pcm) = pcm;
109211 + ACCESS_ONCE_RW(s->pcm) = pcm;
109212 }
109213
109214 /**
109215 @@ -230,7 +230,7 @@ static inline void amdtp_stream_midi_trigger(struct amdtp_stream *s,
109216 struct snd_rawmidi_substream *midi)
109217 {
109218 if (port < s->midi_ports)
109219 - ACCESS_ONCE(s->midi[port]) = midi;
109220 + ACCESS_ONCE_RW(s->midi[port]) = midi;
109221 }
109222
109223 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
109224 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
109225 index 7ac9443..0ec6274 100644
109226 --- a/sound/firewire/isight.c
109227 +++ b/sound/firewire/isight.c
109228 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
109229 ptr += count;
109230 if (ptr >= runtime->buffer_size)
109231 ptr -= runtime->buffer_size;
109232 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
109233 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
109234
109235 isight->period_counter += count;
109236 if (isight->period_counter >= runtime->period_size) {
109237 @@ -299,7 +299,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
109238 if (err < 0)
109239 return err;
109240
109241 - ACCESS_ONCE(isight->pcm_active) = true;
109242 + ACCESS_ONCE_RW(isight->pcm_active) = true;
109243
109244 return 0;
109245 }
109246 @@ -337,7 +337,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
109247 {
109248 struct isight *isight = substream->private_data;
109249
109250 - ACCESS_ONCE(isight->pcm_active) = false;
109251 + ACCESS_ONCE_RW(isight->pcm_active) = false;
109252
109253 mutex_lock(&isight->mutex);
109254 isight_stop_streaming(isight);
109255 @@ -430,10 +430,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
109256
109257 switch (cmd) {
109258 case SNDRV_PCM_TRIGGER_START:
109259 - ACCESS_ONCE(isight->pcm_running) = true;
109260 + ACCESS_ONCE_RW(isight->pcm_running) = true;
109261 break;
109262 case SNDRV_PCM_TRIGGER_STOP:
109263 - ACCESS_ONCE(isight->pcm_running) = false;
109264 + ACCESS_ONCE_RW(isight->pcm_running) = false;
109265 break;
109266 default:
109267 return -EINVAL;
109268 diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
109269 index 2dba848..c682aef 100644
109270 --- a/sound/firewire/scs1x.c
109271 +++ b/sound/firewire/scs1x.c
109272 @@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
109273 {
109274 struct scs *scs = stream->rmidi->private_data;
109275
109276 - ACCESS_ONCE(scs->output) = up ? stream : NULL;
109277 + ACCESS_ONCE_RW(scs->output) = up ? stream : NULL;
109278 if (up) {
109279 scs->output_idle = false;
109280 tasklet_schedule(&scs->tasklet);
109281 @@ -257,7 +257,7 @@ static void scs_input_trigger(struct snd_rawmidi_substream *stream, int up)
109282 {
109283 struct scs *scs = stream->rmidi->private_data;
109284
109285 - ACCESS_ONCE(scs->input) = up ? stream : NULL;
109286 + ACCESS_ONCE_RW(scs->input) = up ? stream : NULL;
109287 }
109288
109289 static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
109290 @@ -473,8 +473,8 @@ static void scs_remove(struct fw_unit *unit)
109291
109292 snd_card_disconnect(scs->card);
109293
109294 - ACCESS_ONCE(scs->output) = NULL;
109295 - ACCESS_ONCE(scs->input) = NULL;
109296 + ACCESS_ONCE_RW(scs->output) = NULL;
109297 + ACCESS_ONCE_RW(scs->input) = NULL;
109298
109299 wait_event(scs->idle_wait, scs->output_idle);
109300
109301 diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
109302 index 4e3fcfb..ab45a9d 100644
109303 --- a/sound/isa/sb/emu8000_synth.c
109304 +++ b/sound/isa/sb/emu8000_synth.c
109305 @@ -120,8 +120,8 @@ static int __init alsa_emu8000_init(void)
109306 {
109307
109308 static struct snd_seq_dev_ops ops = {
109309 - snd_emu8000_new_device,
109310 - snd_emu8000_delete_device,
109311 + .init_device = snd_emu8000_new_device,
109312 + .free_device = snd_emu8000_delete_device,
109313 };
109314 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
109315 sizeof(struct snd_emu8000*));
109316 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
109317 index 048439a..3be9f6f 100644
109318 --- a/sound/oss/sb_audio.c
109319 +++ b/sound/oss/sb_audio.c
109320 @@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
109321 buf16 = (signed short *)(localbuf + localoffs);
109322 while (c)
109323 {
109324 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
109325 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
109326 if (copy_from_user(lbuf8,
109327 userbuf+useroffs + p,
109328 locallen))
109329 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
109330 index a33e8ce..2262303 100644
109331 --- a/sound/oss/swarm_cs4297a.c
109332 +++ b/sound/oss/swarm_cs4297a.c
109333 @@ -2623,7 +2623,6 @@ static int __init cs4297a_init(void)
109334 {
109335 struct cs4297a_state *s;
109336 u32 pwr, id;
109337 - mm_segment_t fs;
109338 int rval;
109339 u64 cfg;
109340 int mdio_val;
109341 @@ -2709,22 +2708,23 @@ static int __init cs4297a_init(void)
109342 if (!rval) {
109343 char *sb1250_duart_present;
109344
109345 +#if 0
109346 + mm_segment_t fs;
109347 fs = get_fs();
109348 set_fs(KERNEL_DS);
109349 -#if 0
109350 val = SOUND_MASK_LINE;
109351 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
109352 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
109353 val = initvol[i].vol;
109354 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
109355 }
109356 + set_fs(fs);
109357 // cs4297a_write_ac97(s, 0x18, 0x0808);
109358 #else
109359 // cs4297a_write_ac97(s, 0x5e, 0x180);
109360 cs4297a_write_ac97(s, 0x02, 0x0808);
109361 cs4297a_write_ac97(s, 0x18, 0x0808);
109362 #endif
109363 - set_fs(fs);
109364
109365 list_add(&s->list, &cs4297a_devs);
109366
109367 diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c
109368 index 4c41c90..37f3631 100644
109369 --- a/sound/pci/emu10k1/emu10k1_synth.c
109370 +++ b/sound/pci/emu10k1/emu10k1_synth.c
109371 @@ -108,8 +108,8 @@ static int __init alsa_emu10k1_synth_init(void)
109372 {
109373
109374 static struct snd_seq_dev_ops ops = {
109375 - snd_emu10k1_synth_new_device,
109376 - snd_emu10k1_synth_delete_device,
109377 + .init_device = snd_emu10k1_synth_new_device,
109378 + .free_device = snd_emu10k1_synth_delete_device,
109379 };
109380 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
109381 sizeof(struct snd_emu10k1_synth_arg));
109382 diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
109383 index 15e0089..ad6bc9b 100644
109384 --- a/sound/pci/hda/hda_codec.c
109385 +++ b/sound/pci/hda/hda_codec.c
109386 @@ -966,14 +966,10 @@ find_codec_preset(struct hda_codec *codec)
109387 mutex_unlock(&preset_mutex);
109388
109389 if (mod_requested < HDA_MODREQ_MAX_COUNT) {
109390 - char name[32];
109391 if (!mod_requested)
109392 - snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
109393 - codec->vendor_id);
109394 + request_module("snd-hda-codec-id:%08x", codec->vendor_id);
109395 else
109396 - snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
109397 - (codec->vendor_id >> 16) & 0xffff);
109398 - request_module(name);
109399 + request_module("snd-hda-codec-id:%04x*", (codec->vendor_id >> 16) & 0xffff);
109400 mod_requested++;
109401 goto again;
109402 }
109403 @@ -2800,7 +2796,7 @@ static int get_kctl_0dB_offset(struct hda_codec *codec,
109404 /* FIXME: set_fs() hack for obtaining user-space TLV data */
109405 mm_segment_t fs = get_fs();
109406 set_fs(get_ds());
109407 - if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), _tlv))
109408 + if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), (unsigned int __force_user *)_tlv))
109409 tlv = _tlv;
109410 set_fs(fs);
109411 } else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
109412 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
109413 index 4631a23..001ae57 100644
109414 --- a/sound/pci/ymfpci/ymfpci.h
109415 +++ b/sound/pci/ymfpci/ymfpci.h
109416 @@ -358,7 +358,7 @@ struct snd_ymfpci {
109417 spinlock_t reg_lock;
109418 spinlock_t voice_lock;
109419 wait_queue_head_t interrupt_sleep;
109420 - atomic_t interrupt_sleep_count;
109421 + atomic_unchecked_t interrupt_sleep_count;
109422 struct snd_info_entry *proc_entry;
109423 const struct firmware *dsp_microcode;
109424 const struct firmware *controller_microcode;
109425 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
109426 index 81c916a..516f0bf 100644
109427 --- a/sound/pci/ymfpci/ymfpci_main.c
109428 +++ b/sound/pci/ymfpci/ymfpci_main.c
109429 @@ -204,8 +204,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
109430 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
109431 break;
109432 }
109433 - if (atomic_read(&chip->interrupt_sleep_count)) {
109434 - atomic_set(&chip->interrupt_sleep_count, 0);
109435 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
109436 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109437 wake_up(&chip->interrupt_sleep);
109438 }
109439 __end:
109440 @@ -789,7 +789,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
109441 continue;
109442 init_waitqueue_entry(&wait, current);
109443 add_wait_queue(&chip->interrupt_sleep, &wait);
109444 - atomic_inc(&chip->interrupt_sleep_count);
109445 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
109446 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
109447 remove_wait_queue(&chip->interrupt_sleep, &wait);
109448 }
109449 @@ -827,8 +827,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
109450 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
109451 spin_unlock(&chip->reg_lock);
109452
109453 - if (atomic_read(&chip->interrupt_sleep_count)) {
109454 - atomic_set(&chip->interrupt_sleep_count, 0);
109455 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
109456 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109457 wake_up(&chip->interrupt_sleep);
109458 }
109459 }
109460 @@ -2423,7 +2423,7 @@ int snd_ymfpci_create(struct snd_card *card,
109461 spin_lock_init(&chip->reg_lock);
109462 spin_lock_init(&chip->voice_lock);
109463 init_waitqueue_head(&chip->interrupt_sleep);
109464 - atomic_set(&chip->interrupt_sleep_count, 0);
109465 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109466 chip->card = card;
109467 chip->pci = pci;
109468 chip->irq = -1;
109469 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
109470 index b60ff56..7307f0f 100644
109471 --- a/sound/soc/soc-core.c
109472 +++ b/sound/soc/soc-core.c
109473 @@ -2132,8 +2132,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
109474 if (ret)
109475 return ret;
109476
109477 - ops->warm_reset = snd_soc_ac97_warm_reset;
109478 - ops->reset = snd_soc_ac97_reset;
109479 + pax_open_kernel();
109480 + *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
109481 + *(void **)&ops->reset = snd_soc_ac97_reset;
109482 + pax_close_kernel();
109483
109484 snd_ac97_rst_cfg = cfg;
109485 return 0;
109486 diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
109487 index 7778b8e..3d619fc 100644
109488 --- a/sound/synth/emux/emux_seq.c
109489 +++ b/sound/synth/emux/emux_seq.c
109490 @@ -33,13 +33,13 @@ static int snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *inf
109491 * MIDI emulation operators
109492 */
109493 static struct snd_midi_op emux_ops = {
109494 - snd_emux_note_on,
109495 - snd_emux_note_off,
109496 - snd_emux_key_press,
109497 - snd_emux_terminate_note,
109498 - snd_emux_control,
109499 - snd_emux_nrpn,
109500 - snd_emux_sysex,
109501 + .note_on = snd_emux_note_on,
109502 + .note_off = snd_emux_note_off,
109503 + .key_press = snd_emux_key_press,
109504 + .note_terminate = snd_emux_terminate_note,
109505 + .control = snd_emux_control,
109506 + .nrpn = snd_emux_nrpn,
109507 + .sysex = snd_emux_sysex,
109508 };
109509
109510
109511 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
109512 new file mode 100644
109513 index 0000000..de92ed9
109514 --- /dev/null
109515 +++ b/tools/gcc/.gitignore
109516 @@ -0,0 +1 @@
109517 +randomize_layout_seed.h
109518 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
109519 new file mode 100644
109520 index 0000000..7b8921f
109521 --- /dev/null
109522 +++ b/tools/gcc/Makefile
109523 @@ -0,0 +1,52 @@
109524 +#CC := gcc
109525 +#PLUGIN_SOURCE_FILES := pax_plugin.c
109526 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
109527 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
109528 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
109529 +
109530 +ifeq ($(PLUGINCC),$(HOSTCC))
109531 +HOSTLIBS := hostlibs
109532 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu99 -ggdb
109533 +export HOST_EXTRACFLAGS
109534 +else
109535 +HOSTLIBS := hostcxxlibs
109536 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti -ggdb -Wno-unused-parameter -Wno-narrowing -Wno-unused-variable
109537 +export HOST_EXTRACXXFLAGS
109538 +endif
109539 +
109540 +export GCCPLUGINS_DIR HOSTLIBS
109541 +
109542 +$(HOSTLIBS)-$(CONFIG_PAX_CONSTIFY_PLUGIN) := constify_plugin.so
109543 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
109544 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
109545 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
109546 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
109547 +$(HOSTLIBS)-y += colorize_plugin.so
109548 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
109549 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STRUCTLEAK) += structleak_plugin.so
109550 +$(HOSTLIBS)-$(CONFIG_GRKERNSEC_RANDSTRUCT) += randomize_layout_plugin.so
109551 +
109552 +subdir-$(CONFIG_PAX_SIZE_OVERFLOW) := size_overflow_plugin
109553 +subdir- += size_overflow_plugin
109554 +
109555 +always := $($(HOSTLIBS)-y)
109556 +
109557 +constify_plugin-objs := constify_plugin.o
109558 +stackleak_plugin-objs := stackleak_plugin.o
109559 +kallocstat_plugin-objs := kallocstat_plugin.o
109560 +kernexec_plugin-objs := kernexec_plugin.o
109561 +checker_plugin-objs := checker_plugin.o
109562 +colorize_plugin-objs := colorize_plugin.o
109563 +latent_entropy_plugin-objs := latent_entropy_plugin.o
109564 +structleak_plugin-objs := structleak_plugin.o
109565 +randomize_layout_plugin-objs := randomize_layout_plugin.o
109566 +
109567 +$(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
109568 +
109569 +quiet_cmd_create_randomize_layout_seed = GENSEED $@
109570 + cmd_create_randomize_layout_seed = \
109571 + $(CONFIG_SHELL) $(srctree)/$(src)/gen-random-seed.sh $@ $(objtree)/include/generated/randomize_layout_hash.h
109572 +$(objtree)/$(obj)/randomize_layout_seed.h: FORCE
109573 + $(call if_changed,create_randomize_layout_seed)
109574 +
109575 +targets += randomize_layout_seed.h randomize_layout_hash.h
109576 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
109577 new file mode 100644
109578 index 0000000..5452feea
109579 --- /dev/null
109580 +++ b/tools/gcc/checker_plugin.c
109581 @@ -0,0 +1,150 @@
109582 +/*
109583 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
109584 + * Licensed under the GPL v2
109585 + *
109586 + * Note: the choice of the license means that the compilation process is
109587 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
109588 + * but for the kernel it doesn't matter since it doesn't link against
109589 + * any of the gcc libraries
109590 + *
109591 + * gcc plugin to implement various sparse (source code checker) features
109592 + *
109593 + * TODO:
109594 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
109595 + *
109596 + * BUGS:
109597 + * - none known
109598 + */
109599 +
109600 +#include "gcc-common.h"
109601 +
109602 +extern void c_register_addr_space (const char *str, addr_space_t as);
109603 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
109604 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
109605 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
109606 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
109607 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
109608 +
109609 +int plugin_is_GPL_compatible;
109610 +
109611 +static struct plugin_info checker_plugin_info = {
109612 + .version = "201304082245",
109613 + .help = NULL,
109614 +};
109615 +
109616 +#define ADDR_SPACE_KERNEL 0
109617 +#define ADDR_SPACE_FORCE_KERNEL 1
109618 +#define ADDR_SPACE_USER 2
109619 +#define ADDR_SPACE_FORCE_USER 3
109620 +#define ADDR_SPACE_IOMEM 0
109621 +#define ADDR_SPACE_FORCE_IOMEM 0
109622 +#define ADDR_SPACE_PERCPU 0
109623 +#define ADDR_SPACE_FORCE_PERCPU 0
109624 +#define ADDR_SPACE_RCU 0
109625 +#define ADDR_SPACE_FORCE_RCU 0
109626 +
109627 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
109628 +{
109629 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
109630 +}
109631 +
109632 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
109633 +{
109634 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
109635 +}
109636 +
109637 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
109638 +{
109639 + return default_addr_space_valid_pointer_mode(mode, as);
109640 +}
109641 +
109642 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
109643 +{
109644 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
109645 +}
109646 +
109647 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
109648 +{
109649 + return default_addr_space_legitimize_address(x, oldx, mode, as);
109650 +}
109651 +
109652 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
109653 +{
109654 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
109655 + return true;
109656 +
109657 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
109658 + return true;
109659 +
109660 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
109661 + return true;
109662 +
109663 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
109664 + return true;
109665 +
109666 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
109667 + return true;
109668 +
109669 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
109670 + return true;
109671 +
109672 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
109673 + return true;
109674 +
109675 + return subset == superset;
109676 +}
109677 +
109678 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
109679 +{
109680 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
109681 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
109682 +
109683 + return op;
109684 +}
109685 +
109686 +static void register_checker_address_spaces(void *event_data, void *data)
109687 +{
109688 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
109689 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
109690 + c_register_addr_space("__user", ADDR_SPACE_USER);
109691 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
109692 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
109693 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
109694 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
109695 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
109696 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
109697 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
109698 +
109699 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
109700 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
109701 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
109702 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
109703 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
109704 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
109705 + targetm.addr_space.convert = checker_addr_space_convert;
109706 +}
109707 +
109708 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
109709 +{
109710 + const char * const plugin_name = plugin_info->base_name;
109711 + const int argc = plugin_info->argc;
109712 + const struct plugin_argument * const argv = plugin_info->argv;
109713 + int i;
109714 +
109715 + if (!plugin_default_version_check(version, &gcc_version)) {
109716 + error(G_("incompatible gcc/plugin versions"));
109717 + return 1;
109718 + }
109719 +
109720 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
109721 +
109722 + for (i = 0; i < argc; ++i)
109723 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109724 +
109725 + if (TARGET_64BIT == 0)
109726 + return 0;
109727 +
109728 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
109729 +
109730 + return 0;
109731 +}
109732 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
109733 new file mode 100644
109734 index 0000000..54461af
109735 --- /dev/null
109736 +++ b/tools/gcc/colorize_plugin.c
109737 @@ -0,0 +1,210 @@
109738 +/*
109739 + * Copyright 2012-2014 by PaX Team <pageexec@freemail.hu>
109740 + * Licensed under the GPL v2
109741 + *
109742 + * Note: the choice of the license means that the compilation process is
109743 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
109744 + * but for the kernel it doesn't matter since it doesn't link against
109745 + * any of the gcc libraries
109746 + *
109747 + * gcc plugin to colorize diagnostic output
109748 + *
109749 + */
109750 +
109751 +#include "gcc-common.h"
109752 +
109753 +int plugin_is_GPL_compatible;
109754 +
109755 +static struct plugin_info colorize_plugin_info = {
109756 + .version = "201404202350",
109757 + .help = "color=[never|always|auto]\tdetermine when to colorize\n",
109758 +};
109759 +
109760 +#define GREEN "\033[32m\033[K"
109761 +#define LIGHTGREEN "\033[1;32m\033[K"
109762 +#define YELLOW "\033[33m\033[K"
109763 +#define LIGHTYELLOW "\033[1;33m\033[K"
109764 +#define RED "\033[31m\033[K"
109765 +#define LIGHTRED "\033[1;31m\033[K"
109766 +#define BLUE "\033[34m\033[K"
109767 +#define LIGHTBLUE "\033[1;34m\033[K"
109768 +#define BRIGHT "\033[1;m\033[K"
109769 +#define NORMAL "\033[m\033[K"
109770 +
109771 +static diagnostic_starter_fn old_starter;
109772 +static diagnostic_finalizer_fn old_finalizer;
109773 +
109774 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
109775 +{
109776 + const char *color;
109777 + char *newprefix;
109778 +
109779 + switch (diagnostic->kind) {
109780 + case DK_NOTE:
109781 + color = LIGHTBLUE;
109782 + break;
109783 +
109784 + case DK_PEDWARN:
109785 + case DK_WARNING:
109786 + color = LIGHTYELLOW;
109787 + break;
109788 +
109789 + case DK_ERROR:
109790 + case DK_FATAL:
109791 + case DK_ICE:
109792 + case DK_PERMERROR:
109793 + case DK_SORRY:
109794 + color = LIGHTRED;
109795 + break;
109796 +
109797 + default:
109798 + color = NORMAL;
109799 + }
109800 +
109801 + old_starter(context, diagnostic);
109802 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
109803 + return;
109804 + pp_destroy_prefix(context->printer);
109805 + pp_set_prefix(context->printer, newprefix);
109806 +}
109807 +
109808 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
109809 +{
109810 + old_finalizer(context, diagnostic);
109811 +}
109812 +
109813 +static void colorize_arm(void)
109814 +{
109815 + old_starter = diagnostic_starter(global_dc);
109816 + old_finalizer = diagnostic_finalizer(global_dc);
109817 +
109818 + diagnostic_starter(global_dc) = start_colorize;
109819 + diagnostic_finalizer(global_dc) = finalize_colorize;
109820 +}
109821 +
109822 +static unsigned int execute_colorize_rearm(void)
109823 +{
109824 + if (diagnostic_starter(global_dc) == start_colorize)
109825 + return 0;
109826 +
109827 + colorize_arm();
109828 + return 0;
109829 +}
109830 +
109831 +#if BUILDING_GCC_VERSION >= 4009
109832 +static const struct pass_data colorize_rearm_pass_data = {
109833 +#else
109834 +struct simple_ipa_opt_pass colorize_rearm_pass = {
109835 + .pass = {
109836 +#endif
109837 + .type = SIMPLE_IPA_PASS,
109838 + .name = "colorize_rearm",
109839 +#if BUILDING_GCC_VERSION >= 4008
109840 + .optinfo_flags = OPTGROUP_NONE,
109841 +#endif
109842 +#if BUILDING_GCC_VERSION >= 4009
109843 + .has_gate = false,
109844 + .has_execute = true,
109845 +#else
109846 + .gate = NULL,
109847 + .execute = execute_colorize_rearm,
109848 + .sub = NULL,
109849 + .next = NULL,
109850 + .static_pass_number = 0,
109851 +#endif
109852 + .tv_id = TV_NONE,
109853 + .properties_required = 0,
109854 + .properties_provided = 0,
109855 + .properties_destroyed = 0,
109856 + .todo_flags_start = 0,
109857 + .todo_flags_finish = 0
109858 +#if BUILDING_GCC_VERSION < 4009
109859 + }
109860 +#endif
109861 +};
109862 +
109863 +#if BUILDING_GCC_VERSION >= 4009
109864 +namespace {
109865 +class colorize_rearm_pass : public simple_ipa_opt_pass {
109866 +public:
109867 + colorize_rearm_pass() : simple_ipa_opt_pass(colorize_rearm_pass_data, g) {}
109868 + unsigned int execute() { return execute_colorize_rearm(); }
109869 +};
109870 +}
109871 +
109872 +static opt_pass *make_colorize_rearm_pass(void)
109873 +{
109874 + return new colorize_rearm_pass();
109875 +}
109876 +#else
109877 +static struct opt_pass *make_colorize_rearm_pass(void)
109878 +{
109879 + return &colorize_rearm_pass.pass;
109880 +}
109881 +#endif
109882 +
109883 +static void colorize_start_unit(void *gcc_data, void *user_data)
109884 +{
109885 + colorize_arm();
109886 +}
109887 +
109888 +static bool should_colorize(void)
109889 +{
109890 +#if BUILDING_GCC_VERSION >= 4009
109891 + return false;
109892 +#else
109893 + char const *t = getenv("TERM");
109894 +
109895 + return t && strcmp(t, "dumb") && isatty(STDERR_FILENO);
109896 +#endif
109897 +}
109898 +
109899 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
109900 +{
109901 + const char * const plugin_name = plugin_info->base_name;
109902 + const int argc = plugin_info->argc;
109903 + const struct plugin_argument * const argv = plugin_info->argv;
109904 + int i;
109905 + struct register_pass_info colorize_rearm_pass_info;
109906 + bool colorize;
109907 +
109908 + colorize_rearm_pass_info.pass = make_colorize_rearm_pass();
109909 + colorize_rearm_pass_info.reference_pass_name = "*free_lang_data";
109910 + colorize_rearm_pass_info.ref_pass_instance_number = 1;
109911 + colorize_rearm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
109912 +
109913 + if (!plugin_default_version_check(version, &gcc_version)) {
109914 + error(G_("incompatible gcc/plugin versions"));
109915 + return 1;
109916 + }
109917 +
109918 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
109919 +
109920 + colorize = getenv("GCC_COLORS") ? should_colorize() : false;
109921 +
109922 + for (i = 0; i < argc; ++i) {
109923 + if (!strcmp(argv[i].key, "color")) {
109924 + if (!argv[i].value) {
109925 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109926 + continue;
109927 + }
109928 + if (!strcmp(argv[i].value, "always"))
109929 + colorize = true;
109930 + else if (!strcmp(argv[i].value, "never"))
109931 + colorize = false;
109932 + else if (!strcmp(argv[i].value, "auto"))
109933 + colorize = should_colorize();
109934 + else
109935 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
109936 + continue;
109937 + }
109938 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109939 + }
109940 +
109941 + if (colorize) {
109942 + // TODO: parse GCC_COLORS as used by gcc 4.9+
109943 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
109944 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
109945 + }
109946 + return 0;
109947 +}
109948 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
109949 new file mode 100644
109950 index 0000000..82bc5a8
109951 --- /dev/null
109952 +++ b/tools/gcc/constify_plugin.c
109953 @@ -0,0 +1,557 @@
109954 +/*
109955 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
109956 + * Copyright 2011-2014 by PaX Team <pageexec@freemail.hu>
109957 + * Licensed under the GPL v2, or (at your option) v3
109958 + *
109959 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
109960 + *
109961 + * Homepage:
109962 + * http://www.grsecurity.net/~ephox/const_plugin/
109963 + *
109964 + * Usage:
109965 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
109966 + * $ gcc -fplugin=constify_plugin.so test.c -O2
109967 + */
109968 +
109969 +#include "gcc-common.h"
109970 +
109971 +// unused C type flag in all versions 4.5-4.9
109972 +#define TYPE_CONSTIFY_VISITED(TYPE) TYPE_LANG_FLAG_4(TYPE)
109973 +
109974 +int plugin_is_GPL_compatible;
109975 +
109976 +static struct plugin_info const_plugin_info = {
109977 + .version = "201401270210",
109978 + .help = "no-constify\tturn off constification\n",
109979 +};
109980 +
109981 +typedef struct {
109982 + bool has_fptr_field;
109983 + bool has_writable_field;
109984 + bool has_do_const_field;
109985 + bool has_no_const_field;
109986 +} constify_info;
109987 +
109988 +static const_tree get_field_type(const_tree field)
109989 +{
109990 + return strip_array_types(TREE_TYPE(field));
109991 +}
109992 +
109993 +static bool is_fptr(const_tree field)
109994 +{
109995 + const_tree ptr = get_field_type(field);
109996 +
109997 + if (TREE_CODE(ptr) != POINTER_TYPE)
109998 + return false;
109999 +
110000 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
110001 +}
110002 +
110003 +/*
110004 + * determine whether the given structure type meets the requirements for automatic constification,
110005 + * including the constification attributes on nested structure types
110006 + */
110007 +static void constifiable(const_tree node, constify_info *cinfo)
110008 +{
110009 + const_tree field;
110010 +
110011 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
110012 +
110013 + // e.g., pointer to structure fields while still constructing the structure type
110014 + if (TYPE_FIELDS(node) == NULL_TREE)
110015 + return;
110016 +
110017 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
110018 + const_tree type = get_field_type(field);
110019 + enum tree_code code = TREE_CODE(type);
110020 +
110021 + if (node == type)
110022 + continue;
110023 +
110024 + if (is_fptr(field))
110025 + cinfo->has_fptr_field = true;
110026 + else if (!TREE_READONLY(field))
110027 + cinfo->has_writable_field = true;
110028 +
110029 + if (code == RECORD_TYPE || code == UNION_TYPE) {
110030 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
110031 + cinfo->has_do_const_field = true;
110032 + else if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
110033 + cinfo->has_no_const_field = true;
110034 + else
110035 + constifiable(type, cinfo);
110036 + }
110037 + }
110038 +}
110039 +
110040 +static bool constified(const_tree node)
110041 +{
110042 + constify_info cinfo = {
110043 + .has_fptr_field = false,
110044 + .has_writable_field = false,
110045 + .has_do_const_field = false,
110046 + .has_no_const_field = false
110047 + };
110048 +
110049 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
110050 +
110051 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
110052 +// gcc_assert(!TYPE_READONLY(node));
110053 + return false;
110054 + }
110055 +
110056 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(node))) {
110057 + gcc_assert(TYPE_READONLY(node));
110058 + return true;
110059 + }
110060 +
110061 + constifiable(node, &cinfo);
110062 + if ((!cinfo.has_fptr_field || cinfo.has_writable_field) && !cinfo.has_do_const_field)
110063 + return false;
110064 +
110065 + return TYPE_READONLY(node);
110066 +}
110067 +
110068 +static void deconstify_tree(tree node);
110069 +
110070 +static void deconstify_type(tree type)
110071 +{
110072 + tree field;
110073 +
110074 + gcc_assert(TREE_CODE(type) == RECORD_TYPE || TREE_CODE(type) == UNION_TYPE);
110075 +
110076 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
110077 + const_tree fieldtype = get_field_type(field);
110078 +
110079 + // special case handling of simple ptr-to-same-array-type members
110080 + if (TREE_CODE(TREE_TYPE(field)) == POINTER_TYPE) {
110081 + tree ptrtype = TREE_TYPE(TREE_TYPE(field));
110082 +
110083 + if (TREE_TYPE(TREE_TYPE(field)) == type)
110084 + continue;
110085 + if (TREE_CODE(ptrtype) != RECORD_TYPE && TREE_CODE(ptrtype) != UNION_TYPE)
110086 + continue;
110087 + if (!constified(ptrtype))
110088 + continue;
110089 + if (TYPE_MAIN_VARIANT(ptrtype) == TYPE_MAIN_VARIANT(type)) {
110090 + TREE_TYPE(field) = copy_node(TREE_TYPE(field));
110091 + TREE_TYPE(TREE_TYPE(field)) = build_qualified_type(type, TYPE_QUALS(ptrtype) & ~TYPE_QUAL_CONST);
110092 + }
110093 + continue;
110094 + }
110095 + if (TREE_CODE(fieldtype) != RECORD_TYPE && TREE_CODE(fieldtype) != UNION_TYPE)
110096 + continue;
110097 + if (!constified(fieldtype))
110098 + continue;
110099 +
110100 + deconstify_tree(field);
110101 + TREE_READONLY(field) = 0;
110102 + }
110103 + TYPE_READONLY(type) = 0;
110104 + C_TYPE_FIELDS_READONLY(type) = 0;
110105 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110106 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
110107 + TYPE_ATTRIBUTES(type) = remove_attribute("do_const", TYPE_ATTRIBUTES(type));
110108 + }
110109 +}
110110 +
110111 +static void deconstify_tree(tree node)
110112 +{
110113 + tree old_type, new_type, field;
110114 +
110115 + old_type = TREE_TYPE(node);
110116 + while (TREE_CODE(old_type) == ARRAY_TYPE && TREE_CODE(TREE_TYPE(old_type)) != ARRAY_TYPE) {
110117 + node = TREE_TYPE(node) = copy_node(old_type);
110118 + old_type = TREE_TYPE(old_type);
110119 + }
110120 +
110121 + gcc_assert(TREE_CODE(old_type) == RECORD_TYPE || TREE_CODE(old_type) == UNION_TYPE);
110122 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
110123 +
110124 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
110125 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
110126 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
110127 + DECL_FIELD_CONTEXT(field) = new_type;
110128 +
110129 + deconstify_type(new_type);
110130 +
110131 + TREE_TYPE(node) = new_type;
110132 +}
110133 +
110134 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
110135 +{
110136 + tree type;
110137 + constify_info cinfo = {
110138 + .has_fptr_field = false,
110139 + .has_writable_field = false,
110140 + .has_do_const_field = false,
110141 + .has_no_const_field = false
110142 + };
110143 +
110144 + *no_add_attrs = true;
110145 + if (TREE_CODE(*node) == FUNCTION_DECL) {
110146 + error("%qE attribute does not apply to functions (%qF)", name, *node);
110147 + return NULL_TREE;
110148 + }
110149 +
110150 + if (TREE_CODE(*node) == PARM_DECL) {
110151 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
110152 + return NULL_TREE;
110153 + }
110154 +
110155 + if (TREE_CODE(*node) == VAR_DECL) {
110156 + error("%qE attribute does not apply to variables (%qD)", name, *node);
110157 + return NULL_TREE;
110158 + }
110159 +
110160 + if (TYPE_P(*node)) {
110161 + type = *node;
110162 + } else {
110163 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
110164 + type = TREE_TYPE(*node);
110165 + }
110166 +
110167 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
110168 + error("%qE attribute used on %qT applies to struct and union types only", name, type);
110169 + return NULL_TREE;
110170 + }
110171 +
110172 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
110173 + error("%qE attribute is already applied to the type %qT", name, type);
110174 + return NULL_TREE;
110175 + }
110176 +
110177 + if (TYPE_P(*node)) {
110178 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
110179 + error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type);
110180 + else
110181 + *no_add_attrs = false;
110182 + return NULL_TREE;
110183 + }
110184 +
110185 + constifiable(type, &cinfo);
110186 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110187 + deconstify_tree(*node);
110188 + TYPE_CONSTIFY_VISITED(TREE_TYPE(*node)) = 1;
110189 + return NULL_TREE;
110190 + }
110191 +
110192 + error("%qE attribute used on type %qT that is not constified", name, type);
110193 + return NULL_TREE;
110194 +}
110195 +
110196 +static void constify_type(tree type)
110197 +{
110198 + TYPE_READONLY(type) = 1;
110199 + C_TYPE_FIELDS_READONLY(type) = 1;
110200 + TYPE_CONSTIFY_VISITED(type) = 1;
110201 +// TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
110202 +// TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("do_const"), NULL_TREE, TYPE_ATTRIBUTES(type));
110203 +}
110204 +
110205 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
110206 +{
110207 + *no_add_attrs = true;
110208 + if (!TYPE_P(*node)) {
110209 + error("%qE attribute applies to types only (%qD)", name, *node);
110210 + return NULL_TREE;
110211 + }
110212 +
110213 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
110214 + error("%qE attribute used on %qT applies to struct and union types only", name, *node);
110215 + return NULL_TREE;
110216 + }
110217 +
110218 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) {
110219 + error("%qE attribute used on %qT is already applied to the type", name, *node);
110220 + return NULL_TREE;
110221 + }
110222 +
110223 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) {
110224 + error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node);
110225 + return NULL_TREE;
110226 + }
110227 +
110228 + *no_add_attrs = false;
110229 + return NULL_TREE;
110230 +}
110231 +
110232 +static struct attribute_spec no_const_attr = {
110233 + .name = "no_const",
110234 + .min_length = 0,
110235 + .max_length = 0,
110236 + .decl_required = false,
110237 + .type_required = false,
110238 + .function_type_required = false,
110239 + .handler = handle_no_const_attribute,
110240 +#if BUILDING_GCC_VERSION >= 4007
110241 + .affects_type_identity = true
110242 +#endif
110243 +};
110244 +
110245 +static struct attribute_spec do_const_attr = {
110246 + .name = "do_const",
110247 + .min_length = 0,
110248 + .max_length = 0,
110249 + .decl_required = false,
110250 + .type_required = false,
110251 + .function_type_required = false,
110252 + .handler = handle_do_const_attribute,
110253 +#if BUILDING_GCC_VERSION >= 4007
110254 + .affects_type_identity = true
110255 +#endif
110256 +};
110257 +
110258 +static void register_attributes(void *event_data, void *data)
110259 +{
110260 + register_attribute(&no_const_attr);
110261 + register_attribute(&do_const_attr);
110262 +}
110263 +
110264 +static void finish_type(void *event_data, void *data)
110265 +{
110266 + tree type = (tree)event_data;
110267 + constify_info cinfo = {
110268 + .has_fptr_field = false,
110269 + .has_writable_field = false,
110270 + .has_do_const_field = false,
110271 + .has_no_const_field = false
110272 + };
110273 +
110274 + if (type == NULL_TREE || type == error_mark_node)
110275 + return;
110276 +
110277 + if (TYPE_FIELDS(type) == NULL_TREE || TYPE_CONSTIFY_VISITED(type))
110278 + return;
110279 +
110280 + constifiable(type, &cinfo);
110281 +
110282 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
110283 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) {
110284 + deconstify_type(type);
110285 + TYPE_CONSTIFY_VISITED(type) = 1;
110286 + } else
110287 + error("'no_const' attribute used on type %qT that is not constified", type);
110288 + return;
110289 + }
110290 +
110291 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110292 + if (!cinfo.has_writable_field) {
110293 + error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not ");
110294 + return;
110295 + }
110296 + constify_type(type);
110297 + return;
110298 + }
110299 +
110300 + if (cinfo.has_fptr_field && !cinfo.has_writable_field) {
110301 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110302 + error("'do_const' attribute used on type %qT that is constified", type);
110303 + return;
110304 + }
110305 + constify_type(type);
110306 + return;
110307 + }
110308 +
110309 + deconstify_type(type);
110310 + TYPE_CONSTIFY_VISITED(type) = 1;
110311 +}
110312 +
110313 +static void check_global_variables(void *event_data, void *data)
110314 +{
110315 +#if BUILDING_GCC_VERSION >= 4009
110316 + varpool_node *node;
110317 +#else
110318 + struct varpool_node *node;
110319 +#endif
110320 +
110321 + FOR_EACH_VARIABLE(node) {
110322 + tree var = NODE_DECL(node);
110323 + tree type = TREE_TYPE(var);
110324 +
110325 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
110326 + continue;
110327 +
110328 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
110329 + continue;
110330 +
110331 + if (!TYPE_CONSTIFY_VISITED(type))
110332 + continue;
110333 +
110334 + if (DECL_EXTERNAL(var))
110335 + continue;
110336 +
110337 + if (DECL_INITIAL(var))
110338 + continue;
110339 +
110340 + // this works around a gcc bug/feature where uninitialized globals
110341 + // are moved into the .bss section regardless of any constification
110342 + DECL_INITIAL(var) = build_constructor(type, NULL);
110343 +// inform(DECL_SOURCE_LOCATION(var), "constified variable %qE moved into .rodata", var);
110344 + }
110345 +}
110346 +
110347 +static unsigned int check_local_variables(void)
110348 +{
110349 + unsigned int ret = 0;
110350 + tree var;
110351 +
110352 + unsigned int i;
110353 +
110354 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
110355 + tree type = TREE_TYPE(var);
110356 +
110357 + gcc_assert(DECL_P(var));
110358 + if (is_global_var(var))
110359 + continue;
110360 +
110361 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
110362 + continue;
110363 +
110364 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
110365 + continue;
110366 +
110367 + if (!TYPE_CONSTIFY_VISITED(type))
110368 + continue;
110369 +
110370 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
110371 + ret = 1;
110372 + }
110373 + return ret;
110374 +}
110375 +
110376 +#if BUILDING_GCC_VERSION >= 4009
110377 +static const struct pass_data check_local_variables_pass_data = {
110378 +#else
110379 +static struct gimple_opt_pass check_local_variables_pass = {
110380 + .pass = {
110381 +#endif
110382 + .type = GIMPLE_PASS,
110383 + .name = "check_local_variables",
110384 +#if BUILDING_GCC_VERSION >= 4008
110385 + .optinfo_flags = OPTGROUP_NONE,
110386 +#endif
110387 +#if BUILDING_GCC_VERSION >= 4009
110388 + .has_gate = false,
110389 + .has_execute = true,
110390 +#else
110391 + .gate = NULL,
110392 + .execute = check_local_variables,
110393 + .sub = NULL,
110394 + .next = NULL,
110395 + .static_pass_number = 0,
110396 +#endif
110397 + .tv_id = TV_NONE,
110398 + .properties_required = 0,
110399 + .properties_provided = 0,
110400 + .properties_destroyed = 0,
110401 + .todo_flags_start = 0,
110402 + .todo_flags_finish = 0
110403 +#if BUILDING_GCC_VERSION < 4009
110404 + }
110405 +#endif
110406 +};
110407 +
110408 +#if BUILDING_GCC_VERSION >= 4009
110409 +namespace {
110410 +class check_local_variables_pass : public gimple_opt_pass {
110411 +public:
110412 + check_local_variables_pass() : gimple_opt_pass(check_local_variables_pass_data, g) {}
110413 + unsigned int execute() { return check_local_variables(); }
110414 +};
110415 +}
110416 +
110417 +static opt_pass *make_check_local_variables_pass(void)
110418 +{
110419 + return new check_local_variables_pass();
110420 +}
110421 +#else
110422 +static struct opt_pass *make_check_local_variables_pass(void)
110423 +{
110424 + return &check_local_variables_pass.pass;
110425 +}
110426 +#endif
110427 +
110428 +static struct {
110429 + const char *name;
110430 + const char *asm_op;
110431 +} sections[] = {
110432 + {".init.rodata", "\t.section\t.init.rodata,\"a\""},
110433 + {".ref.rodata", "\t.section\t.ref.rodata,\"a\""},
110434 + {".devinit.rodata", "\t.section\t.devinit.rodata,\"a\""},
110435 + {".devexit.rodata", "\t.section\t.devexit.rodata,\"a\""},
110436 + {".cpuinit.rodata", "\t.section\t.cpuinit.rodata,\"a\""},
110437 + {".cpuexit.rodata", "\t.section\t.cpuexit.rodata,\"a\""},
110438 + {".meminit.rodata", "\t.section\t.meminit.rodata,\"a\""},
110439 + {".memexit.rodata", "\t.section\t.memexit.rodata,\"a\""},
110440 + {".data..read_only", "\t.section\t.data..read_only,\"a\""},
110441 +};
110442 +
110443 +static unsigned int (*old_section_type_flags)(tree decl, const char *name, int reloc);
110444 +
110445 +static unsigned int constify_section_type_flags(tree decl, const char *name, int reloc)
110446 +{
110447 + size_t i;
110448 +
110449 + for (i = 0; i < ARRAY_SIZE(sections); i++)
110450 + if (!strcmp(sections[i].name, name))
110451 + return 0;
110452 + return old_section_type_flags(decl, name, reloc);
110453 +}
110454 +
110455 +static void constify_start_unit(void *gcc_data, void *user_data)
110456 +{
110457 +// size_t i;
110458 +
110459 +// for (i = 0; i < ARRAY_SIZE(sections); i++)
110460 +// sections[i].section = get_unnamed_section(0, output_section_asm_op, sections[i].asm_op);
110461 +// sections[i].section = get_section(sections[i].name, 0, NULL);
110462 +
110463 + old_section_type_flags = targetm.section_type_flags;
110464 + targetm.section_type_flags = constify_section_type_flags;
110465 +}
110466 +
110467 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
110468 +{
110469 + const char * const plugin_name = plugin_info->base_name;
110470 + const int argc = plugin_info->argc;
110471 + const struct plugin_argument * const argv = plugin_info->argv;
110472 + int i;
110473 + bool constify = true;
110474 +
110475 + struct register_pass_info check_local_variables_pass_info;
110476 +
110477 + check_local_variables_pass_info.pass = make_check_local_variables_pass();
110478 + check_local_variables_pass_info.reference_pass_name = "ssa";
110479 + check_local_variables_pass_info.ref_pass_instance_number = 1;
110480 + check_local_variables_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
110481 +
110482 + if (!plugin_default_version_check(version, &gcc_version)) {
110483 + error(G_("incompatible gcc/plugin versions"));
110484 + return 1;
110485 + }
110486 +
110487 + for (i = 0; i < argc; ++i) {
110488 + if (!(strcmp(argv[i].key, "no-constify"))) {
110489 + constify = false;
110490 + continue;
110491 + }
110492 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
110493 + }
110494 +
110495 + if (strcmp(lang_hooks.name, "GNU C")) {
110496 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
110497 + constify = false;
110498 + }
110499 +
110500 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
110501 + if (constify) {
110502 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
110503 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
110504 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &check_local_variables_pass_info);
110505 + register_callback(plugin_name, PLUGIN_START_UNIT, constify_start_unit, NULL);
110506 + }
110507 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
110508 +
110509 + return 0;
110510 +}
110511 diff --git a/tools/gcc/gcc-common.h b/tools/gcc/gcc-common.h
110512 new file mode 100644
110513 index 0000000..e90c205
110514 --- /dev/null
110515 +++ b/tools/gcc/gcc-common.h
110516 @@ -0,0 +1,295 @@
110517 +#ifndef GCC_COMMON_H_INCLUDED
110518 +#define GCC_COMMON_H_INCLUDED
110519 +
110520 +#include "plugin.h"
110521 +#include "bversion.h"
110522 +#include "plugin-version.h"
110523 +#include "config.h"
110524 +#include "system.h"
110525 +#include "coretypes.h"
110526 +#include "tm.h"
110527 +#include "line-map.h"
110528 +#include "input.h"
110529 +#include "tree.h"
110530 +
110531 +#include "tree-inline.h"
110532 +#include "version.h"
110533 +#include "rtl.h"
110534 +#include "tm_p.h"
110535 +#include "flags.h"
110536 +//#include "insn-attr.h"
110537 +//#include "insn-config.h"
110538 +//#include "insn-flags.h"
110539 +#include "hard-reg-set.h"
110540 +//#include "recog.h"
110541 +#include "output.h"
110542 +#include "except.h"
110543 +#include "function.h"
110544 +#include "toplev.h"
110545 +//#include "expr.h"
110546 +#include "basic-block.h"
110547 +#include "intl.h"
110548 +#include "ggc.h"
110549 +//#include "regs.h"
110550 +#include "timevar.h"
110551 +
110552 +#include "params.h"
110553 +#include "pointer-set.h"
110554 +#include "emit-rtl.h"
110555 +//#include "reload.h"
110556 +//#include "ira.h"
110557 +//#include "dwarf2asm.h"
110558 +#include "debug.h"
110559 +#include "target.h"
110560 +#include "langhooks.h"
110561 +#include "cfgloop.h"
110562 +//#include "hosthooks.h"
110563 +#include "cgraph.h"
110564 +#include "opts.h"
110565 +//#include "coverage.h"
110566 +//#include "value-prof.h"
110567 +
110568 +#if BUILDING_GCC_VERSION >= 4007
110569 +#include "tree-pretty-print.h"
110570 +#include "gimple-pretty-print.h"
110571 +#include "c-tree.h"
110572 +//#include "alloc-pool.h"
110573 +#endif
110574 +
110575 +#if BUILDING_GCC_VERSION <= 4008
110576 +#include "tree-flow.h"
110577 +#else
110578 +#include "tree-cfgcleanup.h"
110579 +#endif
110580 +
110581 +#include "diagnostic.h"
110582 +//#include "tree-diagnostic.h"
110583 +#include "tree-dump.h"
110584 +#include "tree-pass.h"
110585 +//#include "df.h"
110586 +#include "predict.h"
110587 +#include "ipa-utils.h"
110588 +
110589 +#if BUILDING_GCC_VERSION >= 4009
110590 +#include "varasm.h"
110591 +#include "stor-layout.h"
110592 +#include "internal-fn.h"
110593 +#include "gimple-expr.h"
110594 +//#include "diagnostic-color.h"
110595 +#include "context.h"
110596 +#include "tree-ssa-alias.h"
110597 +#include "stringpool.h"
110598 +#include "tree-ssanames.h"
110599 +#include "print-tree.h"
110600 +#include "tree-eh.h"
110601 +#include "stmt.h"
110602 +#endif
110603 +
110604 +#include "gimple.h"
110605 +
110606 +#if BUILDING_GCC_VERSION >= 4009
110607 +#include "tree-ssa-operands.h"
110608 +#include "tree-phinodes.h"
110609 +#include "tree-cfg.h"
110610 +#include "gimple-iterator.h"
110611 +#include "gimple-ssa.h"
110612 +#include "ssa-iterators.h"
110613 +#endif
110614 +
110615 +//#include "lto/lto.h"
110616 +//#include "data-streamer.h"
110617 +//#include "lto-compress.h"
110618 +
110619 +//#include "expr.h" where are you...
110620 +extern rtx emit_move_insn(rtx x, rtx y);
110621 +
110622 +// missing from basic_block.h...
110623 +extern void debug_dominance_info(enum cdi_direction dir);
110624 +extern void debug_dominance_tree(enum cdi_direction dir, basic_block root);
110625 +
110626 +#define __unused __attribute__((__unused__))
110627 +
110628 +#define DECL_NAME_POINTER(node) IDENTIFIER_POINTER(DECL_NAME(node))
110629 +#define DECL_NAME_LENGTH(node) IDENTIFIER_LENGTH(DECL_NAME(node))
110630 +#define TYPE_NAME_POINTER(node) IDENTIFIER_POINTER(TYPE_NAME(node))
110631 +#define TYPE_NAME_LENGTH(node) IDENTIFIER_LENGTH(TYPE_NAME(node))
110632 +
110633 +#if BUILDING_GCC_VERSION == 4005
110634 +#define FOR_EACH_LOCAL_DECL(FUN, I, D) for (tree vars = (FUN)->local_decls; vars && (D = TREE_VALUE(vars)); vars = TREE_CHAIN(vars), I)
110635 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
110636 +#define FOR_EACH_VEC_ELT(T, V, I, P) for (I = 0; VEC_iterate(T, (V), (I), (P)); ++(I))
110637 +#define TODO_rebuild_cgraph_edges 0
110638 +
110639 +static inline bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
110640 +{
110641 + tree fndecl;
110642 +
110643 + if (!is_gimple_call(stmt))
110644 + return false;
110645 + fndecl = gimple_call_fndecl(stmt);
110646 + if (!fndecl || DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
110647 + return false;
110648 +// print_node(stderr, "pax", fndecl, 4);
110649 + return DECL_FUNCTION_CODE(fndecl) == code;
110650 +}
110651 +
110652 +static inline bool is_simple_builtin(tree decl)
110653 +{
110654 + if (decl && DECL_BUILT_IN_CLASS(decl) != BUILT_IN_NORMAL)
110655 + return false;
110656 +
110657 + switch (DECL_FUNCTION_CODE(decl)) {
110658 + /* Builtins that expand to constants. */
110659 + case BUILT_IN_CONSTANT_P:
110660 + case BUILT_IN_EXPECT:
110661 + case BUILT_IN_OBJECT_SIZE:
110662 + case BUILT_IN_UNREACHABLE:
110663 + /* Simple register moves or loads from stack. */
110664 + case BUILT_IN_RETURN_ADDRESS:
110665 + case BUILT_IN_EXTRACT_RETURN_ADDR:
110666 + case BUILT_IN_FROB_RETURN_ADDR:
110667 + case BUILT_IN_RETURN:
110668 + case BUILT_IN_AGGREGATE_INCOMING_ADDRESS:
110669 + case BUILT_IN_FRAME_ADDRESS:
110670 + case BUILT_IN_VA_END:
110671 + case BUILT_IN_STACK_SAVE:
110672 + case BUILT_IN_STACK_RESTORE:
110673 + /* Exception state returns or moves registers around. */
110674 + case BUILT_IN_EH_FILTER:
110675 + case BUILT_IN_EH_POINTER:
110676 + case BUILT_IN_EH_COPY_VALUES:
110677 + return true;
110678 +
110679 + default:
110680 + return false;
110681 + }
110682 +}
110683 +#endif
110684 +
110685 +#if BUILDING_GCC_VERSION <= 4006
110686 +#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
110687 +#define C_DECL_REGISTER(EXP) DECL_LANG_FLAG_4(EXP)
110688 +
110689 +// should come from c-tree.h if only it were installed for gcc 4.5...
110690 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
110691 +
110692 +#define get_random_seed(noinit) ({ \
110693 + unsigned HOST_WIDE_INT seed; \
110694 + sscanf(get_random_seed(noinit), "%" HOST_WIDE_INT_PRINT "x", &seed); \
110695 + seed * seed; })
110696 +
110697 +static inline bool gimple_clobber_p(gimple s)
110698 +{
110699 + return false;
110700 +}
110701 +
110702 +static inline tree builtin_decl_implicit(enum built_in_function fncode)
110703 +{
110704 + return implicit_built_in_decls[fncode];
110705 +}
110706 +
110707 +static inline struct cgraph_node *cgraph_get_create_node(tree decl)
110708 +{
110709 + struct cgraph_node *node = cgraph_get_node(decl);
110710 +
110711 + return node ? node : cgraph_node(decl);
110712 +}
110713 +
110714 +static inline bool cgraph_function_with_gimple_body_p(struct cgraph_node *node)
110715 +{
110716 + return node->analyzed && !node->thunk.thunk_p && !node->alias;
110717 +}
110718 +
110719 +static inline struct cgraph_node *cgraph_first_function_with_gimple_body(void)
110720 +{
110721 + struct cgraph_node *node;
110722 +
110723 + for (node = cgraph_nodes; node; node = node->next)
110724 + if (cgraph_function_with_gimple_body_p(node))
110725 + return node;
110726 + return NULL;
110727 +}
110728 +
110729 +static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node)
110730 +{
110731 + for (node = node->next; node; node = node->next)
110732 + if (cgraph_function_with_gimple_body_p(node))
110733 + return node;
110734 + return NULL;
110735 +}
110736 +
110737 +#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
110738 + for ((node) = cgraph_first_function_with_gimple_body(); (node); \
110739 + (node) = cgraph_next_function_with_gimple_body(node))
110740 +#endif
110741 +
110742 +#if BUILDING_GCC_VERSION == 4006
110743 +extern void debug_gimple_stmt(gimple);
110744 +extern void debug_gimple_seq(gimple_seq);
110745 +extern void print_gimple_seq(FILE *, gimple_seq, int, int);
110746 +extern void print_gimple_stmt(FILE *, gimple, int, int);
110747 +extern void print_gimple_expr(FILE *, gimple, int, int);
110748 +extern void dump_gimple_stmt(pretty_printer *, gimple, int, int);
110749 +#endif
110750 +
110751 +#if BUILDING_GCC_VERSION <= 4007
110752 +#define FOR_EACH_VARIABLE(node) for (node = varpool_nodes; node; node = node->next)
110753 +#define PROP_loops 0
110754 +
110755 +static inline int bb_loop_depth(const_basic_block bb)
110756 +{
110757 + return bb->loop_father ? loop_depth(bb->loop_father) : 0;
110758 +}
110759 +
110760 +static inline bool gimple_store_p(gimple gs)
110761 +{
110762 + tree lhs = gimple_get_lhs(gs);
110763 + return lhs && !is_gimple_reg(lhs);
110764 +}
110765 +#endif
110766 +
110767 +#if BUILDING_GCC_VERSION >= 4007
110768 +#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
110769 + cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))
110770 +#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
110771 + cgraph_create_edge_including_clones((caller), (callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
110772 +#endif
110773 +
110774 +#if BUILDING_GCC_VERSION <= 4008
110775 +#define ENTRY_BLOCK_PTR_FOR_FN(FN) ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)
110776 +#define EXIT_BLOCK_PTR_FOR_FN(FN) EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
110777 +#define basic_block_info_for_fn(FN) ((FN)->cfg->x_basic_block_info)
110778 +#define n_basic_blocks_for_fn(FN) ((FN)->cfg->x_n_basic_blocks)
110779 +#define n_edges_for_fn(FN) ((FN)->cfg->x_n_edges)
110780 +#define last_basic_block_for_fn(FN) ((FN)->cfg->x_last_basic_block)
110781 +#define label_to_block_map_for_fn(FN) ((FN)->cfg->x_label_to_block_map)
110782 +#define profile_status_for_fn(FN) ((FN)->cfg->x_profile_status)
110783 +
110784 +static inline const char *get_tree_code_name(enum tree_code code)
110785 +{
110786 + gcc_assert(code < MAX_TREE_CODES);
110787 + return tree_code_name[code];
110788 +}
110789 +
110790 +#define ipa_remove_stmt_references(cnode, stmt)
110791 +#endif
110792 +
110793 +#if BUILDING_GCC_VERSION == 4008
110794 +#define NODE_DECL(node) node->symbol.decl
110795 +#else
110796 +#define NODE_DECL(node) node->decl
110797 +#endif
110798 +
110799 +#if BUILDING_GCC_VERSION >= 4008
110800 +#define add_referenced_var(var)
110801 +#define mark_sym_for_renaming(var)
110802 +#define varpool_mark_needed_node(node)
110803 +#define TODO_dump_func 0
110804 +#define TODO_dump_cgraph 0
110805 +#endif
110806 +
110807 +#if BUILDING_GCC_VERSION >= 4009
110808 +#define TODO_ggc_collect 0
110809 +#endif
110810 +
110811 +#endif
110812 diff --git a/tools/gcc/gen-random-seed.sh b/tools/gcc/gen-random-seed.sh
110813 new file mode 100644
110814 index 0000000..7514850
110815 --- /dev/null
110816 +++ b/tools/gcc/gen-random-seed.sh
110817 @@ -0,0 +1,8 @@
110818 +#!/bin/sh
110819 +
110820 +if [ ! -f "$1" ]; then
110821 + SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'`
110822 + echo "const char *randstruct_seed = \"$SEED\";" > "$1"
110823 + HASH=`echo -n "$SEED" | sha256sum | cut -d" " -f1 | tr -d ' \n'`
110824 + echo "#define RANDSTRUCT_HASHED_SEED \"$HASH\"" > "$2"
110825 +fi
110826 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
110827 new file mode 100644
110828 index 0000000..d81c094
110829 --- /dev/null
110830 +++ b/tools/gcc/kallocstat_plugin.c
110831 @@ -0,0 +1,183 @@
110832 +/*
110833 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
110834 + * Licensed under the GPL v2
110835 + *
110836 + * Note: the choice of the license means that the compilation process is
110837 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
110838 + * but for the kernel it doesn't matter since it doesn't link against
110839 + * any of the gcc libraries
110840 + *
110841 + * gcc plugin to find the distribution of k*alloc sizes
110842 + *
110843 + * TODO:
110844 + *
110845 + * BUGS:
110846 + * - none known
110847 + */
110848 +
110849 +#include "gcc-common.h"
110850 +
110851 +int plugin_is_GPL_compatible;
110852 +
110853 +static struct plugin_info kallocstat_plugin_info = {
110854 + .version = "201401260140",
110855 + .help = NULL
110856 +};
110857 +
110858 +static const char * const kalloc_functions[] = {
110859 + "__kmalloc",
110860 + "kmalloc",
110861 + "kmalloc_large",
110862 + "kmalloc_node",
110863 + "kmalloc_order",
110864 + "kmalloc_order_trace",
110865 + "kmalloc_slab",
110866 + "kzalloc",
110867 + "kzalloc_node",
110868 +};
110869 +
110870 +static bool is_kalloc(const char *fnname)
110871 +{
110872 + size_t i;
110873 +
110874 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
110875 + if (!strcmp(fnname, kalloc_functions[i]))
110876 + return true;
110877 + return false;
110878 +}
110879 +
110880 +static unsigned int execute_kallocstat(void)
110881 +{
110882 + basic_block bb;
110883 +
110884 + // 1. loop through BBs and GIMPLE statements
110885 + FOR_EACH_BB_FN(bb, cfun) {
110886 + gimple_stmt_iterator gsi;
110887 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
110888 + // gimple match:
110889 + tree fndecl, size;
110890 + gimple stmt;
110891 + const char *fnname;
110892 +
110893 + // is it a call
110894 + stmt = gsi_stmt(gsi);
110895 + if (!is_gimple_call(stmt))
110896 + continue;
110897 + fndecl = gimple_call_fndecl(stmt);
110898 + if (fndecl == NULL_TREE)
110899 + continue;
110900 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
110901 + continue;
110902 +
110903 + // is it a call to k*alloc
110904 + fnname = DECL_NAME_POINTER(fndecl);
110905 + if (!is_kalloc(fnname))
110906 + continue;
110907 +
110908 + // is the size arg const or the result of a simple const assignment
110909 + size = gimple_call_arg(stmt, 0);
110910 + while (true) {
110911 + expanded_location xloc;
110912 + size_t size_val;
110913 +
110914 + if (TREE_CONSTANT(size)) {
110915 + xloc = expand_location(gimple_location(stmt));
110916 + if (!xloc.file)
110917 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
110918 + size_val = TREE_INT_CST_LOW(size);
110919 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
110920 + break;
110921 + }
110922 +
110923 + if (TREE_CODE(size) != SSA_NAME)
110924 + break;
110925 + stmt = SSA_NAME_DEF_STMT(size);
110926 +//debug_gimple_stmt(stmt);
110927 +//debug_tree(size);
110928 + if (!stmt || !is_gimple_assign(stmt))
110929 + break;
110930 + if (gimple_num_ops(stmt) != 2)
110931 + break;
110932 + size = gimple_assign_rhs1(stmt);
110933 + }
110934 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
110935 +//debug_tree(gimple_call_fn(call_stmt));
110936 +//print_node(stderr, "pax", fndecl, 4);
110937 + }
110938 + }
110939 +
110940 + return 0;
110941 +}
110942 +
110943 +#if BUILDING_GCC_VERSION >= 4009
110944 +static const struct pass_data kallocstat_pass_data = {
110945 +#else
110946 +static struct gimple_opt_pass kallocstat_pass = {
110947 + .pass = {
110948 +#endif
110949 + .type = GIMPLE_PASS,
110950 + .name = "kallocstat",
110951 +#if BUILDING_GCC_VERSION >= 4008
110952 + .optinfo_flags = OPTGROUP_NONE,
110953 +#endif
110954 +#if BUILDING_GCC_VERSION >= 4009
110955 + .has_gate = false,
110956 + .has_execute = true,
110957 +#else
110958 + .gate = NULL,
110959 + .execute = execute_kallocstat,
110960 + .sub = NULL,
110961 + .next = NULL,
110962 + .static_pass_number = 0,
110963 +#endif
110964 + .tv_id = TV_NONE,
110965 + .properties_required = 0,
110966 + .properties_provided = 0,
110967 + .properties_destroyed = 0,
110968 + .todo_flags_start = 0,
110969 + .todo_flags_finish = 0
110970 +#if BUILDING_GCC_VERSION < 4009
110971 + }
110972 +#endif
110973 +};
110974 +
110975 +#if BUILDING_GCC_VERSION >= 4009
110976 +namespace {
110977 +class kallocstat_pass : public gimple_opt_pass {
110978 +public:
110979 + kallocstat_pass() : gimple_opt_pass(kallocstat_pass_data, g) {}
110980 + unsigned int execute() { return execute_kallocstat(); }
110981 +};
110982 +}
110983 +
110984 +static opt_pass *make_kallocstat_pass(void)
110985 +{
110986 + return new kallocstat_pass();
110987 +}
110988 +#else
110989 +static struct opt_pass *make_kallocstat_pass(void)
110990 +{
110991 + return &kallocstat_pass.pass;
110992 +}
110993 +#endif
110994 +
110995 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
110996 +{
110997 + const char * const plugin_name = plugin_info->base_name;
110998 + struct register_pass_info kallocstat_pass_info;
110999 +
111000 + kallocstat_pass_info.pass = make_kallocstat_pass();
111001 + kallocstat_pass_info.reference_pass_name = "ssa";
111002 + kallocstat_pass_info.ref_pass_instance_number = 1;
111003 + kallocstat_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111004 +
111005 + if (!plugin_default_version_check(version, &gcc_version)) {
111006 + error(G_("incompatible gcc/plugin versions"));
111007 + return 1;
111008 + }
111009 +
111010 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
111011 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
111012 +
111013 + return 0;
111014 +}
111015 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
111016 new file mode 100644
111017 index 0000000..89f256d
111018 --- /dev/null
111019 +++ b/tools/gcc/kernexec_plugin.c
111020 @@ -0,0 +1,522 @@
111021 +/*
111022 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
111023 + * Licensed under the GPL v2
111024 + *
111025 + * Note: the choice of the license means that the compilation process is
111026 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
111027 + * but for the kernel it doesn't matter since it doesn't link against
111028 + * any of the gcc libraries
111029 + *
111030 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
111031 + *
111032 + * TODO:
111033 + *
111034 + * BUGS:
111035 + * - none known
111036 + */
111037 +
111038 +#include "gcc-common.h"
111039 +
111040 +int plugin_is_GPL_compatible;
111041 +
111042 +static struct plugin_info kernexec_plugin_info = {
111043 + .version = "201401260140",
111044 + .help = "method=[bts|or]\tinstrumentation method\n"
111045 +};
111046 +
111047 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
111048 +static void (*kernexec_instrument_retaddr)(rtx);
111049 +
111050 +/*
111051 + * add special KERNEXEC instrumentation: reload %r12 after it has been clobbered
111052 + */
111053 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
111054 +{
111055 + gimple asm_movabs_stmt;
111056 +
111057 + // build asm volatile("movabs $0x8000000000000000, %%r12\n\t" : : : );
111058 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r12\n\t", NULL, NULL, NULL, NULL);
111059 + gimple_asm_set_volatile(asm_movabs_stmt, true);
111060 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
111061 + update_stmt(asm_movabs_stmt);
111062 +}
111063 +
111064 +/*
111065 + * find all asm() stmts that clobber r12 and add a reload of r12
111066 + */
111067 +static unsigned int execute_kernexec_reload(void)
111068 +{
111069 + basic_block bb;
111070 +
111071 + // 1. loop through BBs and GIMPLE statements
111072 + FOR_EACH_BB_FN(bb, cfun) {
111073 + gimple_stmt_iterator gsi;
111074 +
111075 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
111076 + // gimple match: __asm__ ("" : : : "r12");
111077 + gimple asm_stmt;
111078 + size_t nclobbers;
111079 +
111080 + // is it an asm ...
111081 + asm_stmt = gsi_stmt(gsi);
111082 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
111083 + continue;
111084 +
111085 + // ... clobbering r12
111086 + nclobbers = gimple_asm_nclobbers(asm_stmt);
111087 + while (nclobbers--) {
111088 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
111089 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r12"))
111090 + continue;
111091 + kernexec_reload_fptr_mask(&gsi);
111092 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
111093 + break;
111094 + }
111095 + }
111096 + }
111097 +
111098 + return 0;
111099 +}
111100 +
111101 +/*
111102 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
111103 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
111104 + */
111105 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
111106 +{
111107 + gimple assign_intptr, assign_new_fptr, call_stmt;
111108 + tree intptr, orptr, old_fptr, new_fptr, kernexec_mask;
111109 +
111110 + call_stmt = gsi_stmt(*gsi);
111111 + old_fptr = gimple_call_fn(call_stmt);
111112 +
111113 + // create temporary unsigned long variable used for bitops and cast fptr to it
111114 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
111115 + add_referenced_var(intptr);
111116 + intptr = make_ssa_name(intptr, NULL);
111117 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
111118 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
111119 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
111120 + update_stmt(assign_intptr);
111121 +
111122 + // apply logical or to temporary unsigned long and bitmask
111123 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
111124 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
111125 + orptr = fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask);
111126 + intptr = make_ssa_name(SSA_NAME_VAR(intptr), NULL);
111127 + assign_intptr = gimple_build_assign(intptr, orptr);
111128 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
111129 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
111130 + update_stmt(assign_intptr);
111131 +
111132 + // cast temporary unsigned long back to a temporary fptr variable
111133 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
111134 + add_referenced_var(new_fptr);
111135 + new_fptr = make_ssa_name(new_fptr, NULL);
111136 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
111137 + SSA_NAME_DEF_STMT(new_fptr) = assign_new_fptr;
111138 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
111139 + update_stmt(assign_new_fptr);
111140 +
111141 + // replace call stmt fn with the new fptr
111142 + gimple_call_set_fn(call_stmt, new_fptr);
111143 + update_stmt(call_stmt);
111144 +}
111145 +
111146 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
111147 +{
111148 + gimple asm_or_stmt, call_stmt;
111149 + tree old_fptr, new_fptr, input, output;
111150 +#if BUILDING_GCC_VERSION <= 4007
111151 + VEC(tree, gc) *inputs = NULL;
111152 + VEC(tree, gc) *outputs = NULL;
111153 +#else
111154 + vec<tree, va_gc> *inputs = NULL;
111155 + vec<tree, va_gc> *outputs = NULL;
111156 +#endif
111157 +
111158 + call_stmt = gsi_stmt(*gsi);
111159 + old_fptr = gimple_call_fn(call_stmt);
111160 +
111161 + // create temporary fptr variable
111162 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
111163 + add_referenced_var(new_fptr);
111164 + new_fptr = make_ssa_name(new_fptr, NULL);
111165 +
111166 + // build asm volatile("orq %%r12, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
111167 + input = build_tree_list(NULL_TREE, build_string(1, "0"));
111168 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
111169 + output = build_tree_list(NULL_TREE, build_string(2, "=r"));
111170 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
111171 +#if BUILDING_GCC_VERSION <= 4007
111172 + VEC_safe_push(tree, gc, inputs, input);
111173 + VEC_safe_push(tree, gc, outputs, output);
111174 +#else
111175 + vec_safe_push(inputs, input);
111176 + vec_safe_push(outputs, output);
111177 +#endif
111178 + asm_or_stmt = gimple_build_asm_vec("orq %%r12, %0\n\t", inputs, outputs, NULL, NULL);
111179 + SSA_NAME_DEF_STMT(new_fptr) = asm_or_stmt;
111180 + gimple_asm_set_volatile(asm_or_stmt, true);
111181 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
111182 + update_stmt(asm_or_stmt);
111183 +
111184 + // replace call stmt fn with the new fptr
111185 + gimple_call_set_fn(call_stmt, new_fptr);
111186 + update_stmt(call_stmt);
111187 +}
111188 +
111189 +/*
111190 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
111191 + */
111192 +static unsigned int execute_kernexec_fptr(void)
111193 +{
111194 + basic_block bb;
111195 +
111196 + // 1. loop through BBs and GIMPLE statements
111197 + FOR_EACH_BB_FN(bb, cfun) {
111198 + gimple_stmt_iterator gsi;
111199 +
111200 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
111201 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
111202 + tree fn;
111203 + gimple call_stmt;
111204 +
111205 + // is it a call ...
111206 + call_stmt = gsi_stmt(gsi);
111207 + if (!is_gimple_call(call_stmt))
111208 + continue;
111209 + fn = gimple_call_fn(call_stmt);
111210 + if (TREE_CODE(fn) == ADDR_EXPR)
111211 + continue;
111212 + if (TREE_CODE(fn) != SSA_NAME)
111213 + gcc_unreachable();
111214 +
111215 + // ... through a function pointer
111216 + if (SSA_NAME_VAR(fn) != NULL_TREE) {
111217 + fn = SSA_NAME_VAR(fn);
111218 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL) {
111219 + debug_tree(fn);
111220 + gcc_unreachable();
111221 + }
111222 + }
111223 + fn = TREE_TYPE(fn);
111224 + if (TREE_CODE(fn) != POINTER_TYPE)
111225 + continue;
111226 + fn = TREE_TYPE(fn);
111227 + if (TREE_CODE(fn) != FUNCTION_TYPE)
111228 + continue;
111229 +
111230 + kernexec_instrument_fptr(&gsi);
111231 +
111232 +//debug_tree(gimple_call_fn(call_stmt));
111233 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
111234 + }
111235 + }
111236 +
111237 + return 0;
111238 +}
111239 +
111240 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
111241 +static void kernexec_instrument_retaddr_bts(rtx insn)
111242 +{
111243 + rtx btsq;
111244 + rtvec argvec, constraintvec, labelvec;
111245 + int line;
111246 +
111247 + // create asm volatile("btsq $63,(%%rsp)":::)
111248 + argvec = rtvec_alloc(0);
111249 + constraintvec = rtvec_alloc(0);
111250 + labelvec = rtvec_alloc(0);
111251 + line = expand_location(RTL_LOCATION(insn)).line;
111252 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
111253 + MEM_VOLATILE_P(btsq) = 1;
111254 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
111255 + emit_insn_before(btsq, insn);
111256 +}
111257 +
111258 +// add special KERNEXEC instrumentation: orq %r12,(%rsp) just before retn
111259 +static void kernexec_instrument_retaddr_or(rtx insn)
111260 +{
111261 + rtx orq;
111262 + rtvec argvec, constraintvec, labelvec;
111263 + int line;
111264 +
111265 + // create asm volatile("orq %%r12,(%%rsp)":::)
111266 + argvec = rtvec_alloc(0);
111267 + constraintvec = rtvec_alloc(0);
111268 + labelvec = rtvec_alloc(0);
111269 + line = expand_location(RTL_LOCATION(insn)).line;
111270 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r12,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
111271 + MEM_VOLATILE_P(orq) = 1;
111272 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
111273 + emit_insn_before(orq, insn);
111274 +}
111275 +
111276 +/*
111277 + * find all asm level function returns and forcibly set the highest bit of the return address
111278 + */
111279 +static unsigned int execute_kernexec_retaddr(void)
111280 +{
111281 + rtx insn;
111282 +
111283 +// if (stack_realign_drap)
111284 +// inform(DECL_SOURCE_LOCATION(current_function_decl), "drap detected in %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
111285 +
111286 + // 1. find function returns
111287 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
111288 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
111289 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
111290 + // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
111291 + rtx body;
111292 +
111293 + // is it a retn
111294 + if (!JUMP_P(insn))
111295 + continue;
111296 + body = PATTERN(insn);
111297 + if (GET_CODE(body) == PARALLEL)
111298 + body = XVECEXP(body, 0, 0);
111299 + if (!ANY_RETURN_P(body))
111300 + continue;
111301 + kernexec_instrument_retaddr(insn);
111302 + }
111303 +
111304 +// print_simple_rtl(stderr, get_insns());
111305 +// print_rtl(stderr, get_insns());
111306 +
111307 + return 0;
111308 +}
111309 +
111310 +static bool kernexec_cmodel_check(void)
111311 +{
111312 + tree section;
111313 +
111314 + if (ix86_cmodel != CM_KERNEL)
111315 + return false;
111316 +
111317 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
111318 + if (!section || !TREE_VALUE(section))
111319 + return true;
111320 +
111321 + section = TREE_VALUE(TREE_VALUE(section));
111322 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
111323 + return true;
111324 +
111325 + return false;
111326 +}
111327 +
111328 +#if BUILDING_GCC_VERSION >= 4009
111329 +static const struct pass_data kernexec_reload_pass_data = {
111330 +#else
111331 +static struct gimple_opt_pass kernexec_reload_pass = {
111332 + .pass = {
111333 +#endif
111334 + .type = GIMPLE_PASS,
111335 + .name = "kernexec_reload",
111336 +#if BUILDING_GCC_VERSION >= 4008
111337 + .optinfo_flags = OPTGROUP_NONE,
111338 +#endif
111339 +#if BUILDING_GCC_VERSION >= 4009
111340 + .has_gate = true,
111341 + .has_execute = true,
111342 +#else
111343 + .gate = kernexec_cmodel_check,
111344 + .execute = execute_kernexec_reload,
111345 + .sub = NULL,
111346 + .next = NULL,
111347 + .static_pass_number = 0,
111348 +#endif
111349 + .tv_id = TV_NONE,
111350 + .properties_required = 0,
111351 + .properties_provided = 0,
111352 + .properties_destroyed = 0,
111353 + .todo_flags_start = 0,
111354 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
111355 +#if BUILDING_GCC_VERSION < 4009
111356 + }
111357 +#endif
111358 +};
111359 +
111360 +#if BUILDING_GCC_VERSION >= 4009
111361 +static const struct pass_data kernexec_fptr_pass_data = {
111362 +#else
111363 +static struct gimple_opt_pass kernexec_fptr_pass = {
111364 + .pass = {
111365 +#endif
111366 + .type = GIMPLE_PASS,
111367 + .name = "kernexec_fptr",
111368 +#if BUILDING_GCC_VERSION >= 4008
111369 + .optinfo_flags = OPTGROUP_NONE,
111370 +#endif
111371 +#if BUILDING_GCC_VERSION >= 4009
111372 + .has_gate = true,
111373 + .has_execute = true,
111374 +#else
111375 + .gate = kernexec_cmodel_check,
111376 + .execute = execute_kernexec_fptr,
111377 + .sub = NULL,
111378 + .next = NULL,
111379 + .static_pass_number = 0,
111380 +#endif
111381 + .tv_id = TV_NONE,
111382 + .properties_required = 0,
111383 + .properties_provided = 0,
111384 + .properties_destroyed = 0,
111385 + .todo_flags_start = 0,
111386 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
111387 +#if BUILDING_GCC_VERSION < 4009
111388 + }
111389 +#endif
111390 +};
111391 +
111392 +#if BUILDING_GCC_VERSION >= 4009
111393 +static const struct pass_data kernexec_retaddr_pass_data = {
111394 +#else
111395 +static struct rtl_opt_pass kernexec_retaddr_pass = {
111396 + .pass = {
111397 +#endif
111398 + .type = RTL_PASS,
111399 + .name = "kernexec_retaddr",
111400 +#if BUILDING_GCC_VERSION >= 4008
111401 + .optinfo_flags = OPTGROUP_NONE,
111402 +#endif
111403 +#if BUILDING_GCC_VERSION >= 4009
111404 + .has_gate = true,
111405 + .has_execute = true,
111406 +#else
111407 + .gate = kernexec_cmodel_check,
111408 + .execute = execute_kernexec_retaddr,
111409 + .sub = NULL,
111410 + .next = NULL,
111411 + .static_pass_number = 0,
111412 +#endif
111413 + .tv_id = TV_NONE,
111414 + .properties_required = 0,
111415 + .properties_provided = 0,
111416 + .properties_destroyed = 0,
111417 + .todo_flags_start = 0,
111418 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
111419 +#if BUILDING_GCC_VERSION < 4009
111420 + }
111421 +#endif
111422 +};
111423 +
111424 +#if BUILDING_GCC_VERSION >= 4009
111425 +namespace {
111426 +class kernexec_reload_pass : public gimple_opt_pass {
111427 +public:
111428 + kernexec_reload_pass() : gimple_opt_pass(kernexec_reload_pass_data, g) {}
111429 + bool gate() { return kernexec_cmodel_check(); }
111430 + unsigned int execute() { return execute_kernexec_reload(); }
111431 +};
111432 +
111433 +class kernexec_fptr_pass : public gimple_opt_pass {
111434 +public:
111435 + kernexec_fptr_pass() : gimple_opt_pass(kernexec_fptr_pass_data, g) {}
111436 + bool gate() { return kernexec_cmodel_check(); }
111437 + unsigned int execute() { return execute_kernexec_fptr(); }
111438 +};
111439 +
111440 +class kernexec_retaddr_pass : public rtl_opt_pass {
111441 +public:
111442 + kernexec_retaddr_pass() : rtl_opt_pass(kernexec_retaddr_pass_data, g) {}
111443 + bool gate() { return kernexec_cmodel_check(); }
111444 + unsigned int execute() { return execute_kernexec_retaddr(); }
111445 +};
111446 +}
111447 +
111448 +static opt_pass *make_kernexec_reload_pass(void)
111449 +{
111450 + return new kernexec_reload_pass();
111451 +}
111452 +
111453 +static opt_pass *make_kernexec_fptr_pass(void)
111454 +{
111455 + return new kernexec_fptr_pass();
111456 +}
111457 +
111458 +static opt_pass *make_kernexec_retaddr_pass(void)
111459 +{
111460 + return new kernexec_retaddr_pass();
111461 +}
111462 +#else
111463 +static struct opt_pass *make_kernexec_reload_pass(void)
111464 +{
111465 + return &kernexec_reload_pass.pass;
111466 +}
111467 +
111468 +static struct opt_pass *make_kernexec_fptr_pass(void)
111469 +{
111470 + return &kernexec_fptr_pass.pass;
111471 +}
111472 +
111473 +static struct opt_pass *make_kernexec_retaddr_pass(void)
111474 +{
111475 + return &kernexec_retaddr_pass.pass;
111476 +}
111477 +#endif
111478 +
111479 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
111480 +{
111481 + const char * const plugin_name = plugin_info->base_name;
111482 + const int argc = plugin_info->argc;
111483 + const struct plugin_argument * const argv = plugin_info->argv;
111484 + int i;
111485 + struct register_pass_info kernexec_reload_pass_info;
111486 + struct register_pass_info kernexec_fptr_pass_info;
111487 + struct register_pass_info kernexec_retaddr_pass_info;
111488 +
111489 + kernexec_reload_pass_info.pass = make_kernexec_reload_pass();
111490 + kernexec_reload_pass_info.reference_pass_name = "ssa";
111491 + kernexec_reload_pass_info.ref_pass_instance_number = 1;
111492 + kernexec_reload_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111493 +
111494 + kernexec_fptr_pass_info.pass = make_kernexec_fptr_pass();
111495 + kernexec_fptr_pass_info.reference_pass_name = "ssa";
111496 + kernexec_fptr_pass_info.ref_pass_instance_number = 1;
111497 + kernexec_fptr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111498 +
111499 + kernexec_retaddr_pass_info.pass = make_kernexec_retaddr_pass();
111500 + kernexec_retaddr_pass_info.reference_pass_name = "pro_and_epilogue";
111501 + kernexec_retaddr_pass_info.ref_pass_instance_number = 1;
111502 + kernexec_retaddr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111503 +
111504 + if (!plugin_default_version_check(version, &gcc_version)) {
111505 + error(G_("incompatible gcc/plugin versions"));
111506 + return 1;
111507 + }
111508 +
111509 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
111510 +
111511 + if (TARGET_64BIT == 0)
111512 + return 0;
111513 +
111514 + for (i = 0; i < argc; ++i) {
111515 + if (!strcmp(argv[i].key, "method")) {
111516 + if (!argv[i].value) {
111517 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
111518 + continue;
111519 + }
111520 + if (!strcmp(argv[i].value, "bts")) {
111521 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
111522 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
111523 + } else if (!strcmp(argv[i].value, "or")) {
111524 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
111525 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
111526 + fix_register("r12", 1, 1);
111527 + } else
111528 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
111529 + continue;
111530 + }
111531 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
111532 + }
111533 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
111534 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
111535 +
111536 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
111537 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
111538 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
111539 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
111540 +
111541 + return 0;
111542 +}
111543 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
111544 new file mode 100644
111545 index 0000000..e48b323
111546 --- /dev/null
111547 +++ b/tools/gcc/latent_entropy_plugin.c
111548 @@ -0,0 +1,466 @@
111549 +/*
111550 + * Copyright 2012-2014 by the PaX Team <pageexec@freemail.hu>
111551 + * Licensed under the GPL v2
111552 + *
111553 + * Note: the choice of the license means that the compilation process is
111554 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
111555 + * but for the kernel it doesn't matter since it doesn't link against
111556 + * any of the gcc libraries
111557 + *
111558 + * gcc plugin to help generate a little bit of entropy from program state,
111559 + * used throughout the uptime of the kernel
111560 + *
111561 + * TODO:
111562 + * - add ipa pass to identify not explicitly marked candidate functions
111563 + * - mix in more program state (function arguments/return values, loop variables, etc)
111564 + * - more instrumentation control via attribute parameters
111565 + *
111566 + * BUGS:
111567 + * - LTO needs -flto-partition=none for now
111568 + */
111569 +
111570 +#include "gcc-common.h"
111571 +
111572 +int plugin_is_GPL_compatible;
111573 +
111574 +static tree latent_entropy_decl;
111575 +
111576 +static struct plugin_info latent_entropy_plugin_info = {
111577 + .version = "201409101820",
111578 + .help = NULL
111579 +};
111580 +
111581 +static unsigned HOST_WIDE_INT seed;
111582 +static unsigned HOST_WIDE_INT get_random_const(void)
111583 +{
111584 + unsigned int i;
111585 + unsigned HOST_WIDE_INT ret = 0;
111586 +
111587 + for (i = 0; i < 8 * sizeof ret; i++) {
111588 + ret = (ret << 1) | (seed & 1);
111589 + seed >>= 1;
111590 + if (ret & 1)
111591 + seed ^= 0xD800000000000000ULL;
111592 + }
111593 +
111594 + return ret;
111595 +}
111596 +
111597 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
111598 +{
111599 + tree type;
111600 + unsigned long long mask;
111601 +#if BUILDING_GCC_VERSION <= 4007
111602 + VEC(constructor_elt, gc) *vals;
111603 +#else
111604 + vec<constructor_elt, va_gc> *vals;
111605 +#endif
111606 +
111607 + switch (TREE_CODE(*node)) {
111608 + default:
111609 + *no_add_attrs = true;
111610 + error("%qE attribute only applies to functions and variables", name);
111611 + break;
111612 +
111613 + case VAR_DECL:
111614 + if (DECL_INITIAL(*node)) {
111615 + *no_add_attrs = true;
111616 + error("variable %qD with %qE attribute must not be initialized", *node, name);
111617 + break;
111618 + }
111619 +
111620 + if (!TREE_STATIC(*node)) {
111621 + *no_add_attrs = true;
111622 + error("variable %qD with %qE attribute must not be local", *node, name);
111623 + break;
111624 + }
111625 +
111626 + type = TREE_TYPE(*node);
111627 + switch (TREE_CODE(type)) {
111628 + default:
111629 + *no_add_attrs = true;
111630 + 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);
111631 + break;
111632 +
111633 + case RECORD_TYPE: {
111634 + tree field;
111635 + unsigned int nelt = 0;
111636 +
111637 + for (field = TYPE_FIELDS(type); field; nelt++, field = TREE_CHAIN(field)) {
111638 + tree fieldtype;
111639 +
111640 + fieldtype = TREE_TYPE(field);
111641 + if (TREE_CODE(fieldtype) != INTEGER_TYPE) {
111642 + *no_add_attrs = true;
111643 + error("structure variable %qD with %qE attribute has a non-integer field %qE", *node, name, field);
111644 + break;
111645 + }
111646 + }
111647 +
111648 + if (field)
111649 + break;
111650 +
111651 +#if BUILDING_GCC_VERSION <= 4007
111652 + vals = VEC_alloc(constructor_elt, gc, nelt);
111653 +#else
111654 + vec_alloc(vals, nelt);
111655 +#endif
111656 +
111657 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
111658 + tree fieldtype;
111659 +
111660 + fieldtype = TREE_TYPE(field);
111661 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(fieldtype)) - 1);
111662 + mask = 2 * (mask - 1) + 1;
111663 +
111664 + if (TYPE_UNSIGNED(fieldtype))
111665 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cstu(fieldtype, mask & get_random_const()));
111666 + else
111667 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cst(fieldtype, mask & get_random_const()));
111668 + }
111669 +
111670 + DECL_INITIAL(*node) = build_constructor(type, vals);
111671 +//debug_tree(DECL_INITIAL(*node));
111672 + break;
111673 + }
111674 +
111675 + case INTEGER_TYPE:
111676 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(type)) - 1);
111677 + mask = 2 * (mask - 1) + 1;
111678 +
111679 + if (TYPE_UNSIGNED(type))
111680 + DECL_INITIAL(*node) = build_int_cstu(type, mask & get_random_const());
111681 + else
111682 + DECL_INITIAL(*node) = build_int_cst(type, mask & get_random_const());
111683 + break;
111684 +
111685 + case ARRAY_TYPE: {
111686 + tree elt_type, array_size, elt_size;
111687 + unsigned int i, nelt;
111688 +
111689 + elt_type = TREE_TYPE(type);
111690 + elt_size = TYPE_SIZE_UNIT(TREE_TYPE(type));
111691 + array_size = TYPE_SIZE_UNIT(type);
111692 +
111693 + if (TREE_CODE(elt_type) != INTEGER_TYPE || !array_size || TREE_CODE(array_size) != INTEGER_CST) {
111694 + *no_add_attrs = true;
111695 + error("array variable %qD with %qE attribute must be a fixed length integer array type", *node, name);
111696 + break;
111697 + }
111698 +
111699 + nelt = TREE_INT_CST_LOW(array_size) / TREE_INT_CST_LOW(elt_size);
111700 +#if BUILDING_GCC_VERSION <= 4007
111701 + vals = VEC_alloc(constructor_elt, gc, nelt);
111702 +#else
111703 + vec_alloc(vals, nelt);
111704 +#endif
111705 +
111706 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(elt_type)) - 1);
111707 + mask = 2 * (mask - 1) + 1;
111708 +
111709 + for (i = 0; i < nelt; i++)
111710 + if (TYPE_UNSIGNED(elt_type))
111711 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cstu(elt_type, mask & get_random_const()));
111712 + else
111713 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cst(elt_type, mask & get_random_const()));
111714 +
111715 + DECL_INITIAL(*node) = build_constructor(type, vals);
111716 +//debug_tree(DECL_INITIAL(*node));
111717 + break;
111718 + }
111719 + }
111720 + break;
111721 +
111722 + case FUNCTION_DECL:
111723 + break;
111724 + }
111725 +
111726 + return NULL_TREE;
111727 +}
111728 +
111729 +static struct attribute_spec latent_entropy_attr = {
111730 + .name = "latent_entropy",
111731 + .min_length = 0,
111732 + .max_length = 0,
111733 + .decl_required = true,
111734 + .type_required = false,
111735 + .function_type_required = false,
111736 + .handler = handle_latent_entropy_attribute,
111737 +#if BUILDING_GCC_VERSION >= 4007
111738 + .affects_type_identity = false
111739 +#endif
111740 +};
111741 +
111742 +static void register_attributes(void *event_data, void *data)
111743 +{
111744 + register_attribute(&latent_entropy_attr);
111745 +}
111746 +
111747 +static bool gate_latent_entropy(void)
111748 +{
111749 + // don't bother with noreturn functions for now
111750 + if (TREE_THIS_VOLATILE(current_function_decl))
111751 + return false;
111752 +
111753 + // gcc-4.5 doesn't discover some trivial noreturn functions
111754 + if (EDGE_COUNT(EXIT_BLOCK_PTR_FOR_FN(cfun)->preds) == 0)
111755 + return false;
111756 +
111757 + return lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl)) != NULL_TREE;
111758 +}
111759 +
111760 +static enum tree_code get_op(tree *rhs)
111761 +{
111762 + static enum tree_code op;
111763 + unsigned HOST_WIDE_INT random_const;
111764 +
111765 + random_const = get_random_const();
111766 +
111767 + switch (op) {
111768 + case BIT_XOR_EXPR:
111769 + op = PLUS_EXPR;
111770 + break;
111771 +
111772 + case PLUS_EXPR:
111773 + if (rhs) {
111774 + op = LROTATE_EXPR;
111775 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
111776 + break;
111777 + }
111778 +
111779 + case LROTATE_EXPR:
111780 + default:
111781 + op = BIT_XOR_EXPR;
111782 + break;
111783 + }
111784 + if (rhs)
111785 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
111786 + return op;
111787 +}
111788 +
111789 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
111790 +{
111791 + gimple_stmt_iterator gsi;
111792 + gimple assign;
111793 + tree addxorrol, rhs;
111794 + enum tree_code op;
111795 +
111796 + op = get_op(&rhs);
111797 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
111798 + assign = gimple_build_assign(local_entropy, addxorrol);
111799 + gsi = gsi_after_labels(bb);
111800 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
111801 + update_stmt(assign);
111802 +//debug_bb(bb);
111803 +}
111804 +
111805 +static void perturb_latent_entropy(basic_block bb, tree rhs)
111806 +{
111807 + gimple_stmt_iterator gsi;
111808 + gimple assign;
111809 + tree addxorrol, temp;
111810 +
111811 + // 1. create temporary copy of latent_entropy
111812 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
111813 + add_referenced_var(temp);
111814 +
111815 + // 2. read...
111816 + temp = make_ssa_name(temp, NULL);
111817 + assign = gimple_build_assign(temp, latent_entropy_decl);
111818 + SSA_NAME_DEF_STMT(temp) = assign;
111819 + add_referenced_var(latent_entropy_decl);
111820 + gsi = gsi_after_labels(bb);
111821 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111822 + update_stmt(assign);
111823 +
111824 + // 3. ...modify...
111825 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
111826 + temp = make_ssa_name(SSA_NAME_VAR(temp), NULL);
111827 + assign = gimple_build_assign(temp, addxorrol);
111828 + SSA_NAME_DEF_STMT(temp) = assign;
111829 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111830 + update_stmt(assign);
111831 +
111832 + // 4. ...write latent_entropy
111833 + assign = gimple_build_assign(latent_entropy_decl, temp);
111834 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111835 + update_stmt(assign);
111836 +}
111837 +
111838 +static unsigned int execute_latent_entropy(void)
111839 +{
111840 + basic_block bb;
111841 + gimple assign;
111842 + gimple_stmt_iterator gsi;
111843 + tree local_entropy;
111844 +
111845 + if (!latent_entropy_decl) {
111846 +#if BUILDING_GCC_VERSION >= 4009
111847 + varpool_node *node;
111848 +#else
111849 + struct varpool_node *node;
111850 +#endif
111851 +
111852 + FOR_EACH_VARIABLE(node) {
111853 + tree var = NODE_DECL(node);
111854 +
111855 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
111856 + continue;
111857 + latent_entropy_decl = var;
111858 +// debug_tree(var);
111859 + break;
111860 + }
111861 + if (!latent_entropy_decl) {
111862 +// debug_tree(current_function_decl);
111863 + return 0;
111864 + }
111865 + }
111866 +
111867 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
111868 +
111869 + // 1. create local entropy variable
111870 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
111871 + add_referenced_var(local_entropy);
111872 + mark_sym_for_renaming(local_entropy);
111873 +
111874 + // 2. initialize local entropy variable
111875 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
111876 + if (dom_info_available_p(CDI_DOMINATORS))
111877 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
111878 + gsi = gsi_start_bb(bb);
111879 +
111880 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
111881 +// gimple_set_location(assign, loc);
111882 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111883 + update_stmt(assign);
111884 +//debug_bb(bb);
111885 + gcc_assert(single_succ_p(bb));
111886 + bb = single_succ(bb);
111887 +
111888 + // 3. instrument each BB with an operation on the local entropy variable
111889 + while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {
111890 + perturb_local_entropy(bb, local_entropy);
111891 +//debug_bb(bb);
111892 + bb = bb->next_bb;
111893 + };
111894 +
111895 + // 4. mix local entropy into the global entropy variable
111896 + gcc_assert(single_pred_p(EXIT_BLOCK_PTR_FOR_FN(cfun)));
111897 + perturb_latent_entropy(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)), local_entropy);
111898 +//debug_bb(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)));
111899 + return 0;
111900 +}
111901 +
111902 +static void latent_entropy_start_unit(void *gcc_data, void *user_data)
111903 +{
111904 + tree latent_entropy_type;
111905 +
111906 + seed = get_random_seed(false);
111907 +
111908 + if (in_lto_p)
111909 + return;
111910 +
111911 + // extern volatile u64 latent_entropy
111912 + gcc_assert(TYPE_PRECISION(long_long_unsigned_type_node) == 64);
111913 + latent_entropy_type = build_qualified_type(long_long_unsigned_type_node, TYPE_QUALS(long_long_unsigned_type_node) | TYPE_QUAL_VOLATILE);
111914 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), latent_entropy_type);
111915 +
111916 + TREE_STATIC(latent_entropy_decl) = 1;
111917 + TREE_PUBLIC(latent_entropy_decl) = 1;
111918 + TREE_USED(latent_entropy_decl) = 1;
111919 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
111920 + DECL_EXTERNAL(latent_entropy_decl) = 1;
111921 + DECL_ARTIFICIAL(latent_entropy_decl) = 1;
111922 + lang_hooks.decls.pushdecl(latent_entropy_decl);
111923 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
111924 +// varpool_finalize_decl(latent_entropy_decl);
111925 +// varpool_mark_needed_node(latent_entropy_decl);
111926 +}
111927 +
111928 +#if BUILDING_GCC_VERSION >= 4009
111929 +static const struct pass_data latent_entropy_pass_data = {
111930 +#else
111931 +static struct gimple_opt_pass latent_entropy_pass = {
111932 + .pass = {
111933 +#endif
111934 + .type = GIMPLE_PASS,
111935 + .name = "latent_entropy",
111936 +#if BUILDING_GCC_VERSION >= 4008
111937 + .optinfo_flags = OPTGROUP_NONE,
111938 +#endif
111939 +#if BUILDING_GCC_VERSION >= 4009
111940 + .has_gate = true,
111941 + .has_execute = true,
111942 +#else
111943 + .gate = gate_latent_entropy,
111944 + .execute = execute_latent_entropy,
111945 + .sub = NULL,
111946 + .next = NULL,
111947 + .static_pass_number = 0,
111948 +#endif
111949 + .tv_id = TV_NONE,
111950 + .properties_required = PROP_gimple_leh | PROP_cfg,
111951 + .properties_provided = 0,
111952 + .properties_destroyed = 0,
111953 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
111954 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
111955 +#if BUILDING_GCC_VERSION < 4009
111956 + }
111957 +#endif
111958 +};
111959 +
111960 +#if BUILDING_GCC_VERSION >= 4009
111961 +namespace {
111962 +class latent_entropy_pass : public gimple_opt_pass {
111963 +public:
111964 + latent_entropy_pass() : gimple_opt_pass(latent_entropy_pass_data, g) {}
111965 + bool gate() { return gate_latent_entropy(); }
111966 + unsigned int execute() { return execute_latent_entropy(); }
111967 +};
111968 +}
111969 +
111970 +static opt_pass *make_latent_entropy_pass(void)
111971 +{
111972 + return new latent_entropy_pass();
111973 +}
111974 +#else
111975 +static struct opt_pass *make_latent_entropy_pass(void)
111976 +{
111977 + return &latent_entropy_pass.pass;
111978 +}
111979 +#endif
111980 +
111981 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
111982 +{
111983 + const char * const plugin_name = plugin_info->base_name;
111984 + struct register_pass_info latent_entropy_pass_info;
111985 +
111986 + latent_entropy_pass_info.pass = make_latent_entropy_pass();
111987 + latent_entropy_pass_info.reference_pass_name = "optimized";
111988 + latent_entropy_pass_info.ref_pass_instance_number = 1;
111989 + latent_entropy_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
111990 + static const struct ggc_root_tab gt_ggc_r_gt_latent_entropy[] = {
111991 + {
111992 + .base = &latent_entropy_decl,
111993 + .nelt = 1,
111994 + .stride = sizeof(latent_entropy_decl),
111995 + .cb = &gt_ggc_mx_tree_node,
111996 + .pchw = &gt_pch_nx_tree_node
111997 + },
111998 + LAST_GGC_ROOT_TAB
111999 + };
112000 +
112001 + if (!plugin_default_version_check(version, &gcc_version)) {
112002 + error(G_("incompatible gcc/plugin versions"));
112003 + return 1;
112004 + }
112005 +
112006 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
112007 + register_callback(plugin_name, PLUGIN_START_UNIT, &latent_entropy_start_unit, NULL);
112008 + if (!in_lto_p)
112009 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_latent_entropy);
112010 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
112011 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
112012 +
112013 + return 0;
112014 +}
112015 diff --git a/tools/gcc/randomize_layout_plugin.c b/tools/gcc/randomize_layout_plugin.c
112016 new file mode 100644
112017 index 0000000..a5cb46b
112018 --- /dev/null
112019 +++ b/tools/gcc/randomize_layout_plugin.c
112020 @@ -0,0 +1,915 @@
112021 +/*
112022 + * Copyright 2014 by Open Source Security, Inc., Brad Spengler <spender@grsecurity.net>
112023 + * and PaX Team <pageexec@freemail.hu>
112024 + * Licensed under the GPL v2
112025 + *
112026 + * Usage:
112027 + * $ # for 4.5/4.6/C based 4.7
112028 + * $ 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
112029 + * $ # for C++ based 4.7/4.8+
112030 + * $ 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
112031 + * $ gcc -fplugin=./randomize_layout_plugin.so test.c -O2
112032 + */
112033 +
112034 +#include "gcc-common.h"
112035 +#include "randomize_layout_seed.h"
112036 +
112037 +#if BUILDING_GCC_MAJOR < 4 || BUILDING_GCC_MINOR < 6 || (BUILDING_GCC_MINOR == 6 && BUILDING_GCC_PATCHLEVEL < 4)
112038 +#error "The RANDSTRUCT plugin requires GCC 4.6.4 or newer."
112039 +#endif
112040 +
112041 +#define ORIG_TYPE_NAME(node) \
112042 + (TYPE_NAME(TYPE_MAIN_VARIANT(node)) != NULL_TREE ? ((const unsigned char *)IDENTIFIER_POINTER(TYPE_NAME(TYPE_MAIN_VARIANT(node)))) : (const unsigned char *)"anonymous")
112043 +
112044 +int plugin_is_GPL_compatible;
112045 +
112046 +static int performance_mode;
112047 +
112048 +static struct plugin_info randomize_layout_plugin_info = {
112049 + .version = "201402201816",
112050 + .help = "disable\t\t\tdo not activate plugin\n"
112051 + "performance-mode\tenable cacheline-aware layout randomization\n"
112052 +};
112053 +
112054 +/* from old Linux dcache.h */
112055 +static inline unsigned long
112056 +partial_name_hash(unsigned long c, unsigned long prevhash)
112057 +{
112058 + return (prevhash + (c << 4) + (c >> 4)) * 11;
112059 +}
112060 +static inline unsigned int
112061 +name_hash(const unsigned char *name)
112062 +{
112063 + unsigned long hash = 0;
112064 + unsigned int len = strlen((const char *)name);
112065 + while (len--)
112066 + hash = partial_name_hash(*name++, hash);
112067 + return (unsigned int)hash;
112068 +}
112069 +
112070 +static tree handle_randomize_layout_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112071 +{
112072 + tree type;
112073 +
112074 + *no_add_attrs = true;
112075 + if (TREE_CODE(*node) == FUNCTION_DECL) {
112076 + error("%qE attribute does not apply to functions (%qF)", name, *node);
112077 + return NULL_TREE;
112078 + }
112079 +
112080 + if (TREE_CODE(*node) == PARM_DECL) {
112081 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
112082 + return NULL_TREE;
112083 + }
112084 +
112085 + if (TREE_CODE(*node) == VAR_DECL) {
112086 + error("%qE attribute does not apply to variables (%qD)", name, *node);
112087 + return NULL_TREE;
112088 + }
112089 +
112090 + if (TYPE_P(*node)) {
112091 + type = *node;
112092 + } else {
112093 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
112094 + type = TREE_TYPE(*node);
112095 + }
112096 +
112097 + if (TREE_CODE(type) != RECORD_TYPE) {
112098 + error("%qE attribute used on %qT applies to struct types only", name, type);
112099 + return NULL_TREE;
112100 + }
112101 +
112102 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
112103 + error("%qE attribute is already applied to the type %qT", name, type);
112104 + return NULL_TREE;
112105 + }
112106 +
112107 + *no_add_attrs = false;
112108 +
112109 + return NULL_TREE;
112110 +}
112111 +
112112 +/* set on complete types that we don't need to inspect further at all */
112113 +static tree handle_randomize_considered_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112114 +{
112115 + *no_add_attrs = false;
112116 + return NULL_TREE;
112117 +}
112118 +
112119 +/*
112120 + * set on types that we've performed a shuffle on, to prevent re-shuffling
112121 + * this does not preclude us from inspecting its fields for potential shuffles
112122 + */
112123 +static tree handle_randomize_performed_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112124 +{
112125 + *no_add_attrs = false;
112126 + return NULL_TREE;
112127 +}
112128 +
112129 +/*
112130 + * 64bit variant of Bob Jenkins' public domain PRNG
112131 + * 256 bits of internal state
112132 + */
112133 +
112134 +typedef unsigned long long u64;
112135 +
112136 +typedef struct ranctx { u64 a; u64 b; u64 c; u64 d; } ranctx;
112137 +
112138 +#define rot(x,k) (((x)<<(k))|((x)>>(64-(k))))
112139 +static u64 ranval(ranctx *x) {
112140 + u64 e = x->a - rot(x->b, 7);
112141 + x->a = x->b ^ rot(x->c, 13);
112142 + x->b = x->c + rot(x->d, 37);
112143 + x->c = x->d + e;
112144 + x->d = e + x->a;
112145 + return x->d;
112146 +}
112147 +
112148 +static void raninit(ranctx *x, u64 *seed) {
112149 + int i;
112150 +
112151 + x->a = seed[0];
112152 + x->b = seed[1];
112153 + x->c = seed[2];
112154 + x->d = seed[3];
112155 +
112156 + for (i=0; i < 30; ++i)
112157 + (void)ranval(x);
112158 +}
112159 +
112160 +static u64 shuffle_seed[4];
112161 +
112162 +struct partition_group {
112163 + tree tree_start;
112164 + unsigned long start;
112165 + unsigned long length;
112166 +};
112167 +
112168 +static void partition_struct(tree *fields, unsigned long length, struct partition_group *size_groups, unsigned long *num_groups)
112169 +{
112170 + unsigned long i;
112171 + unsigned long accum_size = 0;
112172 + unsigned long accum_length = 0;
112173 + unsigned long group_idx = 0;
112174 +
112175 + gcc_assert(length < INT_MAX);
112176 +
112177 + memset(size_groups, 0, sizeof(struct partition_group) * length);
112178 +
112179 + for (i = 0; i < length; i++) {
112180 + if (size_groups[group_idx].tree_start == NULL_TREE) {
112181 + size_groups[group_idx].tree_start = fields[i];
112182 + size_groups[group_idx].start = i;
112183 + accum_length = 0;
112184 + accum_size = 0;
112185 + }
112186 + accum_size += (unsigned long)int_size_in_bytes(TREE_TYPE(fields[i]));
112187 + accum_length++;
112188 + if (accum_size >= 64) {
112189 + size_groups[group_idx].length = accum_length;
112190 + accum_length = 0;
112191 + group_idx++;
112192 + }
112193 + }
112194 +
112195 + if (size_groups[group_idx].tree_start != NULL_TREE &&
112196 + !size_groups[group_idx].length) {
112197 + size_groups[group_idx].length = accum_length;
112198 + group_idx++;
112199 + }
112200 +
112201 + *num_groups = group_idx;
112202 +}
112203 +
112204 +static void performance_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
112205 +{
112206 + unsigned long i, x;
112207 + struct partition_group size_group[length];
112208 + unsigned long num_groups = 0;
112209 + unsigned long randnum;
112210 +
112211 + partition_struct(newtree, length, (struct partition_group *)&size_group, &num_groups);
112212 + for (i = num_groups - 1; i > 0; i--) {
112213 + struct partition_group tmp;
112214 + randnum = ranval(prng_state) % (i + 1);
112215 + tmp = size_group[i];
112216 + size_group[i] = size_group[randnum];
112217 + size_group[randnum] = tmp;
112218 + }
112219 +
112220 + for (x = 0; x < num_groups; x++) {
112221 + for (i = size_group[x].start + size_group[x].length - 1; i > size_group[x].start; i--) {
112222 + tree tmp;
112223 + if (DECL_BIT_FIELD_TYPE(newtree[i]))
112224 + continue;
112225 + randnum = ranval(prng_state) % (i + 1);
112226 + // we could handle this case differently if desired
112227 + if (DECL_BIT_FIELD_TYPE(newtree[randnum]))
112228 + continue;
112229 + tmp = newtree[i];
112230 + newtree[i] = newtree[randnum];
112231 + newtree[randnum] = tmp;
112232 + }
112233 + }
112234 +}
112235 +
112236 +static void full_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
112237 +{
112238 + unsigned long i, randnum;
112239 +
112240 + for (i = length - 1; i > 0; i--) {
112241 + tree tmp;
112242 + randnum = ranval(prng_state) % (i + 1);
112243 + tmp = newtree[i];
112244 + newtree[i] = newtree[randnum];
112245 + newtree[randnum] = tmp;
112246 + }
112247 +}
112248 +
112249 +/* modern in-place Fisher-Yates shuffle */
112250 +static void shuffle(const_tree type, tree *newtree, unsigned long length)
112251 +{
112252 + unsigned long i;
112253 + u64 seed[4];
112254 + ranctx prng_state;
112255 + const unsigned char *structname;
112256 +
112257 + if (length == 0)
112258 + return;
112259 +
112260 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112261 +
112262 + structname = ORIG_TYPE_NAME(type);
112263 +
112264 +#ifdef __DEBUG_PLUGIN
112265 + fprintf(stderr, "Shuffling struct %s %p\n", (const char *)structname, type);
112266 +#ifdef __DEBUG_VERBOSE
112267 + debug_tree((tree)type);
112268 +#endif
112269 +#endif
112270 +
112271 + for (i = 0; i < 4; i++) {
112272 + seed[i] = shuffle_seed[i];
112273 + seed[i] ^= name_hash(structname);
112274 + }
112275 +
112276 + raninit(&prng_state, (u64 *)&seed);
112277 +
112278 + if (performance_mode)
112279 + performance_shuffle(newtree, length, &prng_state);
112280 + else
112281 + full_shuffle(newtree, length, &prng_state);
112282 +}
112283 +
112284 +static bool is_flexible_array(const_tree field)
112285 +{
112286 + const_tree fieldtype;
112287 + const_tree typesize;
112288 + const_tree elemtype;
112289 + const_tree elemsize;
112290 +
112291 + fieldtype = TREE_TYPE(field);
112292 + typesize = TYPE_SIZE(fieldtype);
112293 +
112294 + if (TREE_CODE(fieldtype) != ARRAY_TYPE)
112295 + return false;
112296 +
112297 + elemtype = TREE_TYPE(fieldtype);
112298 + elemsize = TYPE_SIZE(elemtype);
112299 +
112300 + /* size of type is represented in bits */
112301 +
112302 + if (typesize == NULL_TREE && TYPE_DOMAIN(fieldtype) != NULL_TREE &&
112303 + TYPE_MAX_VALUE(TYPE_DOMAIN(fieldtype)) == NULL_TREE)
112304 + return true;
112305 +
112306 + if (typesize != NULL_TREE &&
112307 + (TREE_CONSTANT(typesize) && (!TREE_INT_CST_LOW(typesize) ||
112308 + TREE_INT_CST_LOW(typesize) == TREE_INT_CST_LOW(elemsize))))
112309 + return true;
112310 +
112311 + return false;
112312 +}
112313 +
112314 +static int relayout_struct(tree type)
112315 +{
112316 + unsigned long num_fields = (unsigned long)list_length(TYPE_FIELDS(type));
112317 + unsigned long shuffle_length = num_fields;
112318 + tree field;
112319 + tree newtree[num_fields];
112320 + unsigned long i;
112321 + tree list;
112322 + tree variant;
112323 + expanded_location xloc;
112324 +
112325 + if (TYPE_FIELDS(type) == NULL_TREE)
112326 + return 0;
112327 +
112328 + if (num_fields < 2)
112329 + return 0;
112330 +
112331 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112332 +
112333 + gcc_assert(num_fields < INT_MAX);
112334 +
112335 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)) ||
112336 + lookup_attribute("no_randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))))
112337 + return 0;
112338 +
112339 + /* Workaround for 3rd-party VirtualBox source that we can't modify ourselves */
112340 + if (!strcmp((const char *)ORIG_TYPE_NAME(type), "INTNETTRUNKFACTORY") ||
112341 + !strcmp((const char *)ORIG_TYPE_NAME(type), "RAWPCIFACTORY"))
112342 + return 0;
112343 +
112344 + /* throw out any structs in uapi */
112345 + xloc = expand_location(DECL_SOURCE_LOCATION(TYPE_FIELDS(type)));
112346 +
112347 + if (strstr(xloc.file, "/uapi/"))
112348 + error(G_("attempted to randomize userland API struct %s"), ORIG_TYPE_NAME(type));
112349 +
112350 + for (field = TYPE_FIELDS(type), i = 0; field; field = TREE_CHAIN(field), i++) {
112351 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
112352 + newtree[i] = field;
112353 + }
112354 +
112355 + /*
112356 + * enforce that we don't randomize the layout of the last
112357 + * element of a struct if it's a 0 or 1-length array
112358 + * or a proper flexible array
112359 + */
112360 + if (is_flexible_array(newtree[num_fields - 1]))
112361 + shuffle_length--;
112362 +
112363 + shuffle(type, (tree *)newtree, shuffle_length);
112364 +
112365 + /*
112366 + * set up a bogus anonymous struct field designed to error out on unnamed struct initializers
112367 + * as gcc provides no other way to detect such code
112368 + */
112369 + list = make_node(FIELD_DECL);
112370 + TREE_CHAIN(list) = newtree[0];
112371 + TREE_TYPE(list) = void_type_node;
112372 + DECL_SIZE(list) = bitsize_zero_node;
112373 + DECL_NONADDRESSABLE_P(list) = 1;
112374 + DECL_FIELD_BIT_OFFSET(list) = bitsize_zero_node;
112375 + DECL_SIZE_UNIT(list) = size_zero_node;
112376 + DECL_FIELD_OFFSET(list) = size_zero_node;
112377 + // to satisfy the constify plugin
112378 + TREE_READONLY(list) = 1;
112379 +
112380 + for (i = 0; i < num_fields - 1; i++)
112381 + TREE_CHAIN(newtree[i]) = newtree[i+1];
112382 + TREE_CHAIN(newtree[num_fields - 1]) = NULL_TREE;
112383 +
112384 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
112385 + TYPE_FIELDS(variant) = list;
112386 + TYPE_ATTRIBUTES(variant) = copy_list(TYPE_ATTRIBUTES(variant));
112387 + TYPE_ATTRIBUTES(variant) = tree_cons(get_identifier("randomize_performed"), NULL_TREE, TYPE_ATTRIBUTES(variant));
112388 + // force a re-layout
112389 + TYPE_SIZE(variant) = NULL_TREE;
112390 + layout_type(variant);
112391 + }
112392 +
112393 + return 1;
112394 +}
112395 +
112396 +/* from constify plugin */
112397 +static const_tree get_field_type(const_tree field)
112398 +{
112399 + return strip_array_types(TREE_TYPE(field));
112400 +}
112401 +
112402 +/* from constify plugin */
112403 +static bool is_fptr(const_tree fieldtype)
112404 +{
112405 + if (TREE_CODE(fieldtype) != POINTER_TYPE)
112406 + return false;
112407 +
112408 + return TREE_CODE(TREE_TYPE(fieldtype)) == FUNCTION_TYPE;
112409 +}
112410 +
112411 +/* derived from constify plugin */
112412 +static int is_pure_ops_struct(const_tree node)
112413 +{
112414 + const_tree field;
112415 +
112416 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
112417 +
112418 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
112419 + const_tree fieldtype = get_field_type(field);
112420 + enum tree_code code = TREE_CODE(fieldtype);
112421 +
112422 + if (node == fieldtype)
112423 + continue;
112424 +
112425 + if (!is_fptr(fieldtype))
112426 + return 0;
112427 +
112428 + if (code != RECORD_TYPE && code != UNION_TYPE)
112429 + continue;
112430 +
112431 + if (!is_pure_ops_struct(fieldtype))
112432 + return 0;
112433 + }
112434 +
112435 + return 1;
112436 +}
112437 +
112438 +static void randomize_type(tree type)
112439 +{
112440 + tree variant;
112441 +
112442 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112443 +
112444 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
112445 + return;
112446 +
112447 + if (lookup_attribute("randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))) || is_pure_ops_struct(type))
112448 + relayout_struct(type);
112449 +
112450 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
112451 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
112452 + TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("randomize_considered"), NULL_TREE, TYPE_ATTRIBUTES(type));
112453 + }
112454 +#ifdef __DEBUG_PLUGIN
112455 + fprintf(stderr, "Marking randomize_considered on struct %s\n", ORIG_TYPE_NAME(type));
112456 +#ifdef __DEBUG_VERBOSE
112457 + debug_tree(type);
112458 +#endif
112459 +#endif
112460 +}
112461 +
112462 +static void randomize_layout_finish_decl(void *event_data, void *data)
112463 +{
112464 + tree decl = (tree)event_data;
112465 + tree type;
112466 +
112467 + if (decl == NULL_TREE || decl == error_mark_node)
112468 + return;
112469 +
112470 + type = TREE_TYPE(decl);
112471 +
112472 + if (TREE_CODE(decl) != VAR_DECL)
112473 + return;
112474 +
112475 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
112476 + return;
112477 +
112478 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)))
112479 + return;
112480 +
112481 + relayout_decl(decl);
112482 +}
112483 +
112484 +static void finish_type(void *event_data, void *data)
112485 +{
112486 + tree type = (tree)event_data;
112487 +
112488 + if (type == NULL_TREE || type == error_mark_node)
112489 + return;
112490 +
112491 + if (TREE_CODE(type) != RECORD_TYPE)
112492 + return;
112493 +
112494 + if (TYPE_FIELDS(type) == NULL_TREE)
112495 + return;
112496 +
112497 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
112498 + return;
112499 +
112500 +#ifdef __DEBUG_PLUGIN
112501 + fprintf(stderr, "Calling randomize_type on %s\n", ORIG_TYPE_NAME(type));
112502 +#endif
112503 +#ifdef __DEBUG_VERBOSE
112504 + debug_tree(type);
112505 +#endif
112506 + randomize_type(type);
112507 +
112508 + return;
112509 +}
112510 +
112511 +static struct attribute_spec randomize_layout_attr = {
112512 + .name = "randomize_layout",
112513 + // related to args
112514 + .min_length = 0,
112515 + .max_length = 0,
112516 + .decl_required = false,
112517 + // need type declaration
112518 + .type_required = true,
112519 + .function_type_required = false,
112520 + .handler = handle_randomize_layout_attr,
112521 +#if BUILDING_GCC_VERSION >= 4007
112522 + .affects_type_identity = true
112523 +#endif
112524 +};
112525 +
112526 +static struct attribute_spec no_randomize_layout_attr = {
112527 + .name = "no_randomize_layout",
112528 + // related to args
112529 + .min_length = 0,
112530 + .max_length = 0,
112531 + .decl_required = false,
112532 + // need type declaration
112533 + .type_required = true,
112534 + .function_type_required = false,
112535 + .handler = handle_randomize_layout_attr,
112536 +#if BUILDING_GCC_VERSION >= 4007
112537 + .affects_type_identity = true
112538 +#endif
112539 +};
112540 +
112541 +static struct attribute_spec randomize_considered_attr = {
112542 + .name = "randomize_considered",
112543 + // related to args
112544 + .min_length = 0,
112545 + .max_length = 0,
112546 + .decl_required = false,
112547 + // need type declaration
112548 + .type_required = true,
112549 + .function_type_required = false,
112550 + .handler = handle_randomize_considered_attr,
112551 +#if BUILDING_GCC_VERSION >= 4007
112552 + .affects_type_identity = false
112553 +#endif
112554 +};
112555 +
112556 +static struct attribute_spec randomize_performed_attr = {
112557 + .name = "randomize_performed",
112558 + // related to args
112559 + .min_length = 0,
112560 + .max_length = 0,
112561 + .decl_required = false,
112562 + // need type declaration
112563 + .type_required = true,
112564 + .function_type_required = false,
112565 + .handler = handle_randomize_performed_attr,
112566 +#if BUILDING_GCC_VERSION >= 4007
112567 + .affects_type_identity = false
112568 +#endif
112569 +};
112570 +
112571 +static void register_attributes(void *event_data, void *data)
112572 +{
112573 + register_attribute(&randomize_layout_attr);
112574 + register_attribute(&no_randomize_layout_attr);
112575 + register_attribute(&randomize_considered_attr);
112576 + register_attribute(&randomize_performed_attr);
112577 +}
112578 +
112579 +static void check_bad_casts_in_constructor(tree var, tree init)
112580 +{
112581 + unsigned HOST_WIDE_INT idx;
112582 + tree field, val;
112583 + tree field_type, val_type;
112584 +
112585 + FOR_EACH_CONSTRUCTOR_ELT(CONSTRUCTOR_ELTS(init), idx, field, val) {
112586 + if (TREE_CODE(val) == CONSTRUCTOR) {
112587 + check_bad_casts_in_constructor(var, val);
112588 + continue;
112589 + }
112590 +
112591 + /* pipacs' plugin creates franken-arrays that differ from those produced by
112592 + normal code which all have valid 'field' trees. work around this */
112593 + if (field == NULL_TREE)
112594 + continue;
112595 + field_type = TREE_TYPE(field);
112596 + val_type = TREE_TYPE(val);
112597 +
112598 + if (TREE_CODE(field_type) != POINTER_TYPE || TREE_CODE(val_type) != POINTER_TYPE)
112599 + continue;
112600 +
112601 + if (field_type == val_type)
112602 + continue;
112603 +
112604 + field_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(field_type))));
112605 + val_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(val_type))));
112606 +
112607 + if (field_type == void_type_node)
112608 + continue;
112609 + if (field_type == val_type)
112610 + continue;
112611 + if (TREE_CODE(val_type) != RECORD_TYPE)
112612 + continue;
112613 +
112614 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(val_type)))
112615 + continue;
112616 + inform(DECL_SOURCE_LOCATION(var), "found mismatched struct pointer types: %qT and %qT\n", TYPE_MAIN_VARIANT(field_type), TYPE_MAIN_VARIANT(val_type));
112617 + }
112618 +}
112619 +
112620 +/* derived from the constify plugin */
112621 +static void check_global_variables(void *event_data, void *data)
112622 +{
112623 + struct varpool_node *node;
112624 + tree init;
112625 +
112626 + FOR_EACH_VARIABLE(node) {
112627 + tree var = NODE_DECL(node);
112628 + init = DECL_INITIAL(var);
112629 + if (init == NULL_TREE)
112630 + continue;
112631 +
112632 + if (TREE_CODE(init) != CONSTRUCTOR)
112633 + continue;
112634 +
112635 + check_bad_casts_in_constructor(var, init);
112636 + }
112637 +}
112638 +
112639 +static bool dominated_by_is_err(const_tree rhs, basic_block bb)
112640 +{
112641 + basic_block dom;
112642 + gimple dom_stmt;
112643 + gimple call_stmt;
112644 + const_tree dom_lhs;
112645 + const_tree poss_is_err_cond;
112646 + const_tree poss_is_err_func;
112647 + const_tree is_err_arg;
112648 +
112649 + dom = get_immediate_dominator(CDI_DOMINATORS, bb);
112650 + if (!dom)
112651 + return false;
112652 +
112653 + dom_stmt = last_stmt(dom);
112654 + if (!dom_stmt)
112655 + return false;
112656 +
112657 + if (gimple_code(dom_stmt) != GIMPLE_COND)
112658 + return false;
112659 +
112660 + if (gimple_cond_code(dom_stmt) != NE_EXPR)
112661 + return false;
112662 +
112663 + if (!integer_zerop(gimple_cond_rhs(dom_stmt)))
112664 + return false;
112665 +
112666 + poss_is_err_cond = gimple_cond_lhs(dom_stmt);
112667 +
112668 + if (TREE_CODE(poss_is_err_cond) != SSA_NAME)
112669 + return false;
112670 +
112671 + call_stmt = SSA_NAME_DEF_STMT(poss_is_err_cond);
112672 +
112673 + if (gimple_code(call_stmt) != GIMPLE_CALL)
112674 + return false;
112675 +
112676 + dom_lhs = gimple_get_lhs(call_stmt);
112677 + poss_is_err_func = gimple_call_fndecl(call_stmt);
112678 + if (!poss_is_err_func)
112679 + return false;
112680 + if (dom_lhs != poss_is_err_cond)
112681 + return false;
112682 + if (strcmp(DECL_NAME_POINTER(poss_is_err_func), "IS_ERR"))
112683 + return false;
112684 +
112685 + is_err_arg = gimple_call_arg(call_stmt, 0);
112686 + if (!is_err_arg)
112687 + return false;
112688 +
112689 + if (is_err_arg != rhs)
112690 + return false;
112691 +
112692 + return true;
112693 +}
112694 +
112695 +static void handle_local_var_initializers(void)
112696 +{
112697 + tree var;
112698 + unsigned int i;
112699 +
112700 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
112701 + tree init = DECL_INITIAL(var);
112702 + if (!init)
112703 + continue;
112704 + if (TREE_CODE(init) != CONSTRUCTOR)
112705 + continue;
112706 + check_bad_casts_in_constructor(var, init);
112707 + }
112708 +}
112709 +
112710 +/*
112711 + * iterate over all statements to find "bad" casts:
112712 + * those where the address of the start of a structure is cast
112713 + * to a pointer of a structure of a different type, or a
112714 + * structure pointer type is cast to a different structure pointer type
112715 + */
112716 +static unsigned int find_bad_casts(void)
112717 +{
112718 + basic_block bb;
112719 +
112720 + handle_local_var_initializers();
112721 +
112722 + FOR_ALL_BB_FN(bb, cfun) {
112723 + gimple_stmt_iterator gsi;
112724 +
112725 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
112726 + gimple stmt;
112727 + const_tree lhs;
112728 + const_tree lhs_type;
112729 + const_tree rhs1;
112730 + const_tree rhs_type;
112731 + const_tree ptr_lhs_type;
112732 + const_tree ptr_rhs_type;
112733 + const_tree op0;
112734 + const_tree op0_type;
112735 + enum tree_code rhs_code;
112736 +
112737 + stmt = gsi_stmt(gsi);
112738 +
112739 +#ifdef __DEBUG_PLUGIN
112740 +#ifdef __DEBUG_VERBOSE
112741 + debug_gimple_stmt(stmt);
112742 + debug_tree(gimple_get_lhs(stmt));
112743 +#endif
112744 +#endif
112745 +
112746 + if (gimple_code(stmt) != GIMPLE_ASSIGN)
112747 + continue;
112748 +
112749 +#ifdef __DEBUG_PLUGIN
112750 +#ifdef __DEBUG_VERBOSE
112751 + debug_tree(gimple_assign_rhs1(stmt));
112752 +#endif
112753 +#endif
112754 +
112755 + rhs_code = gimple_assign_rhs_code(stmt);
112756 +
112757 + if (rhs_code != ADDR_EXPR && rhs_code != SSA_NAME)
112758 + continue;
112759 +
112760 + lhs = gimple_get_lhs(stmt);
112761 + lhs_type = TREE_TYPE(lhs);
112762 + rhs1 = gimple_assign_rhs1(stmt);
112763 + rhs_type = TREE_TYPE(rhs1);
112764 +
112765 + if (TREE_CODE(rhs_type) != POINTER_TYPE ||
112766 + TREE_CODE(lhs_type) != POINTER_TYPE)
112767 + continue;
112768 +
112769 + ptr_lhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(lhs_type))));
112770 + ptr_rhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(rhs_type))));
112771 +
112772 + if (ptr_rhs_type == void_type_node)
112773 + continue;
112774 +
112775 + if (ptr_lhs_type == void_type_node)
112776 + continue;
112777 +
112778 + if (dominated_by_is_err(rhs1, bb))
112779 + continue;
112780 +
112781 + if (TREE_CODE(ptr_rhs_type) != RECORD_TYPE) {
112782 +#ifndef __DEBUG_PLUGIN
112783 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_lhs_type)))
112784 +#endif
112785 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
112786 + continue;
112787 + }
112788 +
112789 + if (rhs_code == SSA_NAME && ptr_lhs_type == ptr_rhs_type)
112790 + continue;
112791 +
112792 + if (rhs_code == ADDR_EXPR) {
112793 + op0 = TREE_OPERAND(rhs1, 0);
112794 +
112795 + if (op0 == NULL_TREE)
112796 + continue;
112797 +
112798 + if (TREE_CODE(op0) != VAR_DECL)
112799 + continue;
112800 +
112801 + op0_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(op0))));
112802 + if (op0_type == ptr_lhs_type)
112803 + continue;
112804 +
112805 +#ifndef __DEBUG_PLUGIN
112806 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(op0_type)))
112807 +#endif
112808 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, op0_type);
112809 + } else {
112810 + const_tree ssa_name_var = SSA_NAME_VAR(rhs1);
112811 + /* skip bogus type casts introduced by container_of */
112812 + if (ssa_name_var != NULL_TREE && DECL_NAME(ssa_name_var) &&
112813 + !strcmp((const char *)DECL_NAME_POINTER(ssa_name_var), "__mptr"))
112814 + continue;
112815 +#ifndef __DEBUG_PLUGIN
112816 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_rhs_type)))
112817 +#endif
112818 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
112819 + }
112820 +
112821 + }
112822 + }
112823 + return 0;
112824 +}
112825 +
112826 +#if BUILDING_GCC_VERSION >= 4009
112827 +static const struct pass_data randomize_layout_bad_cast_data = {
112828 +#else
112829 +static struct gimple_opt_pass randomize_layout_bad_cast = {
112830 + .pass = {
112831 +#endif
112832 + .type = GIMPLE_PASS,
112833 + .name = "randomize_layout_bad_cast",
112834 +#if BUILDING_GCC_VERSION >= 4008
112835 + .optinfo_flags = OPTGROUP_NONE,
112836 +#endif
112837 +#if BUILDING_GCC_VERSION >= 4009
112838 + .has_gate = false,
112839 + .has_execute = true,
112840 +#else
112841 + .gate = NULL,
112842 + .execute = find_bad_casts,
112843 + .sub = NULL,
112844 + .next = NULL,
112845 + .static_pass_number = 0,
112846 +#endif
112847 + .tv_id = TV_NONE,
112848 + .properties_required = PROP_cfg,
112849 + .properties_provided = 0,
112850 + .properties_destroyed = 0,
112851 + .todo_flags_start = 0,
112852 + .todo_flags_finish = TODO_dump_func
112853 +#if BUILDING_GCC_VERSION < 4009
112854 + }
112855 +#endif
112856 +};
112857 +
112858 +#if BUILDING_GCC_VERSION >= 4009
112859 +namespace {
112860 +class randomize_layout_bad_cast : public gimple_opt_pass {
112861 +public:
112862 + randomize_layout_bad_cast() : gimple_opt_pass(randomize_layout_bad_cast_data, g) {}
112863 + unsigned int execute() { return find_bad_casts(); }
112864 +};
112865 +}
112866 +#endif
112867 +
112868 +static struct opt_pass *make_randomize_layout_bad_cast(void)
112869 +{
112870 +#if BUILDING_GCC_VERSION >= 4009
112871 + return new randomize_layout_bad_cast();
112872 +#else
112873 + return &randomize_layout_bad_cast.pass;
112874 +#endif
112875 +}
112876 +
112877 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
112878 +{
112879 + int i;
112880 + const char * const plugin_name = plugin_info->base_name;
112881 + const int argc = plugin_info->argc;
112882 + const struct plugin_argument * const argv = plugin_info->argv;
112883 + bool enable = true;
112884 + int obtained_seed = 0;
112885 + struct register_pass_info randomize_layout_bad_cast_info;
112886 +
112887 + randomize_layout_bad_cast_info.pass = make_randomize_layout_bad_cast();
112888 + randomize_layout_bad_cast_info.reference_pass_name = "ssa";
112889 + randomize_layout_bad_cast_info.ref_pass_instance_number = 1;
112890 + randomize_layout_bad_cast_info.pos_op = PASS_POS_INSERT_AFTER;
112891 +
112892 + if (!plugin_default_version_check(version, &gcc_version)) {
112893 + error(G_("incompatible gcc/plugin versions"));
112894 + return 1;
112895 + }
112896 +
112897 + if (strcmp(lang_hooks.name, "GNU C")) {
112898 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
112899 + enable = false;
112900 + }
112901 +
112902 + for (i = 0; i < argc; ++i) {
112903 + if (!strcmp(argv[i].key, "disable")) {
112904 + enable = false;
112905 + continue;
112906 + }
112907 + if (!strcmp(argv[i].key, "performance-mode")) {
112908 + performance_mode = 1;
112909 + continue;
112910 + }
112911 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
112912 + }
112913 +
112914 + if (strlen(randstruct_seed) != 64) {
112915 + error(G_("invalid seed value supplied for %s plugin"), plugin_name);
112916 + return 1;
112917 + }
112918 + obtained_seed = sscanf(randstruct_seed, "%016llx%016llx%016llx%016llx",
112919 + &shuffle_seed[0], &shuffle_seed[1], &shuffle_seed[2], &shuffle_seed[3]);
112920 + if (obtained_seed != 4) {
112921 + error(G_("Invalid seed supplied for %s plugin"), plugin_name);
112922 + return 1;
112923 + }
112924 +
112925 + register_callback(plugin_name, PLUGIN_INFO, NULL, &randomize_layout_plugin_info);
112926 + if (enable) {
112927 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
112928 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &randomize_layout_bad_cast_info);
112929 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
112930 + register_callback(plugin_name, PLUGIN_FINISH_DECL, randomize_layout_finish_decl, NULL);
112931 + }
112932 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
112933 +
112934 + return 0;
112935 +}
112936 diff --git a/tools/gcc/size_overflow_plugin/.gitignore b/tools/gcc/size_overflow_plugin/.gitignore
112937 new file mode 100644
112938 index 0000000..1f0214f
112939 --- /dev/null
112940 +++ b/tools/gcc/size_overflow_plugin/.gitignore
112941 @@ -0,0 +1,3 @@
112942 +randomize_layout_seed.h
112943 +size_overflow_hash.h
112944 +size_overflow_hash_aux.h
112945 diff --git a/tools/gcc/size_overflow_plugin/Makefile b/tools/gcc/size_overflow_plugin/Makefile
112946 new file mode 100644
112947 index 0000000..1ae2ed5
112948 --- /dev/null
112949 +++ b/tools/gcc/size_overflow_plugin/Makefile
112950 @@ -0,0 +1,20 @@
112951 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
112952 +always := $($(HOSTLIBS)-y)
112953 +
112954 +size_overflow_plugin-objs := $(patsubst $(srctree)/$(src)/%.c,%.o,$(wildcard $(srctree)/$(src)/*.c))
112955 +
112956 +$(patsubst $(srctree)/$(src)/%.c,$(obj)/%.o,$(wildcard $(srctree)/$(src)/*.c)): $(objtree)/$(obj)/size_overflow_hash.h $(objtree)/$(obj)/size_overflow_hash_aux.h
112957 +
112958 +quiet_cmd_build_size_overflow_hash = GENHASH $@
112959 + cmd_build_size_overflow_hash = \
112960 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash -d $< -o $@
112961 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
112962 + $(call if_changed,build_size_overflow_hash)
112963 +
112964 +quiet_cmd_build_size_overflow_hash_aux = GENHASH $@
112965 + cmd_build_size_overflow_hash_aux = \
112966 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash_aux -d $< -o $@
112967 +$(objtree)/$(obj)/size_overflow_hash_aux.h: $(src)/size_overflow_hash_aux.data FORCE
112968 + $(call if_changed,build_size_overflow_hash_aux)
112969 +
112970 +targets += size_overflow_hash.h size_overflow_hash_aux.h
112971 diff --git a/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
112972 new file mode 100644
112973 index 0000000..12b1e3b
112974 --- /dev/null
112975 +++ b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
112976 @@ -0,0 +1,102 @@
112977 +#!/bin/bash
112978 +
112979 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
112980 +
112981 +header1="size_overflow_hash.h"
112982 +database="size_overflow_hash.data"
112983 +n=65536
112984 +hashtable_name="size_overflow_hash"
112985 +
112986 +usage() {
112987 +cat <<EOF
112988 +usage: $0 options
112989 +OPTIONS:
112990 + -h|--help help
112991 + -o header file
112992 + -d database file
112993 + -n hash array size
112994 + -s name of the hash table
112995 +EOF
112996 + return 0
112997 +}
112998 +
112999 +while true
113000 +do
113001 + case "$1" in
113002 + -h|--help) usage && exit 0;;
113003 + -n) n=$2; shift 2;;
113004 + -o) header1="$2"; shift 2;;
113005 + -d) database="$2"; shift 2;;
113006 + -s) hashtable_name="$2"; shift 2;;
113007 + --) shift 1; break ;;
113008 + *) break ;;
113009 + esac
113010 +done
113011 +
113012 +create_defines() {
113013 + for i in `seq 0 31`
113014 + do
113015 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
113016 + done
113017 + echo >> "$header1"
113018 +}
113019 +
113020 +create_structs() {
113021 + rm -f "$header1"
113022 +
113023 + create_defines
113024 +
113025 + cat "$database" | while read data
113026 + do
113027 + data_array=($data)
113028 + struct_hash_name="${data_array[0]}"
113029 + funcn="${data_array[1]}"
113030 + params="${data_array[2]}"
113031 + next="${data_array[4]}"
113032 +
113033 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
113034 +
113035 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
113036 + echo -en "\t.param\t= " >> "$header1"
113037 + line=
113038 + for param_num in ${params//-/ };
113039 + do
113040 + line="${line}PARAM"$param_num"|"
113041 + done
113042 +
113043 + echo -e "${line%?},\n};\n" >> "$header1"
113044 + done
113045 +}
113046 +
113047 +create_headers() {
113048 + echo "const struct size_overflow_hash * const $hashtable_name[$n] = {" >> "$header1"
113049 +}
113050 +
113051 +create_array_elements() {
113052 + index=0
113053 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
113054 + do
113055 + data_array=($data)
113056 + i="${data_array[3]}"
113057 + hash="${data_array[0]}"
113058 + while [[ $index -lt $i ]]
113059 + do
113060 + echo -e "\t["$index"]\t= NULL," >> "$header1"
113061 + index=$(($index + 1))
113062 + done
113063 + index=$(($index + 1))
113064 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
113065 + done
113066 + echo '};' >> $header1
113067 +}
113068 +
113069 +size_overflow_plugin_dir=`dirname $header1`
113070 +if [ "$size_overflow_plugin_dir" != '.' ]; then
113071 + mkdir -p "$size_overflow_plugin_dir" 2> /dev/null
113072 +fi
113073 +
113074 +create_structs
113075 +create_headers
113076 +create_array_elements
113077 +
113078 +exit 0
113079 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
113080 new file mode 100644
113081 index 0000000..c43901f
113082 --- /dev/null
113083 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
113084 @@ -0,0 +1,748 @@
113085 +/*
113086 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
113087 + * Licensed under the GPL v2, or (at your option) v3
113088 + *
113089 + * Homepage:
113090 + * http://www.grsecurity.net/~ephox/overflow_plugin/
113091 + *
113092 + * Documentation:
113093 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
113094 + *
113095 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
113096 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
113097 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
113098 + *
113099 + * Usage:
113100 + * $ make
113101 + * $ make run
113102 + */
113103 +
113104 +#include "gcc-common.h"
113105 +#include "size_overflow.h"
113106 +
113107 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs);
113108 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs);
113109 +
113110 +// data for the size_overflow asm stmt
113111 +struct asm_data {
113112 + gimple def_stmt;
113113 + tree input;
113114 + tree output;
113115 +};
113116 +
113117 +#if BUILDING_GCC_VERSION <= 4007
113118 +static VEC(tree, gc) *create_asm_io_list(tree string, tree io)
113119 +#else
113120 +static vec<tree, va_gc> *create_asm_io_list(tree string, tree io)
113121 +#endif
113122 +{
113123 + tree list;
113124 +#if BUILDING_GCC_VERSION <= 4007
113125 + VEC(tree, gc) *vec_list = NULL;
113126 +#else
113127 + vec<tree, va_gc> *vec_list = NULL;
113128 +#endif
113129 +
113130 + list = build_tree_list(NULL_TREE, string);
113131 + list = chainon(NULL_TREE, build_tree_list(list, io));
113132 +#if BUILDING_GCC_VERSION <= 4007
113133 + VEC_safe_push(tree, gc, vec_list, list);
113134 +#else
113135 + vec_safe_push(vec_list, list);
113136 +#endif
113137 + return vec_list;
113138 +}
113139 +
113140 +static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data)
113141 +{
113142 + gimple asm_stmt;
113143 + gimple_stmt_iterator gsi;
113144 +#if BUILDING_GCC_VERSION <= 4007
113145 + VEC(tree, gc) *input, *output = NULL;
113146 +#else
113147 + vec<tree, va_gc> *input, *output = NULL;
113148 +#endif
113149 +
113150 + input = create_asm_io_list(str_input, asm_data->input);
113151 +
113152 + if (asm_data->output)
113153 + output = create_asm_io_list(str_output, asm_data->output);
113154 +
113155 + asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL);
113156 + gsi = gsi_for_stmt(asm_data->def_stmt);
113157 + gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT);
113158 +
113159 + if (asm_data->output)
113160 + SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt;
113161 +}
113162 +
113163 +static void replace_call_lhs(const struct asm_data *asm_data)
113164 +{
113165 + gimple_set_lhs(asm_data->def_stmt, asm_data->input);
113166 + update_stmt(asm_data->def_stmt);
113167 + SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt;
113168 +}
113169 +
113170 +static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result)
113171 +{
113172 + enum mark cur_fndecl_attr;
113173 + gimple phi = get_def_stmt(result);
113174 + unsigned int i, n = gimple_phi_num_args(phi);
113175 +
113176 + pointer_set_insert(visited, phi);
113177 + for (i = 0; i < n; i++) {
113178 + tree arg = gimple_phi_arg_def(phi, i);
113179 +
113180 + cur_fndecl_attr = search_intentional(visited, arg);
113181 + if (cur_fndecl_attr != MARK_NO)
113182 + return cur_fndecl_attr;
113183 + }
113184 + return MARK_NO;
113185 +}
113186 +
113187 +static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs)
113188 +{
113189 + enum mark cur_fndecl_attr;
113190 + const_tree rhs1, rhs2;
113191 + gimple def_stmt = get_def_stmt(lhs);
113192 +
113193 + rhs1 = gimple_assign_rhs1(def_stmt);
113194 + rhs2 = gimple_assign_rhs2(def_stmt);
113195 +
113196 + cur_fndecl_attr = search_intentional(visited, rhs1);
113197 + if (cur_fndecl_attr != MARK_NO)
113198 + return cur_fndecl_attr;
113199 + return search_intentional(visited, rhs2);
113200 +}
113201 +
113202 +// Look up the intentional_overflow attribute on the caller and the callee functions.
113203 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs)
113204 +{
113205 + const_gimple def_stmt;
113206 +
113207 + if (TREE_CODE(lhs) != SSA_NAME)
113208 + return get_intentional_attr_type(lhs);
113209 +
113210 + def_stmt = get_def_stmt(lhs);
113211 + if (!def_stmt)
113212 + return MARK_NO;
113213 +
113214 + if (pointer_set_contains(visited, def_stmt))
113215 + return MARK_NO;
113216 +
113217 + switch (gimple_code(def_stmt)) {
113218 + case GIMPLE_NOP:
113219 + return search_intentional(visited, SSA_NAME_VAR(lhs));
113220 + case GIMPLE_ASM:
113221 + if (is_size_overflow_intentional_asm_turn_off(def_stmt))
113222 + return MARK_TURN_OFF;
113223 + return MARK_NO;
113224 + case GIMPLE_CALL:
113225 + return MARK_NO;
113226 + case GIMPLE_PHI:
113227 + return search_intentional_phi(visited, lhs);
113228 + case GIMPLE_ASSIGN:
113229 + switch (gimple_num_ops(def_stmt)) {
113230 + case 2:
113231 + return search_intentional(visited, gimple_assign_rhs1(def_stmt));
113232 + case 3:
113233 + return search_intentional_binary(visited, lhs);
113234 + }
113235 + case GIMPLE_RETURN:
113236 + return MARK_NO;
113237 + default:
113238 + debug_gimple_stmt((gimple)def_stmt);
113239 + error("%s: unknown gimple code", __func__);
113240 + gcc_unreachable();
113241 + }
113242 +}
113243 +
113244 +// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt.
113245 +static enum mark check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum)
113246 +{
113247 + const_tree fndecl;
113248 + struct pointer_set_t *visited;
113249 + enum mark cur_fndecl_attr, decl_attr = MARK_NO;
113250 +
113251 + fndecl = get_interesting_orig_fndecl(stmt, argnum);
113252 + if (is_end_intentional_intentional_attr(fndecl, argnum))
113253 + decl_attr = MARK_NOT_INTENTIONAL;
113254 + else if (is_yes_intentional_attr(fndecl, argnum))
113255 + decl_attr = MARK_YES;
113256 + else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
113257 + return MARK_TURN_OFF;
113258 + }
113259 +
113260 + visited = pointer_set_create();
113261 + cur_fndecl_attr = search_intentional(visited, arg);
113262 + pointer_set_destroy(visited);
113263 +
113264 + switch (cur_fndecl_attr) {
113265 + case MARK_NO:
113266 + case MARK_TURN_OFF:
113267 + return cur_fndecl_attr;
113268 + default:
113269 + print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum);
113270 + return MARK_YES;
113271 + }
113272 +}
113273 +
113274 +static void check_missing_size_overflow_attribute(tree var)
113275 +{
113276 + tree orig_fndecl;
113277 + unsigned int num;
113278 +
113279 + if (is_a_return_check(var))
113280 + orig_fndecl = DECL_ORIGIN(var);
113281 + else
113282 + orig_fndecl = DECL_ORIGIN(current_function_decl);
113283 +
113284 + num = get_function_num(var, orig_fndecl);
113285 + if (num == CANNOT_FIND_ARG)
113286 + return;
113287 +
113288 + is_missing_function(orig_fndecl, num);
113289 +}
113290 +
113291 +static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result)
113292 +{
113293 + gimple phi = get_def_stmt(result);
113294 + unsigned int i, n = gimple_phi_num_args(phi);
113295 +
113296 + pointer_set_insert(visited, phi);
113297 + for (i = 0; i < n; i++) {
113298 + tree arg = gimple_phi_arg_def(phi, i);
113299 +
113300 + search_size_overflow_attribute(visited, arg);
113301 + }
113302 +}
113303 +
113304 +static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs)
113305 +{
113306 + const_gimple def_stmt = get_def_stmt(lhs);
113307 + tree rhs1, rhs2;
113308 +
113309 + rhs1 = gimple_assign_rhs1(def_stmt);
113310 + rhs2 = gimple_assign_rhs2(def_stmt);
113311 +
113312 + search_size_overflow_attribute(visited, rhs1);
113313 + search_size_overflow_attribute(visited, rhs2);
113314 +}
113315 +
113316 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs)
113317 +{
113318 + const_gimple def_stmt;
113319 +
113320 + if (TREE_CODE(lhs) == PARM_DECL) {
113321 + check_missing_size_overflow_attribute(lhs);
113322 + return;
113323 + }
113324 +
113325 + def_stmt = get_def_stmt(lhs);
113326 + if (!def_stmt)
113327 + return;
113328 +
113329 + if (pointer_set_insert(visited, def_stmt))
113330 + return;
113331 +
113332 + switch (gimple_code(def_stmt)) {
113333 + case GIMPLE_NOP:
113334 + return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs));
113335 + case GIMPLE_ASM:
113336 + return;
113337 + case GIMPLE_CALL: {
113338 + tree fndecl = gimple_call_fndecl(def_stmt);
113339 +
113340 + if (fndecl == NULL_TREE)
113341 + return;
113342 + check_missing_size_overflow_attribute(fndecl);
113343 + return;
113344 + }
113345 + case GIMPLE_PHI:
113346 + return search_size_overflow_attribute_phi(visited, lhs);
113347 + case GIMPLE_ASSIGN:
113348 + switch (gimple_num_ops(def_stmt)) {
113349 + case 2:
113350 + return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt));
113351 + case 3:
113352 + return search_size_overflow_attribute_binary(visited, lhs);
113353 + }
113354 + default:
113355 + debug_gimple_stmt((gimple)def_stmt);
113356 + error("%s: unknown gimple code", __func__);
113357 + gcc_unreachable();
113358 + }
113359 +}
113360 +
113361 +// Search missing entries in the hash table (invoked from the gimple pass)
113362 +static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num)
113363 +{
113364 + tree fndecl = NULL_TREE;
113365 + tree lhs;
113366 + struct pointer_set_t *visited;
113367 +
113368 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl)))
113369 + return;
113370 +
113371 + if (num == 0) {
113372 + gcc_assert(gimple_code(stmt) == GIMPLE_RETURN);
113373 + lhs = gimple_return_retval(stmt);
113374 + } else {
113375 + gcc_assert(is_gimple_call(stmt));
113376 + lhs = gimple_call_arg(stmt, num - 1);
113377 + fndecl = gimple_call_fndecl(stmt);
113378 + }
113379 +
113380 + if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl)))
113381 + return;
113382 +
113383 + visited = pointer_set_create();
113384 + search_size_overflow_attribute(visited, lhs);
113385 + pointer_set_destroy(visited);
113386 +}
113387 +
113388 +static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
113389 +{
113390 + gimple_stmt_iterator gsi;
113391 + gimple assign;
113392 +
113393 + assign = gimple_build_assign(asm_data->input, asm_data->output);
113394 + gsi = gsi_for_stmt(stmt);
113395 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
113396 + asm_data->def_stmt = assign;
113397 +
113398 + asm_data->output = create_new_var(TREE_TYPE(asm_data->output));
113399 + asm_data->output = make_ssa_name(asm_data->output, stmt);
113400 + if (gimple_code(stmt) == GIMPLE_RETURN)
113401 + gimple_return_set_retval(stmt, asm_data->output);
113402 + else
113403 + gimple_call_set_arg(stmt, argnum - 1, asm_data->output);
113404 + update_stmt(stmt);
113405 +}
113406 +
113407 +static char *create_asm_comment(unsigned int argnum, const_gimple stmt , const char *mark_str)
113408 +{
113409 + const char *fn_name;
113410 + char *asm_comment;
113411 + unsigned int len;
113412 +
113413 + if (argnum == 0)
113414 + fn_name = DECL_NAME_POINTER(current_function_decl);
113415 + else
113416 + fn_name = DECL_NAME_POINTER(gimple_call_fndecl(stmt));
113417 +
113418 + len = asprintf(&asm_comment, "%s %s %u", mark_str, fn_name, argnum);
113419 + gcc_assert(len > 0);
113420 +
113421 + return asm_comment;
113422 +}
113423 +
113424 +static const char *convert_mark_to_str(enum mark mark)
113425 +{
113426 + switch (mark) {
113427 + case MARK_NO:
113428 + return OK_ASM_STR;
113429 + case MARK_YES:
113430 + case MARK_NOT_INTENTIONAL:
113431 + return YES_ASM_STR;
113432 + case MARK_TURN_OFF:
113433 + return TURN_OFF_ASM_STR;
113434 + }
113435 +
113436 + gcc_unreachable();
113437 +}
113438 +
113439 +/* Create the input of the size_overflow asm stmt.
113440 + * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt:
113441 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
113442 + * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion.
113443 + * otherwise create the input (for a phi stmt the output too) of the asm stmt.
113444 + */
113445 +static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
113446 +{
113447 + if (!asm_data->def_stmt) {
113448 + asm_data->input = NULL_TREE;
113449 + return;
113450 + }
113451 +
113452 + asm_data->input = create_new_var(TREE_TYPE(asm_data->output));
113453 + asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt);
113454 +
113455 + switch (gimple_code(asm_data->def_stmt)) {
113456 + case GIMPLE_ASSIGN:
113457 + case GIMPLE_CALL:
113458 + replace_call_lhs(asm_data);
113459 + break;
113460 + case GIMPLE_PHI:
113461 + create_output_from_phi(stmt, argnum, asm_data);
113462 + break;
113463 + case GIMPLE_NOP: {
113464 + enum mark mark;
113465 + const char *mark_str;
113466 + char *asm_comment;
113467 +
113468 + mark = check_intentional_attribute_gimple(asm_data->output, stmt, argnum);
113469 +
113470 + asm_data->input = asm_data->output;
113471 + asm_data->output = NULL;
113472 + asm_data->def_stmt = stmt;
113473 +
113474 + mark_str = convert_mark_to_str(mark);
113475 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
113476 +
113477 + create_asm_stmt(asm_comment, build_string(3, "rm"), NULL, asm_data);
113478 + free(asm_comment);
113479 + asm_data->input = NULL_TREE;
113480 + break;
113481 + }
113482 + case GIMPLE_ASM:
113483 + if (is_size_overflow_asm(asm_data->def_stmt)) {
113484 + asm_data->input = NULL_TREE;
113485 + break;
113486 + }
113487 + default:
113488 + debug_gimple_stmt(asm_data->def_stmt);
113489 + gcc_unreachable();
113490 + }
113491 +}
113492 +
113493 +/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type
113494 + * is of the right kind create the appropriate size_overflow asm stmts:
113495 + * __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16);
113496 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
113497 + */
113498 +static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum)
113499 +{
113500 + struct asm_data asm_data;
113501 + const char *mark_str;
113502 + char *asm_comment;
113503 + enum mark mark;
113504 +
113505 + if (is_gimple_constant(output_node))
113506 + return;
113507 +
113508 + asm_data.output = output_node;
113509 + mark = check_intentional_attribute_gimple(asm_data.output, stmt, argnum);
113510 + if (mark != MARK_TURN_OFF)
113511 + search_missing_size_overflow_attribute_gimple(stmt, argnum);
113512 +
113513 + asm_data.def_stmt = get_def_stmt(asm_data.output);
113514 + if (is_size_overflow_intentional_asm_turn_off(asm_data.def_stmt))
113515 + return;
113516 +
113517 + create_asm_input(stmt, argnum, &asm_data);
113518 + if (asm_data.input == NULL_TREE)
113519 + return;
113520 +
113521 + mark_str = convert_mark_to_str(mark);
113522 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
113523 + create_asm_stmt(asm_comment, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
113524 + free(asm_comment);
113525 +}
113526 +
113527 +// Insert an asm stmt with "MARK_TURN_OFF", "MARK_YES" or "MARK_NOT_INTENTIONAL".
113528 +static bool create_mark_asm(gimple stmt, enum mark mark)
113529 +{
113530 + struct asm_data asm_data;
113531 + const char *asm_str;
113532 +
113533 + switch (mark) {
113534 + case MARK_TURN_OFF:
113535 + asm_str = TURN_OFF_ASM_STR;
113536 + break;
113537 + case MARK_NOT_INTENTIONAL:
113538 + case MARK_YES:
113539 + asm_str = YES_ASM_STR;
113540 + break;
113541 + default:
113542 + gcc_unreachable();
113543 + }
113544 +
113545 + asm_data.def_stmt = stmt;
113546 + asm_data.output = gimple_call_lhs(stmt);
113547 +
113548 + if (asm_data.output == NULL_TREE) {
113549 + asm_data.input = gimple_call_arg(stmt, 0);
113550 + if (is_gimple_constant(asm_data.input))
113551 + return false;
113552 + asm_data.output = NULL;
113553 + create_asm_stmt(asm_str, build_string(3, "rm"), NULL, &asm_data);
113554 + return true;
113555 + }
113556 +
113557 + create_asm_input(stmt, 0, &asm_data);
113558 + gcc_assert(asm_data.input != NULL_TREE);
113559 +
113560 + create_asm_stmt(asm_str, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
113561 + return true;
113562 +}
113563 +
113564 +static void walk_use_def_ptr(struct pointer_set_t *visited, const_tree lhs)
113565 +{
113566 + gimple def_stmt;
113567 +
113568 + def_stmt = get_def_stmt(lhs);
113569 + if (!def_stmt)
113570 + return;
113571 +
113572 + if (pointer_set_insert(visited, def_stmt))
113573 + return;
113574 +
113575 + switch (gimple_code(def_stmt)) {
113576 + case GIMPLE_NOP:
113577 + case GIMPLE_ASM:
113578 + case GIMPLE_CALL:
113579 + break;
113580 + case GIMPLE_PHI: {
113581 + unsigned int i, n = gimple_phi_num_args(def_stmt);
113582 +
113583 + pointer_set_insert(visited, def_stmt);
113584 +
113585 + for (i = 0; i < n; i++) {
113586 + tree arg = gimple_phi_arg_def(def_stmt, i);
113587 +
113588 + walk_use_def_ptr(visited, arg);
113589 + }
113590 + }
113591 + case GIMPLE_ASSIGN:
113592 + switch (gimple_num_ops(def_stmt)) {
113593 + case 2:
113594 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
113595 + return;
113596 + case 3:
113597 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
113598 + walk_use_def_ptr(visited, gimple_assign_rhs2(def_stmt));
113599 + return;
113600 + default:
113601 + return;
113602 + }
113603 + default:
113604 + debug_gimple_stmt((gimple)def_stmt);
113605 + error("%s: unknown gimple code", __func__);
113606 + gcc_unreachable();
113607 + }
113608 +}
113609 +
113610 +// Look for a ptr - ptr expression (e.g., cpuset_common_file_read() s - page)
113611 +static void insert_mark_not_intentional_asm_at_ptr(const_tree arg)
113612 +{
113613 + struct pointer_set_t *visited;
113614 +
113615 + visited = pointer_set_create();
113616 + walk_use_def_ptr(visited, arg);
113617 + pointer_set_destroy(visited);
113618 +}
113619 +
113620 +// Determine the return value and insert the asm stmt to mark the return stmt.
113621 +static void insert_asm_ret(gimple stmt)
113622 +{
113623 + tree ret;
113624 +
113625 + ret = gimple_return_retval(stmt);
113626 + create_size_overflow_asm(stmt, ret, 0);
113627 +}
113628 +
113629 +// Determine the correct arg index and arg and insert the asm stmt to mark the stmt.
113630 +static void insert_asm_arg(gimple stmt, unsigned int orig_argnum)
113631 +{
113632 + tree arg;
113633 + unsigned int argnum;
113634 +
113635 + argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt));
113636 + gcc_assert(argnum != 0);
113637 + if (argnum == CANNOT_FIND_ARG)
113638 + return;
113639 +
113640 + arg = gimple_call_arg(stmt, argnum - 1);
113641 + gcc_assert(arg != NULL_TREE);
113642 +
113643 + // skip all ptr - ptr expressions
113644 + insert_mark_not_intentional_asm_at_ptr(arg);
113645 +
113646 + create_size_overflow_asm(stmt, arg, argnum);
113647 +}
113648 +
113649 +// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array.
113650 +static void set_argnum_attribute(const_tree attr, bool *argnums)
113651 +{
113652 + unsigned int argnum;
113653 + tree attr_value;
113654 +
113655 + for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) {
113656 + argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value));
113657 + argnums[argnum] = true;
113658 + }
113659 +}
113660 +
113661 +// If a function arg or the return value is in the hash table then set its index in the array.
113662 +static void set_argnum_hash(tree fndecl, bool *argnums)
113663 +{
113664 + unsigned int num;
113665 + const struct size_overflow_hash *hash;
113666 +
113667 + hash = get_function_hash(DECL_ORIGIN(fndecl));
113668 + if (!hash)
113669 + return;
113670 +
113671 + for (num = 0; num <= MAX_PARAM; num++) {
113672 + if (!(hash->param & (1U << num)))
113673 + continue;
113674 +
113675 + argnums[num] = true;
113676 + }
113677 +}
113678 +
113679 +static bool is_all_the_argnums_empty(bool *argnums)
113680 +{
113681 + unsigned int i;
113682 +
113683 + for (i = 0; i <= MAX_PARAM; i++)
113684 + if (argnums[i])
113685 + return false;
113686 + return true;
113687 +}
113688 +
113689 +// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute.
113690 +static void search_interesting_args(tree fndecl, bool *argnums)
113691 +{
113692 + const_tree attr;
113693 +
113694 + set_argnum_hash(fndecl, argnums);
113695 + if (!is_all_the_argnums_empty(argnums))
113696 + return;
113697 +
113698 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
113699 + if (attr && TREE_VALUE(attr))
113700 + set_argnum_attribute(attr, argnums);
113701 +}
113702 +
113703 +/*
113704 + * Look up the intentional_overflow attribute that turns off ipa based duplication
113705 + * on the callee function.
113706 + */
113707 +static bool is_mark_turn_off_attribute(gimple stmt)
113708 +{
113709 + enum mark mark;
113710 + const_tree fndecl = gimple_call_fndecl(stmt);
113711 +
113712 + mark = get_intentional_attr_type(DECL_ORIGIN(fndecl));
113713 + if (mark == MARK_TURN_OFF)
113714 + return true;
113715 + return false;
113716 +}
113717 +
113718 +// 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
113719 +static void handle_interesting_function(gimple stmt)
113720 +{
113721 + unsigned int argnum;
113722 + tree fndecl;
113723 + bool orig_argnums[MAX_PARAM + 1] = {false};
113724 +
113725 + if (gimple_call_num_args(stmt) == 0)
113726 + return;
113727 + fndecl = gimple_call_fndecl(stmt);
113728 + if (fndecl == NULL_TREE)
113729 + return;
113730 + fndecl = DECL_ORIGIN(fndecl);
113731 +
113732 + if (is_mark_turn_off_attribute(stmt)) {
113733 + create_mark_asm(stmt, MARK_TURN_OFF);
113734 + return;
113735 + }
113736 +
113737 + search_interesting_args(fndecl, orig_argnums);
113738 +
113739 + for (argnum = 1; argnum < MAX_PARAM; argnum++)
113740 + if (orig_argnums[argnum])
113741 + insert_asm_arg(stmt, argnum);
113742 +}
113743 +
113744 +// 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
113745 +static void handle_interesting_ret(gimple stmt)
113746 +{
113747 + bool orig_argnums[MAX_PARAM + 1] = {false};
113748 +
113749 + search_interesting_args(current_function_decl, orig_argnums);
113750 +
113751 + if (orig_argnums[0])
113752 + insert_asm_ret(stmt);
113753 +}
113754 +
113755 +// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table
113756 +static unsigned int search_interesting_functions(void)
113757 +{
113758 + basic_block bb;
113759 +
113760 + FOR_ALL_BB_FN(bb, cfun) {
113761 + gimple_stmt_iterator gsi;
113762 +
113763 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
113764 + gimple stmt = gsi_stmt(gsi);
113765 +
113766 + if (is_size_overflow_asm(stmt))
113767 + continue;
113768 +
113769 + if (is_gimple_call(stmt))
113770 + handle_interesting_function(stmt);
113771 + else if (gimple_code(stmt) == GIMPLE_RETURN)
113772 + handle_interesting_ret(stmt);
113773 + }
113774 + }
113775 + return 0;
113776 +}
113777 +
113778 +/*
113779 + * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass
113780 + * this pass inserts asm stmts to mark the interesting args
113781 + * that the ipa pass will detect and insert the size overflow checks for.
113782 + */
113783 +#if BUILDING_GCC_VERSION >= 4009
113784 +static const struct pass_data insert_size_overflow_asm_pass_data = {
113785 +#else
113786 +static struct gimple_opt_pass insert_size_overflow_asm_pass = {
113787 + .pass = {
113788 +#endif
113789 + .type = GIMPLE_PASS,
113790 + .name = "insert_size_overflow_asm",
113791 +#if BUILDING_GCC_VERSION >= 4008
113792 + .optinfo_flags = OPTGROUP_NONE,
113793 +#endif
113794 +#if BUILDING_GCC_VERSION >= 4009
113795 + .has_gate = false,
113796 + .has_execute = true,
113797 +#else
113798 + .gate = NULL,
113799 + .execute = search_interesting_functions,
113800 + .sub = NULL,
113801 + .next = NULL,
113802 + .static_pass_number = 0,
113803 +#endif
113804 + .tv_id = TV_NONE,
113805 + .properties_required = PROP_cfg,
113806 + .properties_provided = 0,
113807 + .properties_destroyed = 0,
113808 + .todo_flags_start = 0,
113809 + .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
113810 +#if BUILDING_GCC_VERSION < 4009
113811 + }
113812 +#endif
113813 +};
113814 +
113815 +#if BUILDING_GCC_VERSION >= 4009
113816 +namespace {
113817 +class insert_size_overflow_asm_pass : public gimple_opt_pass {
113818 +public:
113819 + insert_size_overflow_asm_pass() : gimple_opt_pass(insert_size_overflow_asm_pass_data, g) {}
113820 + unsigned int execute() { return search_interesting_functions(); }
113821 +};
113822 +}
113823 +#endif
113824 +
113825 +struct opt_pass *make_insert_size_overflow_asm_pass(void)
113826 +{
113827 +#if BUILDING_GCC_VERSION >= 4009
113828 + return new insert_size_overflow_asm_pass();
113829 +#else
113830 + return &insert_size_overflow_asm_pass.pass;
113831 +#endif
113832 +}
113833 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
113834 new file mode 100644
113835 index 0000000..73f0a12
113836 --- /dev/null
113837 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c
113838 @@ -0,0 +1,943 @@
113839 +/*
113840 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
113841 + * Licensed under the GPL v2, or (at your option) v3
113842 + *
113843 + * Homepage:
113844 + * http://www.grsecurity.net/~ephox/overflow_plugin/
113845 + *
113846 + * Documentation:
113847 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
113848 + *
113849 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
113850 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
113851 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
113852 + *
113853 + * Usage:
113854 + * $ make
113855 + * $ make run
113856 + */
113857 +
113858 +#include "gcc-common.h"
113859 +#include "size_overflow.h"
113860 +
113861 +#define MIN_CHECK true
113862 +#define MAX_CHECK false
113863 +
113864 +static tree get_size_overflow_type(struct visited *visited, const_gimple stmt, const_tree node)
113865 +{
113866 + const_tree type;
113867 + tree new_type;
113868 +
113869 + gcc_assert(node != NULL_TREE);
113870 +
113871 + type = TREE_TYPE(node);
113872 +
113873 + if (pointer_set_contains(visited->my_stmts, stmt))
113874 + return TREE_TYPE(node);
113875 +
113876 + switch (TYPE_MODE(type)) {
113877 + case QImode:
113878 + new_type = size_overflow_type_HI;
113879 + break;
113880 + case HImode:
113881 + new_type = size_overflow_type_SI;
113882 + break;
113883 + case SImode:
113884 + new_type = size_overflow_type_DI;
113885 + break;
113886 + case DImode:
113887 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
113888 + new_type = TYPE_UNSIGNED(type) ? unsigned_intDI_type_node : intDI_type_node;
113889 + else
113890 + new_type = size_overflow_type_TI;
113891 + break;
113892 + case TImode:
113893 + gcc_assert(!TYPE_UNSIGNED(type));
113894 + new_type = size_overflow_type_TI;
113895 + break;
113896 + default:
113897 + debug_tree((tree)node);
113898 + error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl);
113899 + gcc_unreachable();
113900 + }
113901 +
113902 + if (TYPE_QUALS(type) != 0)
113903 + return build_qualified_type(new_type, TYPE_QUALS(type));
113904 + return new_type;
113905 +}
113906 +
113907 +static tree get_lhs(const_gimple stmt)
113908 +{
113909 + switch (gimple_code(stmt)) {
113910 + case GIMPLE_ASSIGN:
113911 + case GIMPLE_CALL:
113912 + return gimple_get_lhs(stmt);
113913 + case GIMPLE_PHI:
113914 + return gimple_phi_result(stmt);
113915 + default:
113916 + return NULL_TREE;
113917 + }
113918 +}
113919 +
113920 +static tree cast_to_new_size_overflow_type(struct visited *visited, gimple stmt, tree rhs, tree size_overflow_type, bool before)
113921 +{
113922 + gimple_stmt_iterator gsi;
113923 + tree lhs;
113924 + gimple new_stmt;
113925 +
113926 + if (rhs == NULL_TREE)
113927 + return NULL_TREE;
113928 +
113929 + gsi = gsi_for_stmt(stmt);
113930 + new_stmt = build_cast_stmt(visited, size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false);
113931 + pointer_set_insert(visited->my_stmts, new_stmt);
113932 +
113933 + lhs = get_lhs(new_stmt);
113934 + gcc_assert(lhs != NULL_TREE);
113935 + return lhs;
113936 +}
113937 +
113938 +tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before)
113939 +{
113940 + tree lhs, dst_type;
113941 + gimple_stmt_iterator gsi;
113942 +
113943 + if (rhs1 == NULL_TREE) {
113944 + debug_gimple_stmt(oldstmt);
113945 + error("%s: rhs1 is NULL_TREE", __func__);
113946 + gcc_unreachable();
113947 + }
113948 +
113949 + switch (gimple_code(oldstmt)) {
113950 + case GIMPLE_ASM:
113951 + lhs = rhs1;
113952 + break;
113953 + case GIMPLE_CALL:
113954 + case GIMPLE_ASSIGN:
113955 + lhs = gimple_get_lhs(oldstmt);
113956 + break;
113957 + default:
113958 + debug_gimple_stmt(oldstmt);
113959 + gcc_unreachable();
113960 + }
113961 +
113962 + gsi = gsi_for_stmt(oldstmt);
113963 + pointer_set_insert(visited->stmts, oldstmt);
113964 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
113965 + basic_block next_bb, cur_bb;
113966 + const_edge e;
113967 +
113968 + gcc_assert(before == false);
113969 + gcc_assert(stmt_can_throw_internal(oldstmt));
113970 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
113971 + gcc_assert(!gsi_end_p(gsi));
113972 +
113973 + cur_bb = gimple_bb(oldstmt);
113974 + next_bb = cur_bb->next_bb;
113975 + e = find_edge(cur_bb, next_bb);
113976 + gcc_assert(e != NULL);
113977 + gcc_assert(e->flags & EDGE_FALLTHRU);
113978 +
113979 + gsi = gsi_after_labels(next_bb);
113980 + gcc_assert(!gsi_end_p(gsi));
113981 +
113982 + before = true;
113983 + oldstmt = gsi_stmt(gsi);
113984 + }
113985 +
113986 + dst_type = get_size_overflow_type(visited, oldstmt, lhs);
113987 +
113988 + if (is_gimple_constant(rhs1))
113989 + return cast_a_tree(dst_type, rhs1);
113990 + return cast_to_new_size_overflow_type(visited, oldstmt, rhs1, dst_type, before);
113991 +}
113992 +
113993 +tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
113994 +{
113995 + gimple stmt;
113996 + gimple_stmt_iterator gsi;
113997 + tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt);
113998 +
113999 + if (pointer_set_contains(visited->my_stmts, oldstmt))
114000 + return lhs;
114001 +
114002 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
114003 + rhs1 = gimple_assign_rhs1(oldstmt);
114004 + rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT);
114005 + }
114006 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
114007 + rhs2 = gimple_assign_rhs2(oldstmt);
114008 + rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT);
114009 + }
114010 +
114011 + stmt = gimple_copy(oldstmt);
114012 + gimple_set_location(stmt, gimple_location(oldstmt));
114013 + pointer_set_insert(visited->my_stmts, stmt);
114014 +
114015 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
114016 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
114017 +
114018 + size_overflow_type = get_size_overflow_type(visited, oldstmt, node);
114019 +
114020 + new_var = create_new_var(size_overflow_type);
114021 + new_var = make_ssa_name(new_var, stmt);
114022 + gimple_assign_set_lhs(stmt, new_var);
114023 +
114024 + if (rhs1 != NULL_TREE)
114025 + gimple_assign_set_rhs1(stmt, rhs1);
114026 +
114027 + if (rhs2 != NULL_TREE)
114028 + gimple_assign_set_rhs2(stmt, rhs2);
114029 +#if BUILDING_GCC_VERSION >= 4006
114030 + if (rhs3 != NULL_TREE)
114031 + gimple_assign_set_rhs3(stmt, rhs3);
114032 +#endif
114033 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
114034 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
114035 +
114036 + gsi = gsi_for_stmt(oldstmt);
114037 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
114038 + update_stmt(stmt);
114039 + pointer_set_insert(visited->stmts, oldstmt);
114040 + return gimple_assign_lhs(stmt);
114041 +}
114042 +
114043 +static tree cast_parm_decl(struct visited *visited, tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb)
114044 +{
114045 + gimple assign;
114046 + gimple_stmt_iterator gsi;
114047 + basic_block first_bb;
114048 +
114049 + gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg));
114050 +
114051 + if (bb->index == 0) {
114052 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
114053 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
114054 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
114055 + bb = first_bb;
114056 + }
114057 +
114058 + gsi = gsi_after_labels(bb);
114059 + assign = build_cast_stmt(visited, size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
114060 + pointer_set_insert(visited->my_stmts, assign);
114061 +
114062 + return gimple_assign_lhs(assign);
114063 +}
114064 +
114065 +static tree use_phi_ssa_name(struct visited *visited, tree ssa_name_var, tree new_arg)
114066 +{
114067 + gimple_stmt_iterator gsi;
114068 + gimple assign, def_stmt = get_def_stmt(new_arg);
114069 +
114070 + if (gimple_code(def_stmt) == GIMPLE_PHI) {
114071 + gsi = gsi_after_labels(gimple_bb(def_stmt));
114072 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true);
114073 + } else {
114074 + gsi = gsi_for_stmt(def_stmt);
114075 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true);
114076 + }
114077 +
114078 + pointer_set_insert(visited->my_stmts, assign);
114079 + return gimple_assign_lhs(assign);
114080 +}
114081 +
114082 +static tree cast_visited_phi_arg(struct visited *visited, tree ssa_name_var, tree arg, tree size_overflow_type)
114083 +{
114084 + basic_block bb;
114085 + gimple_stmt_iterator gsi;
114086 + const_gimple def_stmt;
114087 + gimple assign;
114088 +
114089 + def_stmt = get_def_stmt(arg);
114090 + bb = gimple_bb(def_stmt);
114091 + gcc_assert(bb->index != 0);
114092 + gsi = gsi_after_labels(bb);
114093 +
114094 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false);
114095 + pointer_set_insert(visited->my_stmts, assign);
114096 + return gimple_assign_lhs(assign);
114097 +}
114098 +
114099 +static tree create_new_phi_arg(struct visited *visited, tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i)
114100 +{
114101 + tree size_overflow_type;
114102 + tree arg;
114103 + const_gimple def_stmt;
114104 +
114105 + if (new_arg != NULL_TREE && is_gimple_constant(new_arg))
114106 + return new_arg;
114107 +
114108 + arg = gimple_phi_arg_def(oldstmt, i);
114109 + def_stmt = get_def_stmt(arg);
114110 + gcc_assert(def_stmt != NULL);
114111 + size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
114112 +
114113 + switch (gimple_code(def_stmt)) {
114114 + case GIMPLE_PHI:
114115 + return cast_visited_phi_arg(visited, ssa_name_var, arg, size_overflow_type);
114116 + case GIMPLE_NOP: {
114117 + basic_block bb;
114118 +
114119 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
114120 + return cast_parm_decl(visited, ssa_name_var, arg, size_overflow_type, bb);
114121 + }
114122 + case GIMPLE_ASM: {
114123 + gimple_stmt_iterator gsi;
114124 + gimple assign, stmt = get_def_stmt(arg);
114125 +
114126 + gsi = gsi_for_stmt(stmt);
114127 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false);
114128 + pointer_set_insert(visited->my_stmts, assign);
114129 + return gimple_assign_lhs(assign);
114130 + }
114131 + default:
114132 + gcc_assert(new_arg != NULL_TREE);
114133 + gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
114134 + return use_phi_ssa_name(visited, ssa_name_var, new_arg);
114135 + }
114136 +}
114137 +
114138 +static gimple overflow_create_phi_node(struct visited *visited, gimple oldstmt, tree result)
114139 +{
114140 + basic_block bb;
114141 + gimple phi;
114142 + gimple_seq seq;
114143 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
114144 +
114145 + bb = gsi_bb(gsi);
114146 +
114147 + if (result == NULL_TREE) {
114148 + tree old_result = gimple_phi_result(oldstmt);
114149 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, old_result);
114150 +
114151 + result = create_new_var(size_overflow_type);
114152 + }
114153 +
114154 + phi = create_phi_node(result, bb);
114155 + gimple_phi_set_result(phi, make_ssa_name(result, phi));
114156 + seq = phi_nodes(bb);
114157 + gsi = gsi_last(seq);
114158 + gsi_remove(&gsi, false);
114159 +
114160 + gsi = gsi_for_stmt(oldstmt);
114161 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
114162 + gimple_set_bb(phi, bb);
114163 + return phi;
114164 +}
114165 +
114166 +#if BUILDING_GCC_VERSION <= 4007
114167 +static tree create_new_phi_node(struct visited *visited, VEC(tree, heap) **args, tree ssa_name_var, gimple oldstmt)
114168 +#else
114169 +static tree create_new_phi_node(struct visited *visited, vec<tree, va_heap, vl_embed> *&args, tree ssa_name_var, gimple oldstmt)
114170 +#endif
114171 +{
114172 + gimple new_phi;
114173 + unsigned int i;
114174 + tree arg, result;
114175 + location_t loc = gimple_location(oldstmt);
114176 +
114177 +#if BUILDING_GCC_VERSION <= 4007
114178 + gcc_assert(!VEC_empty(tree, *args));
114179 +#else
114180 + gcc_assert(!args->is_empty());
114181 +#endif
114182 +
114183 + new_phi = overflow_create_phi_node(visited, oldstmt, ssa_name_var);
114184 + result = gimple_phi_result(new_phi);
114185 + ssa_name_var = SSA_NAME_VAR(result);
114186 +
114187 +#if BUILDING_GCC_VERSION <= 4007
114188 + FOR_EACH_VEC_ELT(tree, *args, i, arg) {
114189 +#else
114190 + FOR_EACH_VEC_SAFE_ELT(args, i, arg) {
114191 +#endif
114192 + arg = create_new_phi_arg(visited, ssa_name_var, arg, oldstmt, i);
114193 + add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc);
114194 + }
114195 +
114196 +#if BUILDING_GCC_VERSION <= 4007
114197 + VEC_free(tree, heap, *args);
114198 +#else
114199 + vec_free(args);
114200 +#endif
114201 + update_stmt(new_phi);
114202 + pointer_set_insert(visited->my_stmts, new_phi);
114203 + return result;
114204 +}
114205 +
114206 +static tree handle_phi(struct visited *visited, struct cgraph_node *caller_node, tree orig_result)
114207 +{
114208 + tree ssa_name_var = NULL_TREE;
114209 +#if BUILDING_GCC_VERSION <= 4007
114210 + VEC(tree, heap) *args = NULL;
114211 +#else
114212 + vec<tree, va_heap, vl_embed> *args = NULL;
114213 +#endif
114214 + gimple oldstmt = get_def_stmt(orig_result);
114215 + unsigned int i, len = gimple_phi_num_args(oldstmt);
114216 +
114217 + pointer_set_insert(visited->stmts, oldstmt);
114218 + for (i = 0; i < len; i++) {
114219 + tree arg, new_arg;
114220 +
114221 + arg = gimple_phi_arg_def(oldstmt, i);
114222 + new_arg = expand(visited, caller_node, arg);
114223 +
114224 + if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE)
114225 + ssa_name_var = SSA_NAME_VAR(new_arg);
114226 +
114227 + if (is_gimple_constant(arg)) {
114228 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
114229 +
114230 + new_arg = cast_a_tree(size_overflow_type, arg);
114231 + }
114232 +
114233 +#if BUILDING_GCC_VERSION <= 4007
114234 + VEC_safe_push(tree, heap, args, new_arg);
114235 +#else
114236 + vec_safe_push(args, new_arg);
114237 +#endif
114238 + }
114239 +
114240 +#if BUILDING_GCC_VERSION <= 4007
114241 + return create_new_phi_node(visited, &args, ssa_name_var, oldstmt);
114242 +#else
114243 + return create_new_phi_node(visited, args, ssa_name_var, oldstmt);
114244 +#endif
114245 +}
114246 +
114247 +static tree create_cast_assign(struct visited *visited, gimple stmt)
114248 +{
114249 + tree rhs1 = gimple_assign_rhs1(stmt);
114250 + tree lhs = gimple_assign_lhs(stmt);
114251 + const_tree rhs1_type = TREE_TYPE(rhs1);
114252 + const_tree lhs_type = TREE_TYPE(lhs);
114253 +
114254 + if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
114255 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114256 +
114257 + return create_assign(visited, stmt, rhs1, AFTER_STMT);
114258 +}
114259 +
114260 +static bool skip_lhs_cast_check(const_gimple stmt)
114261 +{
114262 + const_tree rhs = gimple_assign_rhs1(stmt);
114263 + const_gimple def_stmt = get_def_stmt(rhs);
114264 +
114265 + // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max
114266 + if (gimple_code(def_stmt) == GIMPLE_ASM)
114267 + return true;
114268 +
114269 + if (is_const_plus_unsigned_signed_truncation(rhs))
114270 + return true;
114271 +
114272 + return false;
114273 +}
114274 +
114275 +static tree create_string_param(tree string)
114276 +{
114277 + tree i_type, a_type;
114278 + const int length = TREE_STRING_LENGTH(string);
114279 +
114280 + gcc_assert(length > 0);
114281 +
114282 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
114283 + a_type = build_array_type(char_type_node, i_type);
114284 +
114285 + TREE_TYPE(string) = a_type;
114286 + TREE_CONSTANT(string) = 1;
114287 + TREE_READONLY(string) = 1;
114288 +
114289 + return build1(ADDR_EXPR, ptr_type_node, string);
114290 +}
114291 +
114292 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
114293 +{
114294 + gimple cond_stmt;
114295 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
114296 +
114297 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
114298 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
114299 + update_stmt(cond_stmt);
114300 +}
114301 +
114302 +static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
114303 +{
114304 + gimple func_stmt;
114305 + const_gimple def_stmt;
114306 + const_tree loc_line;
114307 + tree loc_file, ssa_name, current_func;
114308 + expanded_location xloc;
114309 + char *ssa_name_buf;
114310 + int len;
114311 + struct cgraph_edge *edge;
114312 + struct cgraph_node *callee_node;
114313 + int frequency;
114314 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
114315 +
114316 + def_stmt = get_def_stmt(arg);
114317 + xloc = expand_location(gimple_location(def_stmt));
114318 +
114319 + if (!gimple_has_location(def_stmt)) {
114320 + xloc = expand_location(gimple_location(stmt));
114321 + if (!gimple_has_location(stmt))
114322 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
114323 + }
114324 +
114325 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
114326 +
114327 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
114328 + loc_file = create_string_param(loc_file);
114329 +
114330 + current_func = build_string(DECL_NAME_LENGTH(current_function_decl) + 1, DECL_NAME_POINTER(current_function_decl));
114331 + current_func = create_string_param(current_func);
114332 +
114333 + gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL);
114334 + call_count++;
114335 + 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);
114336 + gcc_assert(len > 0);
114337 + ssa_name = build_string(len + 1, ssa_name_buf);
114338 + free(ssa_name_buf);
114339 + ssa_name = create_string_param(ssa_name);
114340 +
114341 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
114342 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
114343 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
114344 +
114345 + callee_node = cgraph_get_create_node(report_size_overflow_decl);
114346 + frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true);
114347 +
114348 + edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth);
114349 + gcc_assert(edge != NULL);
114350 +}
114351 +
114352 +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)
114353 +{
114354 + basic_block cond_bb, join_bb, bb_true;
114355 + edge e;
114356 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
114357 +
114358 + cond_bb = gimple_bb(stmt);
114359 + if (before)
114360 + gsi_prev(&gsi);
114361 + if (gsi_end_p(gsi))
114362 + e = split_block_after_labels(cond_bb);
114363 + else
114364 + e = split_block(cond_bb, gsi_stmt(gsi));
114365 + cond_bb = e->src;
114366 + join_bb = e->dest;
114367 + e->flags = EDGE_FALSE_VALUE;
114368 + e->probability = REG_BR_PROB_BASE;
114369 +
114370 + bb_true = create_empty_bb(cond_bb);
114371 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
114372 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
114373 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
114374 +
114375 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
114376 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
114377 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
114378 +
114379 + if (current_loops != NULL) {
114380 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
114381 + add_bb_to_loop(bb_true, cond_bb->loop_father);
114382 + }
114383 +
114384 + insert_cond(cond_bb, arg, cond_code, type_value);
114385 + insert_cond_result(caller_node, bb_true, stmt, arg, min);
114386 +
114387 +// print_the_code_insertions(stmt);
114388 +}
114389 +
114390 +void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
114391 +{
114392 + const_tree rhs_type = TREE_TYPE(rhs);
114393 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
114394 +
114395 + gcc_assert(rhs_type != NULL_TREE);
114396 + if (TREE_CODE(rhs_type) == POINTER_TYPE)
114397 + return;
114398 +
114399 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
114400 +
114401 + if (is_const_plus_unsigned_signed_truncation(rhs))
114402 + return;
114403 +
114404 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
114405 + // typemax (-1) < typemin (0)
114406 + if (TREE_OVERFLOW(type_max))
114407 + return;
114408 +
114409 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
114410 +
114411 + cast_rhs_type = TREE_TYPE(cast_rhs);
114412 + type_max_type = TREE_TYPE(type_max);
114413 + gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
114414 +
114415 + insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK);
114416 +
114417 + // special case: get_size_overflow_type(), 32, u64->s
114418 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && TYPE_UNSIGNED(size_overflow_type) && !TYPE_UNSIGNED(rhs_type))
114419 + return;
114420 +
114421 + type_min_type = TREE_TYPE(type_min);
114422 + gcc_assert(types_compatible_p(type_max_type, type_min_type));
114423 + insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK);
114424 +}
114425 +
114426 +static tree create_cast_overflow_check(struct visited *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt)
114427 +{
114428 + bool cast_lhs, cast_rhs;
114429 + tree lhs = gimple_assign_lhs(stmt);
114430 + tree rhs = gimple_assign_rhs1(stmt);
114431 + const_tree lhs_type = TREE_TYPE(lhs);
114432 + const_tree rhs_type = TREE_TYPE(rhs);
114433 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
114434 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
114435 + unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode);
114436 + unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode);
114437 +
114438 + static bool check_lhs[3][4] = {
114439 + // ss su us uu
114440 + { false, true, true, false }, // lhs > rhs
114441 + { false, false, false, false }, // lhs = rhs
114442 + { true, true, true, true }, // lhs < rhs
114443 + };
114444 +
114445 + static bool check_rhs[3][4] = {
114446 + // ss su us uu
114447 + { true, false, true, true }, // lhs > rhs
114448 + { true, false, true, true }, // lhs = rhs
114449 + { true, false, true, true }, // lhs < rhs
114450 + };
114451 +
114452 + // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!!
114453 + if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode))
114454 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114455 +
114456 + if (lhs_size > rhs_size) {
114457 + cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114458 + cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114459 + } else if (lhs_size == rhs_size) {
114460 + cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114461 + cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114462 + } else {
114463 + cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114464 + cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114465 + }
114466 +
114467 + if (!cast_lhs && !cast_rhs)
114468 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114469 +
114470 + if (cast_lhs && !skip_lhs_cast_check(stmt))
114471 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
114472 +
114473 + if (cast_rhs)
114474 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
114475 +
114476 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114477 +}
114478 +
114479 +static tree handle_unary_rhs(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
114480 +{
114481 + enum tree_code rhs_code;
114482 + tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt);
114483 +
114484 + if (pointer_set_contains(visited->my_stmts, stmt))
114485 + return lhs;
114486 +
114487 + rhs1 = gimple_assign_rhs1(stmt);
114488 + if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE)
114489 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114490 +
114491 + new_rhs1 = expand(visited, caller_node, rhs1);
114492 +
114493 + if (new_rhs1 == NULL_TREE)
114494 + return create_cast_assign(visited, stmt);
114495 +
114496 + if (pointer_set_contains(visited->no_cast_check, stmt))
114497 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114498 +
114499 + rhs_code = gimple_assign_rhs_code(stmt);
114500 + if (rhs_code == BIT_NOT_EXPR || rhs_code == NEGATE_EXPR) {
114501 + tree size_overflow_type = get_size_overflow_type(visited, stmt, rhs1);
114502 +
114503 + new_rhs1 = cast_to_new_size_overflow_type(visited, stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
114504 + check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
114505 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114506 + }
114507 +
114508 + if (!gimple_assign_cast_p(stmt))
114509 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114510 +
114511 + return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt);
114512 +}
114513 +
114514 +static tree handle_unary_ops(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
114515 +{
114516 + tree rhs1, lhs = gimple_assign_lhs(stmt);
114517 + gimple def_stmt = get_def_stmt(lhs);
114518 +
114519 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
114520 + rhs1 = gimple_assign_rhs1(def_stmt);
114521 +
114522 + if (is_gimple_constant(rhs1))
114523 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114524 +
114525 + switch (TREE_CODE(rhs1)) {
114526 + case SSA_NAME: {
114527 + tree ret = handle_unary_rhs(visited, caller_node, def_stmt);
114528 +
114529 + if (gimple_assign_cast_p(stmt))
114530 + unsigned_signed_cast_intentional_overflow(visited, stmt);
114531 + return ret;
114532 + }
114533 + case ARRAY_REF:
114534 + case BIT_FIELD_REF:
114535 + case ADDR_EXPR:
114536 + case COMPONENT_REF:
114537 + case INDIRECT_REF:
114538 +#if BUILDING_GCC_VERSION >= 4006
114539 + case MEM_REF:
114540 +#endif
114541 + case TARGET_MEM_REF:
114542 + case VIEW_CONVERT_EXPR:
114543 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114544 + case PARM_DECL:
114545 + case VAR_DECL:
114546 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114547 +
114548 + default:
114549 + debug_gimple_stmt(def_stmt);
114550 + debug_tree(rhs1);
114551 + gcc_unreachable();
114552 + }
114553 +}
114554 +
114555 +static void __unused print_the_code_insertions(const_gimple stmt)
114556 +{
114557 + location_t loc = gimple_location(stmt);
114558 +
114559 + inform(loc, "Integer size_overflow check applied here.");
114560 +}
114561 +
114562 +static bool is_from_cast(const_tree node)
114563 +{
114564 + gimple def_stmt = get_def_stmt(node);
114565 +
114566 + if (!def_stmt)
114567 + return false;
114568 +
114569 + if (gimple_assign_cast_p(def_stmt))
114570 + return true;
114571 +
114572 + return false;
114573 +}
114574 +
114575 +// Skip duplication when there is a minus expr and the type of rhs1 or rhs2 is a pointer_type.
114576 +static bool is_a_ptr_minus(gimple stmt)
114577 +{
114578 + const_tree rhs1, rhs2, ptr1_rhs, ptr2_rhs;
114579 +
114580 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
114581 + return false;
114582 +
114583 + rhs1 = gimple_assign_rhs1(stmt);
114584 + if (!is_from_cast(rhs1))
114585 + return false;
114586 +
114587 + rhs2 = gimple_assign_rhs2(stmt);
114588 + if (!is_from_cast(rhs2))
114589 + return false;
114590 +
114591 + ptr1_rhs = gimple_assign_rhs1(get_def_stmt(rhs1));
114592 + ptr2_rhs = gimple_assign_rhs1(get_def_stmt(rhs2));
114593 +
114594 + if (TREE_CODE(TREE_TYPE(ptr1_rhs)) != POINTER_TYPE && TREE_CODE(TREE_TYPE(ptr2_rhs)) != POINTER_TYPE)
114595 + return false;
114596 +
114597 + return true;
114598 +}
114599 +
114600 +static tree handle_binary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114601 +{
114602 + enum intentional_overflow_type res;
114603 + tree rhs1, rhs2, new_lhs;
114604 + gimple def_stmt = get_def_stmt(lhs);
114605 + tree new_rhs1 = NULL_TREE;
114606 + tree new_rhs2 = NULL_TREE;
114607 +
114608 + if (is_a_ptr_minus(def_stmt))
114609 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114610 +
114611 + rhs1 = gimple_assign_rhs1(def_stmt);
114612 + rhs2 = gimple_assign_rhs2(def_stmt);
114613 +
114614 + /* no DImode/TImode division in the 32/64 bit kernel */
114615 + switch (gimple_assign_rhs_code(def_stmt)) {
114616 + case RDIV_EXPR:
114617 + case TRUNC_DIV_EXPR:
114618 + case CEIL_DIV_EXPR:
114619 + case FLOOR_DIV_EXPR:
114620 + case ROUND_DIV_EXPR:
114621 + case TRUNC_MOD_EXPR:
114622 + case CEIL_MOD_EXPR:
114623 + case FLOOR_MOD_EXPR:
114624 + case ROUND_MOD_EXPR:
114625 + case EXACT_DIV_EXPR:
114626 + case POINTER_PLUS_EXPR:
114627 + case BIT_AND_EXPR:
114628 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114629 + default:
114630 + break;
114631 + }
114632 +
114633 + new_lhs = handle_integer_truncation(visited, caller_node, lhs);
114634 + if (new_lhs != NULL_TREE)
114635 + return new_lhs;
114636 +
114637 + if (TREE_CODE(rhs1) == SSA_NAME)
114638 + new_rhs1 = expand(visited, caller_node, rhs1);
114639 + if (TREE_CODE(rhs2) == SSA_NAME)
114640 + new_rhs2 = expand(visited, caller_node, rhs2);
114641 +
114642 + res = add_mul_intentional_overflow(def_stmt);
114643 + if (res != NO_INTENTIONAL_OVERFLOW) {
114644 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114645 + insert_cast_expr(visited, get_def_stmt(new_lhs), res);
114646 + return new_lhs;
114647 + }
114648 +
114649 + if (skip_expr_on_double_type(def_stmt)) {
114650 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114651 + insert_cast_expr(visited, get_def_stmt(new_lhs), NO_INTENTIONAL_OVERFLOW);
114652 + return new_lhs;
114653 + }
114654 +
114655 + if (is_a_neg_overflow(def_stmt, rhs2))
114656 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE);
114657 + if (is_a_neg_overflow(def_stmt, rhs1))
114658 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2);
114659 +
114660 +
114661 + if (is_a_constant_overflow(def_stmt, rhs2))
114662 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
114663 + if (is_a_constant_overflow(def_stmt, rhs1))
114664 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
114665 +
114666 + // the const is between 0 and (signed) MAX
114667 + if (is_gimple_constant(rhs1))
114668 + new_rhs1 = create_assign(visited, def_stmt, rhs1, BEFORE_STMT);
114669 + if (is_gimple_constant(rhs2))
114670 + new_rhs2 = create_assign(visited, def_stmt, rhs2, BEFORE_STMT);
114671 +
114672 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114673 +}
114674 +
114675 +#if BUILDING_GCC_VERSION >= 4006
114676 +static tree get_new_rhs(struct visited *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs)
114677 +{
114678 + if (is_gimple_constant(rhs))
114679 + return cast_a_tree(size_overflow_type, rhs);
114680 + if (TREE_CODE(rhs) != SSA_NAME)
114681 + return NULL_TREE;
114682 + return expand(visited, caller_node, rhs);
114683 +}
114684 +
114685 +static tree handle_ternary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114686 +{
114687 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
114688 + gimple def_stmt = get_def_stmt(lhs);
114689 +
114690 + size_overflow_type = get_size_overflow_type(visited, def_stmt, lhs);
114691 +
114692 + rhs1 = gimple_assign_rhs1(def_stmt);
114693 + rhs2 = gimple_assign_rhs2(def_stmt);
114694 + rhs3 = gimple_assign_rhs3(def_stmt);
114695 + new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1);
114696 + new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2);
114697 + new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3);
114698 +
114699 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
114700 +}
114701 +#endif
114702 +
114703 +static tree get_my_stmt_lhs(struct visited *visited, gimple stmt)
114704 +{
114705 + gimple_stmt_iterator gsi;
114706 + gimple next_stmt = NULL;
114707 +
114708 + gsi = gsi_for_stmt(stmt);
114709 +
114710 + do {
114711 + gsi_next(&gsi);
114712 + next_stmt = gsi_stmt(gsi);
114713 +
114714 + if (gimple_code(stmt) == GIMPLE_PHI && !pointer_set_contains(visited->my_stmts, next_stmt))
114715 + return NULL_TREE;
114716 +
114717 + if (pointer_set_contains(visited->my_stmts, next_stmt) && !pointer_set_contains(visited->skip_expr_casts, next_stmt))
114718 + break;
114719 +
114720 + gcc_assert(pointer_set_contains(visited->my_stmts, next_stmt));
114721 + } while (!gsi_end_p(gsi));
114722 +
114723 + gcc_assert(next_stmt);
114724 + return get_lhs(next_stmt);
114725 +}
114726 +
114727 +static tree expand_visited(struct visited *visited, gimple def_stmt)
114728 +{
114729 + gimple_stmt_iterator gsi;
114730 + enum gimple_code code = gimple_code(def_stmt);
114731 +
114732 + if (code == GIMPLE_ASM)
114733 + return NULL_TREE;
114734 +
114735 + gsi = gsi_for_stmt(def_stmt);
114736 + gsi_next(&gsi);
114737 +
114738 + if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi))
114739 + return NULL_TREE;
114740 + return get_my_stmt_lhs(visited, def_stmt);
114741 +}
114742 +
114743 +tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114744 +{
114745 + gimple def_stmt;
114746 +
114747 + def_stmt = get_def_stmt(lhs);
114748 +
114749 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
114750 + return NULL_TREE;
114751 +
114752 + if (pointer_set_contains(visited->my_stmts, def_stmt))
114753 + return lhs;
114754 +
114755 + if (pointer_set_contains(visited->stmts, def_stmt))
114756 + return expand_visited(visited, def_stmt);
114757 +
114758 + switch (gimple_code(def_stmt)) {
114759 + case GIMPLE_PHI:
114760 + return handle_phi(visited, caller_node, lhs);
114761 + case GIMPLE_CALL:
114762 + case GIMPLE_ASM:
114763 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114764 + case GIMPLE_ASSIGN:
114765 + switch (gimple_num_ops(def_stmt)) {
114766 + case 2:
114767 + return handle_unary_ops(visited, caller_node, def_stmt);
114768 + case 3:
114769 + return handle_binary_ops(visited, caller_node, lhs);
114770 +#if BUILDING_GCC_VERSION >= 4006
114771 + case 4:
114772 + return handle_ternary_ops(visited, caller_node, lhs);
114773 +#endif
114774 + }
114775 + default:
114776 + debug_gimple_stmt(def_stmt);
114777 + error("%s: unknown gimple code", __func__);
114778 + gcc_unreachable();
114779 + }
114780 +}
114781 +
114782 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
114783 new file mode 100644
114784 index 0000000..df50164
114785 --- /dev/null
114786 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c
114787 @@ -0,0 +1,1141 @@
114788 +/*
114789 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
114790 + * Licensed under the GPL v2, or (at your option) v3
114791 + *
114792 + * Homepage:
114793 + * http://www.grsecurity.net/~ephox/overflow_plugin/
114794 + *
114795 + * Documentation:
114796 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
114797 + *
114798 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
114799 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
114800 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
114801 + *
114802 + * Usage:
114803 + * $ make
114804 + * $ make run
114805 + */
114806 +
114807 +#include "gcc-common.h"
114808 +#include "size_overflow.h"
114809 +
114810 +#define VEC_LEN 128
114811 +#define RET_CHECK NULL_TREE
114812 +#define WRONG_NODE 32
114813 +#define NOT_INTENTIONAL_ASM NULL
114814 +
114815 +unsigned int call_count;
114816 +
114817 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs);
114818 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs);
114819 +
114820 +struct visited_fns {
114821 + struct visited_fns *next;
114822 + const_tree fndecl;
114823 + unsigned int num;
114824 + const_gimple first_stmt;
114825 +};
114826 +
114827 +struct next_cgraph_node {
114828 + struct next_cgraph_node *next;
114829 + struct cgraph_node *current_function;
114830 + tree callee_fndecl;
114831 + unsigned int num;
114832 +};
114833 +
114834 +// Don't want to duplicate entries in next_cgraph_node
114835 +static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num)
114836 +{
114837 + const_tree new_callee_fndecl;
114838 + struct next_cgraph_node *cur_node;
114839 +
114840 + if (fndecl == RET_CHECK)
114841 + new_callee_fndecl = NODE_DECL(node);
114842 + else
114843 + new_callee_fndecl = fndecl;
114844 +
114845 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
114846 + if (!operand_equal_p(NODE_DECL(cur_node->current_function), NODE_DECL(node), 0))
114847 + continue;
114848 + if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0))
114849 + continue;
114850 + if (num == cur_node->num)
114851 + return true;
114852 + }
114853 + return false;
114854 +}
114855 +
114856 +/* Add a next_cgraph_node into the list for handle_function().
114857 + * handle_function() iterates over all the next cgraph nodes and
114858 + * starts the overflow check insertion process.
114859 + */
114860 +static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num)
114861 +{
114862 + struct next_cgraph_node *new_node;
114863 +
114864 + if (is_in_next_cgraph_node(head, node, fndecl, num))
114865 + return head;
114866 +
114867 + new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node));
114868 + new_node->current_function = node;
114869 + new_node->next = NULL;
114870 + new_node->num = num;
114871 + if (fndecl == RET_CHECK)
114872 + new_node->callee_fndecl = NODE_DECL(node);
114873 + else
114874 + new_node->callee_fndecl = fndecl;
114875 +
114876 + if (!head)
114877 + return new_node;
114878 +
114879 + new_node->next = head;
114880 + return new_node;
114881 +}
114882 +
114883 +static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num)
114884 +{
114885 + struct cgraph_edge *e;
114886 +
114887 + if (num == 0)
114888 + return create_new_next_cgraph_node(head, node, RET_CHECK, num);
114889 +
114890 + for (e = node->callers; e; e = e->next_caller) {
114891 + tree fndecl = gimple_call_fndecl(e->call_stmt);
114892 +
114893 + gcc_assert(fndecl != NULL_TREE);
114894 + head = create_new_next_cgraph_node(head, e->caller, fndecl, num);
114895 + }
114896 +
114897 + return head;
114898 +}
114899 +
114900 +struct missing_functions {
114901 + struct missing_functions *next;
114902 + const_tree node;
114903 + tree fndecl;
114904 +};
114905 +
114906 +static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node)
114907 +{
114908 + struct missing_functions *new_function;
114909 +
114910 + new_function = (struct missing_functions *)xmalloc(sizeof(*new_function));
114911 + new_function->node = node;
114912 + new_function->next = NULL;
114913 +
114914 + if (TREE_CODE(node) == FUNCTION_DECL)
114915 + new_function->fndecl = node;
114916 + else
114917 + new_function->fndecl = current_function_decl;
114918 + gcc_assert(new_function->fndecl);
114919 +
114920 + if (!missing_fn_head)
114921 + return new_function;
114922 +
114923 + new_function->next = missing_fn_head;
114924 + return new_function;
114925 +}
114926 +
114927 +/* If the function is missing from the hash table and it is a static function
114928 + * then create a next_cgraph_node from it for handle_function()
114929 + */
114930 +static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head)
114931 +{
114932 + unsigned int num;
114933 + const_tree orig_fndecl;
114934 + struct cgraph_node *next_node = NULL;
114935 +
114936 + orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl);
114937 +
114938 + num = get_function_num(missing_fn_head->node, orig_fndecl);
114939 + if (num == CANNOT_FIND_ARG)
114940 + return cnodes;
114941 +
114942 + if (!is_missing_function(orig_fndecl, num))
114943 + return cnodes;
114944 +
114945 + next_node = cgraph_get_node(missing_fn_head->fndecl);
114946 + if (next_node && next_node->local.local)
114947 + cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num);
114948 + return cnodes;
114949 +}
114950 +
114951 +/* Search for missing size_overflow attributes on the last nodes in ipa and collect them
114952 + * into the next_cgraph_node list. They will be the next interesting returns or callees.
114953 + */
114954 +static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node)
114955 +{
114956 + unsigned int i;
114957 + tree node;
114958 + struct missing_functions *cur, *missing_fn_head = NULL;
114959 +
114960 +#if BUILDING_GCC_VERSION <= 4007
114961 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) {
114962 +#else
114963 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) {
114964 +#endif
114965 + switch (TREE_CODE(node)) {
114966 + case PARM_DECL:
114967 + if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE)
114968 + break;
114969 + case FUNCTION_DECL:
114970 + missing_fn_head = create_new_missing_function(missing_fn_head, node);
114971 + break;
114972 + default:
114973 + break;
114974 + }
114975 + }
114976 +
114977 + while (missing_fn_head) {
114978 + cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head);
114979 +
114980 + cur = missing_fn_head->next;
114981 + free(missing_fn_head);
114982 + missing_fn_head = cur;
114983 + }
114984 +
114985 + return cnodes;
114986 +}
114987 +
114988 +static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result)
114989 +{
114990 + gimple phi = get_def_stmt(result);
114991 + unsigned int i, n = gimple_phi_num_args(phi);
114992 +
114993 + pointer_set_insert(visited, phi);
114994 + for (i = 0; i < n; i++) {
114995 + const_tree arg = gimple_phi_arg_def(phi, i);
114996 +
114997 + set_conditions(visited, interesting_conditions, arg);
114998 + }
114999 +}
115000 +
115001 +enum conditions {
115002 + FROM_CONST, NOT_UNARY, CAST, RET, PHI
115003 +};
115004 +
115005 +// Search for constants, cast assignments and binary/ternary assignments
115006 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs)
115007 +{
115008 + gimple def_stmt = get_def_stmt(lhs);
115009 +
115010 + if (is_gimple_constant(lhs)) {
115011 + interesting_conditions[FROM_CONST] = true;
115012 + return;
115013 + }
115014 +
115015 + if (!def_stmt)
115016 + return;
115017 +
115018 + if (pointer_set_contains(visited, def_stmt))
115019 + return;
115020 +
115021 + switch (gimple_code(def_stmt)) {
115022 + case GIMPLE_CALL:
115023 + if (lhs == gimple_call_lhs(def_stmt))
115024 + interesting_conditions[RET] = true;
115025 + return;
115026 + case GIMPLE_NOP:
115027 + case GIMPLE_ASM:
115028 + return;
115029 + case GIMPLE_PHI:
115030 + interesting_conditions[PHI] = true;
115031 + return walk_phi_set_conditions(visited, interesting_conditions, lhs);
115032 + case GIMPLE_ASSIGN:
115033 + if (gimple_num_ops(def_stmt) == 2) {
115034 + const_tree rhs = gimple_assign_rhs1(def_stmt);
115035 +
115036 + if (gimple_assign_cast_p(def_stmt))
115037 + interesting_conditions[CAST] = true;
115038 +
115039 + return set_conditions(visited, interesting_conditions, rhs);
115040 + } else {
115041 + interesting_conditions[NOT_UNARY] = true;
115042 + return;
115043 + }
115044 + default:
115045 + debug_gimple_stmt(def_stmt);
115046 + gcc_unreachable();
115047 + }
115048 +}
115049 +
115050 +// determine whether duplication will be necessary or not.
115051 +static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions)
115052 +{
115053 + struct pointer_set_t *visited;
115054 +
115055 + if (gimple_assign_cast_p(cur_node->first_stmt))
115056 + interesting_conditions[CAST] = true;
115057 + else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2)
115058 + interesting_conditions[NOT_UNARY] = true;
115059 +
115060 + visited = pointer_set_create();
115061 + set_conditions(visited, interesting_conditions, cur_node->node);
115062 + pointer_set_destroy(visited);
115063 +}
115064 +
115065 +// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm
115066 +static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs)
115067 +{
115068 + gimple assign;
115069 + gimple_stmt_iterator gsi;
115070 +
115071 + // already removed
115072 + if (gimple_bb(asm_stmt) == NULL)
115073 + return;
115074 + gsi = gsi_for_stmt(asm_stmt);
115075 +
115076 + assign = gimple_build_assign(lhs, rhs);
115077 + gsi_insert_before(&gsi, assign, GSI_SAME_STMT);
115078 + SSA_NAME_DEF_STMT(lhs) = assign;
115079 +
115080 + gsi_remove(&gsi, true);
115081 +}
115082 +
115083 +/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting
115084 + * stmt is a return otherwise it is the callee function.
115085 + */
115086 +const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum)
115087 +{
115088 + const_tree fndecl;
115089 +
115090 + if (argnum == 0)
115091 + fndecl = current_function_decl;
115092 + else
115093 + fndecl = gimple_call_fndecl(stmt);
115094 +
115095 + if (fndecl == NULL_TREE)
115096 + return NULL_TREE;
115097 +
115098 + return DECL_ORIGIN(fndecl);
115099 +}
115100 +
115101 +// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
115102 +static bool skip_asm(const_tree arg)
115103 +{
115104 + gimple def_stmt = get_def_stmt(arg);
115105 +
115106 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
115107 + return false;
115108 +
115109 + def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
115110 + return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
115111 +}
115112 +
115113 +static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result)
115114 +{
115115 + gimple phi = get_def_stmt(result);
115116 + unsigned int i, n = gimple_phi_num_args(phi);
115117 +
115118 + pointer_set_insert(visited, phi);
115119 + for (i = 0; i < n; i++) {
115120 + tree arg = gimple_phi_arg_def(phi, i);
115121 +
115122 + walk_use_def(visited, cur_node, arg);
115123 + }
115124 +}
115125 +
115126 +static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
115127 +{
115128 + gimple def_stmt = get_def_stmt(lhs);
115129 + tree rhs1, rhs2;
115130 +
115131 + rhs1 = gimple_assign_rhs1(def_stmt);
115132 + rhs2 = gimple_assign_rhs2(def_stmt);
115133 +
115134 + walk_use_def(visited, cur_node, rhs1);
115135 + walk_use_def(visited, cur_node, rhs2);
115136 +}
115137 +
115138 +static void insert_last_node(struct interesting_node *cur_node, tree node)
115139 +{
115140 + unsigned int i;
115141 + tree element;
115142 + enum tree_code code;
115143 +
115144 + gcc_assert(node != NULL_TREE);
115145 +
115146 + if (is_gimple_constant(node))
115147 + return;
115148 +
115149 + code = TREE_CODE(node);
115150 + if (code == VAR_DECL) {
115151 + node = DECL_ORIGIN(node);
115152 + code = TREE_CODE(node);
115153 + }
115154 +
115155 + if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF)
115156 + return;
115157 +
115158 +#if BUILDING_GCC_VERSION <= 4007
115159 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) {
115160 +#else
115161 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) {
115162 +#endif
115163 + if (operand_equal_p(node, element, 0))
115164 + return;
115165 + }
115166 +
115167 +#if BUILDING_GCC_VERSION <= 4007
115168 + gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN);
115169 + VEC_safe_push(tree, gc, cur_node->last_nodes, node);
115170 +#else
115171 + gcc_assert(cur_node->last_nodes->length() < VEC_LEN);
115172 + vec_safe_push(cur_node->last_nodes, node);
115173 +#endif
115174 +}
115175 +
115176 +// a size_overflow asm stmt in the control flow doesn't stop the recursion
115177 +static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt)
115178 +{
115179 + if (!is_size_overflow_asm(stmt))
115180 + walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
115181 +}
115182 +
115183 +/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow)
115184 + * and component refs (for checking the intentional_overflow attribute).
115185 + */
115186 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
115187 +{
115188 + const_gimple def_stmt;
115189 +
115190 + if (TREE_CODE(lhs) != SSA_NAME) {
115191 + insert_last_node(cur_node, lhs);
115192 + return;
115193 + }
115194 +
115195 + def_stmt = get_def_stmt(lhs);
115196 + if (!def_stmt)
115197 + return;
115198 +
115199 + if (pointer_set_insert(visited, def_stmt))
115200 + return;
115201 +
115202 + switch (gimple_code(def_stmt)) {
115203 + case GIMPLE_NOP:
115204 + return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
115205 + case GIMPLE_ASM:
115206 + return handle_asm_stmt(visited, cur_node, lhs, def_stmt);
115207 + case GIMPLE_CALL: {
115208 + tree fndecl = gimple_call_fndecl(def_stmt);
115209 +
115210 + if (fndecl == NULL_TREE)
115211 + return;
115212 + insert_last_node(cur_node, fndecl);
115213 + return;
115214 + }
115215 + case GIMPLE_PHI:
115216 + return walk_use_def_phi(visited, cur_node, lhs);
115217 + case GIMPLE_ASSIGN:
115218 + switch (gimple_num_ops(def_stmt)) {
115219 + case 2:
115220 + return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt));
115221 + case 3:
115222 + return walk_use_def_binary(visited, cur_node, lhs);
115223 + }
115224 + default:
115225 + debug_gimple_stmt((gimple)def_stmt);
115226 + error("%s: unknown gimple code", __func__);
115227 + gcc_unreachable();
115228 + }
115229 +}
115230 +
115231 +// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes
115232 +static void set_last_nodes(struct interesting_node *cur_node)
115233 +{
115234 + struct pointer_set_t *visited;
115235 +
115236 + visited = pointer_set_create();
115237 + walk_use_def(visited, cur_node, cur_node->node);
115238 + pointer_set_destroy(visited);
115239 +}
115240 +
115241 +enum precond {
115242 + NO_ATTRIBUTE_SEARCH, NO_CHECK_INSERT, NONE
115243 +};
115244 +
115245 +/* 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.
115246 + * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type.
115247 + * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast.
115248 + * It skips the possible error codes too.
115249 + */
115250 +static enum precond check_preconditions(struct interesting_node *cur_node)
115251 +{
115252 + bool interesting_conditions[5] = {false, false, false, false, false};
115253 +
115254 + set_last_nodes(cur_node);
115255 +
115256 + check_intentional_attribute_ipa(cur_node);
115257 + if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF)
115258 + return NO_ATTRIBUTE_SEARCH;
115259 +
115260 + search_interesting_conditions(cur_node, interesting_conditions);
115261 +
115262 + // error code: a phi, unary assign (not cast) and returns only
115263 + if (!interesting_conditions[NOT_UNARY] && interesting_conditions[PHI] && interesting_conditions[RET] && !interesting_conditions[CAST])
115264 + return NO_ATTRIBUTE_SEARCH;
115265 +
115266 + // error code: def_stmts trace back to a constant and there are no binary/ternary assigments
115267 + if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY])
115268 + return NO_ATTRIBUTE_SEARCH;
115269 +
115270 + // unnecessary overflow check
115271 + if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY])
115272 + return NO_CHECK_INSERT;
115273 +
115274 + if (cur_node->intentional_attr_cur_fndecl != MARK_NO)
115275 + return NO_CHECK_INSERT;
115276 +
115277 + return NONE;
115278 +}
115279 +
115280 +static tree cast_to_orig_type(struct visited *visited, gimple stmt, const_tree orig_node, tree new_node)
115281 +{
115282 + const_gimple assign;
115283 + tree orig_type = TREE_TYPE(orig_node);
115284 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
115285 +
115286 + assign = build_cast_stmt(visited, orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
115287 + return gimple_assign_lhs(assign);
115288 +}
115289 +
115290 +static void change_orig_node(struct visited *visited, struct interesting_node *cur_node, tree new_node)
115291 +{
115292 + void (*set_rhs)(gimple, tree);
115293 + gimple stmt = cur_node->first_stmt;
115294 + const_tree orig_node = cur_node->node;
115295 +
115296 + switch (gimple_code(stmt)) {
115297 + case GIMPLE_RETURN:
115298 + gimple_return_set_retval(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
115299 + break;
115300 + case GIMPLE_CALL:
115301 + gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(visited, stmt, orig_node, new_node));
115302 + break;
115303 + case GIMPLE_ASSIGN:
115304 + switch (cur_node->num) {
115305 + case 1:
115306 + set_rhs = &gimple_assign_set_rhs1;
115307 + break;
115308 + case 2:
115309 + set_rhs = &gimple_assign_set_rhs2;
115310 + break;
115311 +#if BUILDING_GCC_VERSION >= 4006
115312 + case 3:
115313 + set_rhs = &gimple_assign_set_rhs3;
115314 + break;
115315 +#endif
115316 + default:
115317 + gcc_unreachable();
115318 + }
115319 +
115320 + set_rhs(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
115321 + break;
115322 + default:
115323 + debug_gimple_stmt(stmt);
115324 + gcc_unreachable();
115325 + }
115326 +
115327 + update_stmt(stmt);
115328 +}
115329 +
115330 +static struct visited *create_visited(void)
115331 +{
115332 + struct visited *new_node;
115333 +
115334 + new_node = (struct visited *)xmalloc(sizeof(*new_node));
115335 + new_node->stmts = pointer_set_create();
115336 + new_node->my_stmts = pointer_set_create();
115337 + new_node->skip_expr_casts = pointer_set_create();
115338 + new_node->no_cast_check = pointer_set_create();
115339 + return new_node;
115340 +}
115341 +
115342 +static void free_visited(struct visited *visited)
115343 +{
115344 + pointer_set_destroy(visited->stmts);
115345 + pointer_set_destroy(visited->my_stmts);
115346 + pointer_set_destroy(visited->skip_expr_casts);
115347 + pointer_set_destroy(visited->no_cast_check);
115348 +
115349 + free(visited);
115350 +}
115351 +
115352 +/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts,
115353 + * 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
115354 + * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value.
115355 + */
115356 +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)
115357 +{
115358 + enum precond ret;
115359 + tree new_node, orig_node = cur_node->node;
115360 +
115361 + ret = check_preconditions(cur_node);
115362 + if (ret == NO_ATTRIBUTE_SEARCH)
115363 + return cnodes;
115364 +
115365 + cnodes = search_overflow_attribute(cnodes, cur_node);
115366 +
115367 + if (ret == NO_CHECK_INSERT)
115368 + return cnodes;
115369 +
115370 + new_node = expand(visited, caller_node, orig_node);
115371 + if (new_node == NULL_TREE)
115372 + return cnodes;
115373 +
115374 + change_orig_node(visited, cur_node, new_node);
115375 + check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT);
115376 +
115377 + return cnodes;
115378 +}
115379 +
115380 +// Check visited_fns interesting nodes.
115381 +static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num)
115382 +{
115383 + struct interesting_node *cur;
115384 +
115385 + for (cur = head; cur; cur = cur->next) {
115386 + if (!operand_equal_p(node, cur->node, 0))
115387 + continue;
115388 + if (num != cur->num)
115389 + continue;
115390 + if (first_stmt == cur->first_stmt)
115391 + return true;
115392 + }
115393 + return false;
115394 +}
115395 +
115396 +/* Create an interesting node. The ipa pass starts to duplicate from these stmts.
115397 + 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
115398 + 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
115399 + the intentional_overflow attribute check. They are collected by set_last_nodes().
115400 + num: arg count of a call stmt or 0 when it is a ret
115401 + node: the recursion starts from here, it is a call arg or a return value
115402 + 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.
115403 + intentional_attr_decl: intentional_overflow attribute of the callee function
115404 + intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function
115405 + intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists
115406 + */
115407 +static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt)
115408 +{
115409 + struct interesting_node *new_node;
115410 + tree fndecl;
115411 + enum gimple_code code;
115412 +
115413 + gcc_assert(node != NULL_TREE);
115414 + code = gimple_code(first_stmt);
115415 + gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN);
115416 +
115417 + if (num == CANNOT_FIND_ARG)
115418 + return head;
115419 +
115420 + if (skip_types(node))
115421 + return head;
115422 +
115423 + if (skip_asm(node))
115424 + return head;
115425 +
115426 + if (is_gimple_call(first_stmt))
115427 + fndecl = gimple_call_fndecl(first_stmt);
115428 + else
115429 + fndecl = current_function_decl;
115430 +
115431 + if (fndecl == NULL_TREE)
115432 + return head;
115433 +
115434 + if (is_in_interesting_node(head, first_stmt, node, num))
115435 + return head;
115436 +
115437 + new_node = (struct interesting_node *)xmalloc(sizeof(*new_node));
115438 +
115439 + new_node->next = NULL;
115440 + new_node->first_stmt = first_stmt;
115441 +#if BUILDING_GCC_VERSION <= 4007
115442 + new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN);
115443 +#else
115444 + vec_alloc(new_node->last_nodes, VEC_LEN);
115445 +#endif
115446 + new_node->num = num;
115447 + new_node->node = node;
115448 + new_node->fndecl = fndecl;
115449 + new_node->intentional_attr_decl = MARK_NO;
115450 + new_node->intentional_attr_cur_fndecl = MARK_NO;
115451 + new_node->intentional_mark_from_gimple = asm_stmt;
115452 +
115453 + if (!head)
115454 + return new_node;
115455 +
115456 + new_node->next = head;
115457 + return new_node;
115458 +}
115459 +
115460 +/* 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).
115461 + * If the ret stmt is in the next cgraph node list then it's an interesting ret.
115462 + */
115463 +static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
115464 +{
115465 + struct next_cgraph_node *cur_node;
115466 + tree ret = gimple_return_retval(stmt);
115467 +
115468 + if (ret == NULL_TREE)
115469 + return head;
115470 +
115471 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
115472 + if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0))
115473 + continue;
115474 + if (cur_node->num == 0)
115475 + head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM);
115476 + }
115477 +
115478 + return head;
115479 +}
115480 +
115481 +/* 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).
115482 + * If the call stmt is in the next cgraph node list then it's an interesting call.
115483 + */
115484 +static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
115485 +{
115486 + unsigned int argnum;
115487 + tree arg;
115488 + const_tree fndecl;
115489 + struct next_cgraph_node *cur_node;
115490 +
115491 + fndecl = gimple_call_fndecl(stmt);
115492 + if (fndecl == NULL_TREE)
115493 + return head;
115494 +
115495 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
115496 + if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0))
115497 + continue;
115498 + argnum = get_correct_arg_count(cur_node->num, fndecl);
115499 + gcc_assert(argnum != CANNOT_FIND_ARG);
115500 + if (argnum == 0)
115501 + continue;
115502 +
115503 + arg = gimple_call_arg(stmt, argnum - 1);
115504 + head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM);
115505 + }
115506 +
115507 + return head;
115508 +}
115509 +
115510 +static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count)
115511 +{
115512 + if (!operand_equal_p(orig_node, node, 0))
115513 + return WRONG_NODE;
115514 + if (skip_types(node))
115515 + return WRONG_NODE;
115516 + return ret_count;
115517 +}
115518 +
115519 +// Get the index of the rhs node in an assignment
115520 +static unsigned int get_assign_ops_count(const_gimple stmt, tree node)
115521 +{
115522 + const_tree rhs1, rhs2;
115523 + unsigned int ret;
115524 +
115525 + gcc_assert(stmt);
115526 + gcc_assert(is_gimple_assign(stmt));
115527 +
115528 + rhs1 = gimple_assign_rhs1(stmt);
115529 + gcc_assert(rhs1 != NULL_TREE);
115530 +
115531 + switch (gimple_num_ops(stmt)) {
115532 + case 2:
115533 + return check_ops(node, rhs1, 1);
115534 + case 3:
115535 + ret = check_ops(node, rhs1, 1);
115536 + if (ret != WRONG_NODE)
115537 + return ret;
115538 +
115539 + rhs2 = gimple_assign_rhs2(stmt);
115540 + gcc_assert(rhs2 != NULL_TREE);
115541 + return check_ops(node, rhs2, 2);
115542 + default:
115543 + gcc_unreachable();
115544 + }
115545 +}
115546 +
115547 +// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function.
115548 +static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt)
115549 +{
115550 + unsigned int i;
115551 +
115552 + if (gimple_call_fndecl(stmt) == NULL_TREE)
115553 + return CANNOT_FIND_ARG;
115554 +
115555 + for (i = 0; i < gimple_call_num_args(stmt); i++) {
115556 + tree node;
115557 +
115558 + node = gimple_call_arg(stmt, i);
115559 + if (!operand_equal_p(arg, node, 0))
115560 + continue;
115561 + if (!skip_types(node))
115562 + return i + 1;
115563 + }
115564 +
115565 + return CANNOT_FIND_ARG;
115566 +}
115567 +
115568 +/* starting from the size_overflow asm stmt collect interesting stmts. They can be
115569 + * any of return, call or assignment stmts (because of inlining).
115570 + */
115571 +static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm)
115572 +{
115573 + use_operand_p use_p;
115574 + imm_use_iterator imm_iter;
115575 + unsigned int argnum;
115576 +
115577 + gcc_assert(TREE_CODE(node) == SSA_NAME);
115578 +
115579 + if (pointer_set_insert(visited, node))
115580 + return head;
115581 +
115582 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
115583 + gimple stmt = USE_STMT(use_p);
115584 +
115585 + if (stmt == NULL)
115586 + return head;
115587 + if (is_gimple_debug(stmt))
115588 + continue;
115589 +
115590 + switch (gimple_code(stmt)) {
115591 + case GIMPLE_CALL:
115592 + argnum = find_arg_number_gimple(node, stmt);
115593 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
115594 + break;
115595 + case GIMPLE_RETURN:
115596 + head = create_new_interesting_node(head, stmt, node, 0, intentional_asm);
115597 + break;
115598 + case GIMPLE_ASSIGN:
115599 + argnum = get_assign_ops_count(stmt, node);
115600 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
115601 + break;
115602 + case GIMPLE_PHI: {
115603 + tree result = gimple_phi_result(stmt);
115604 + head = get_interesting_ret_or_call(visited, head, result, intentional_asm);
115605 + break;
115606 + }
115607 + case GIMPLE_ASM:
115608 + if (gimple_asm_noutputs(stmt) != 0)
115609 + break;
115610 + if (!is_size_overflow_asm(stmt))
115611 + break;
115612 + head = create_new_interesting_node(head, stmt, node, 1, intentional_asm);
115613 + break;
115614 + case GIMPLE_COND:
115615 + case GIMPLE_SWITCH:
115616 + break;
115617 + default:
115618 + debug_gimple_stmt(stmt);
115619 + gcc_unreachable();
115620 + break;
115621 + }
115622 + }
115623 + return head;
115624 +}
115625 +
115626 +static void remove_size_overflow_asm(gimple stmt)
115627 +{
115628 + gimple_stmt_iterator gsi;
115629 + tree input, output;
115630 +
115631 + if (!is_size_overflow_asm(stmt))
115632 + return;
115633 +
115634 + if (gimple_asm_noutputs(stmt) == 0) {
115635 + gsi = gsi_for_stmt(stmt);
115636 + ipa_remove_stmt_references(cgraph_get_create_node(current_function_decl), stmt);
115637 + gsi_remove(&gsi, true);
115638 + return;
115639 + }
115640 +
115641 + input = gimple_asm_input_op(stmt, 0);
115642 + output = gimple_asm_output_op(stmt, 0);
115643 + replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input));
115644 +}
115645 +
115646 +/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts.
115647 + * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it.
115648 + * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output.
115649 + */
115650 +static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head)
115651 +{
115652 + const_tree output;
115653 + struct pointer_set_t *visited;
115654 + gimple intentional_asm = NOT_INTENTIONAL_ASM;
115655 +
115656 + if (!is_size_overflow_asm(stmt))
115657 + return head;
115658 +
115659 + if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt))
115660 + intentional_asm = stmt;
115661 +
115662 + gcc_assert(gimple_asm_ninputs(stmt) == 1);
115663 +
115664 + if (gimple_asm_noutputs(stmt) == 0 && is_size_overflow_intentional_asm_turn_off(stmt))
115665 + return head;
115666 +
115667 + if (gimple_asm_noutputs(stmt) == 0) {
115668 + const_tree input;
115669 +
115670 + if (!is_size_overflow_intentional_asm_turn_off(stmt))
115671 + return head;
115672 +
115673 + input = gimple_asm_input_op(stmt, 0);
115674 + remove_size_overflow_asm(stmt);
115675 + if (is_gimple_constant(TREE_VALUE(input)))
115676 + return head;
115677 + visited = pointer_set_create();
115678 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm);
115679 + pointer_set_destroy(visited);
115680 + return head;
115681 + }
115682 +
115683 + if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt))
115684 + remove_size_overflow_asm(stmt);
115685 +
115686 + visited = pointer_set_create();
115687 + output = gimple_asm_output_op(stmt, 0);
115688 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm);
115689 + pointer_set_destroy(visited);
115690 + return head;
115691 +}
115692 +
115693 +/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass)
115694 + * or a call stmt or a return stmt and store them in the interesting_node list
115695 + */
115696 +static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node)
115697 +{
115698 + basic_block bb;
115699 + struct interesting_node *head = NULL;
115700 +
115701 + FOR_ALL_BB_FN(bb, cfun) {
115702 + gimple_stmt_iterator gsi;
115703 +
115704 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
115705 + enum gimple_code code;
115706 + gimple stmt = gsi_stmt(gsi);
115707 +
115708 + code = gimple_code(stmt);
115709 +
115710 + if (code == GIMPLE_ASM)
115711 + head = handle_stmt_by_size_overflow_asm(stmt, head);
115712 +
115713 + if (!next_node)
115714 + continue;
115715 + if (code == GIMPLE_CALL)
115716 + head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node);
115717 + if (code == GIMPLE_RETURN)
115718 + head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node);
115719 + }
115720 + }
115721 + return head;
115722 +}
115723 +
115724 +static void free_interesting_node(struct interesting_node *head)
115725 +{
115726 + struct interesting_node *cur;
115727 +
115728 + while (head) {
115729 + cur = head->next;
115730 +#if BUILDING_GCC_VERSION <= 4007
115731 + VEC_free(tree, gc, head->last_nodes);
115732 +#else
115733 + vec_free(head->last_nodes);
115734 +#endif
115735 + free(head);
115736 + head = cur;
115737 + }
115738 +}
115739 +
115740 +static struct visited_fns *insert_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
115741 +{
115742 + struct visited_fns *new_visited_fns;
115743 +
115744 + new_visited_fns = (struct visited_fns *)xmalloc(sizeof(*new_visited_fns));
115745 + new_visited_fns->fndecl = cur_node->fndecl;
115746 + new_visited_fns->num = cur_node->num;
115747 + new_visited_fns->first_stmt = cur_node->first_stmt;
115748 + new_visited_fns->next = NULL;
115749 +
115750 + if (!head)
115751 + return new_visited_fns;
115752 +
115753 + new_visited_fns->next = head;
115754 + return new_visited_fns;
115755 +}
115756 +
115757 +/* 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
115758 + * it is a visited_fns function.
115759 + */
115760 +static bool is_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
115761 +{
115762 + struct visited_fns *cur;
115763 +
115764 + if (!head)
115765 + return false;
115766 +
115767 + for (cur = head; cur; cur = cur->next) {
115768 + if (cur_node->first_stmt != cur->first_stmt)
115769 + continue;
115770 + if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0))
115771 + continue;
115772 + if (cur_node->num == cur->num)
115773 + return true;
115774 + }
115775 + return false;
115776 +}
115777 +
115778 +static void free_next_cgraph_node(struct next_cgraph_node *head)
115779 +{
115780 + struct next_cgraph_node *cur;
115781 +
115782 + while (head) {
115783 + cur = head->next;
115784 + free(head);
115785 + head = cur;
115786 + }
115787 +}
115788 +
115789 +static void remove_all_size_overflow_asm(void)
115790 +{
115791 + basic_block bb;
115792 +
115793 + FOR_ALL_BB_FN(bb, cfun) {
115794 + gimple_stmt_iterator si;
115795 +
115796 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
115797 + remove_size_overflow_asm(gsi_stmt(si));
115798 + }
115799 +}
115800 +
115801 +/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function
115802 + * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk
115803 + * the newly collected interesting functions (they are interesting if there is control flow between
115804 + * the interesting stmts and them).
115805 + */
115806 +static struct visited_fns *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited_fns *visited_fns)
115807 +{
115808 + struct visited *visited;
115809 + struct interesting_node *head, *cur_node;
115810 + struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL;
115811 +
115812 + set_current_function_decl(NODE_DECL(node));
115813 + call_count = 0;
115814 +
115815 + head = collect_interesting_stmts(next_node);
115816 +
115817 + visited = create_visited();
115818 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
115819 + if (is_visited_fns_function(visited_fns, cur_node))
115820 + continue;
115821 + cnodes_head = handle_interesting_stmt(visited, cnodes_head, cur_node, node);
115822 + visited_fns = insert_visited_fns_function(visited_fns, cur_node);
115823 + }
115824 +
115825 + free_visited(visited);
115826 + free_interesting_node(head);
115827 + remove_all_size_overflow_asm();
115828 + unset_current_function_decl();
115829 +
115830 + for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next)
115831 + visited_fns = handle_function(cur_cnodes->current_function, cur_cnodes, visited_fns);
115832 +
115833 + free_next_cgraph_node(cnodes_head);
115834 + return visited_fns;
115835 +}
115836 +
115837 +static void free_visited_fns(struct visited_fns *head)
115838 +{
115839 + struct visited_fns *cur;
115840 +
115841 + while (head) {
115842 + cur = head->next;
115843 + free(head);
115844 + head = cur;
115845 + }
115846 +}
115847 +
115848 +// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions
115849 +unsigned int search_function(void)
115850 +{
115851 + struct cgraph_node *node;
115852 + struct visited_fns *visited_fns = NULL;
115853 +
115854 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
115855 + gcc_assert(cgraph_function_flags_ready);
115856 +#if BUILDING_GCC_VERSION <= 4007
115857 + gcc_assert(node->reachable);
115858 +#endif
115859 +
115860 + visited_fns = handle_function(node, NULL, visited_fns);
115861 + }
115862 +
115863 + free_visited_fns(visited_fns);
115864 + return 0;
115865 +}
115866 +
115867 +#if BUILDING_GCC_VERSION >= 4009
115868 +static const struct pass_data insert_size_overflow_check_data = {
115869 +#else
115870 +static struct ipa_opt_pass_d insert_size_overflow_check = {
115871 + .pass = {
115872 +#endif
115873 + .type = SIMPLE_IPA_PASS,
115874 + .name = "size_overflow",
115875 +#if BUILDING_GCC_VERSION >= 4008
115876 + .optinfo_flags = OPTGROUP_NONE,
115877 +#endif
115878 +#if BUILDING_GCC_VERSION >= 4009
115879 + .has_gate = false,
115880 + .has_execute = true,
115881 +#else
115882 + .gate = NULL,
115883 + .execute = search_function,
115884 + .sub = NULL,
115885 + .next = NULL,
115886 + .static_pass_number = 0,
115887 +#endif
115888 + .tv_id = TV_NONE,
115889 + .properties_required = 0,
115890 + .properties_provided = 0,
115891 + .properties_destroyed = 0,
115892 + .todo_flags_start = 0,
115893 + .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,
115894 +#if BUILDING_GCC_VERSION < 4009
115895 + },
115896 + .generate_summary = NULL,
115897 + .write_summary = NULL,
115898 + .read_summary = NULL,
115899 +#if BUILDING_GCC_VERSION >= 4006
115900 + .write_optimization_summary = NULL,
115901 + .read_optimization_summary = NULL,
115902 +#endif
115903 + .stmt_fixup = NULL,
115904 + .function_transform_todo_flags_start = 0,
115905 + .function_transform = NULL,
115906 + .variable_transform = NULL,
115907 +#endif
115908 +};
115909 +
115910 +#if BUILDING_GCC_VERSION >= 4009
115911 +namespace {
115912 +class insert_size_overflow_check : public ipa_opt_pass_d {
115913 +public:
115914 + insert_size_overflow_check() : ipa_opt_pass_d(insert_size_overflow_check_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
115915 + unsigned int execute() { return search_function(); }
115916 +};
115917 +}
115918 +#endif
115919 +
115920 +struct opt_pass *make_insert_size_overflow_check(void)
115921 +{
115922 +#if BUILDING_GCC_VERSION >= 4009
115923 + return new insert_size_overflow_check();
115924 +#else
115925 + return &insert_size_overflow_check.pass;
115926 +#endif
115927 +}
115928 +
115929 diff --git a/tools/gcc/size_overflow_plugin/intentional_overflow.c b/tools/gcc/size_overflow_plugin/intentional_overflow.c
115930 new file mode 100644
115931 index 0000000..d71d72a
115932 --- /dev/null
115933 +++ b/tools/gcc/size_overflow_plugin/intentional_overflow.c
115934 @@ -0,0 +1,736 @@
115935 +/*
115936 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
115937 + * Licensed under the GPL v2, or (at your option) v3
115938 + *
115939 + * Homepage:
115940 + * http://www.grsecurity.net/~ephox/overflow_plugin/
115941 + *
115942 + * Documentation:
115943 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
115944 + *
115945 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
115946 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
115947 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
115948 + *
115949 + * Usage:
115950 + * $ make
115951 + * $ make run
115952 + */
115953 +
115954 +#include "gcc-common.h"
115955 +#include "size_overflow.h"
115956 +
115957 +/* Get the param of the intentional_overflow attribute.
115958 + * * 0: MARK_NOT_INTENTIONAL
115959 + * * 1..MAX_PARAM: MARK_YES
115960 + * * -1: MARK_TURN_OFF
115961 + */
115962 +static tree get_attribute_param(const_tree decl)
115963 +{
115964 + const_tree attr;
115965 +
115966 + if (decl == NULL_TREE)
115967 + return NULL_TREE;
115968 +
115969 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl));
115970 + if (!attr || !TREE_VALUE(attr))
115971 + return NULL_TREE;
115972 +
115973 + return TREE_VALUE(attr);
115974 +}
115975 +
115976 +// MARK_TURN_OFF
115977 +bool is_turn_off_intentional_attr(const_tree decl)
115978 +{
115979 + const_tree param_head;
115980 +
115981 + param_head = get_attribute_param(decl);
115982 + if (param_head == NULL_TREE)
115983 + return false;
115984 +
115985 + if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1)
115986 + return true;
115987 + return false;
115988 +}
115989 +
115990 +// MARK_NOT_INTENTIONAL
115991 +bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum)
115992 +{
115993 + const_tree param_head;
115994 +
115995 + if (argnum == 0)
115996 + return false;
115997 +
115998 + param_head = get_attribute_param(decl);
115999 + if (param_head == NULL_TREE)
116000 + return false;
116001 +
116002 + if (!TREE_INT_CST_LOW(TREE_VALUE(param_head)))
116003 + return true;
116004 + return false;
116005 +}
116006 +
116007 +// MARK_YES
116008 +bool is_yes_intentional_attr(const_tree decl, unsigned int argnum)
116009 +{
116010 + tree param, param_head;
116011 +
116012 + if (argnum == 0)
116013 + return false;
116014 +
116015 + param_head = get_attribute_param(decl);
116016 + for (param = param_head; param; param = TREE_CHAIN(param))
116017 + if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param)))
116018 + return true;
116019 + return false;
116020 +}
116021 +
116022 +void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum)
116023 +{
116024 + location_t loc;
116025 +
116026 + if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF)
116027 + return;
116028 +
116029 + if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES)
116030 + return;
116031 +
116032 + loc = DECL_SOURCE_LOCATION(decl);
116033 + inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", DECL_NAME_POINTER(decl), argnum);
116034 +}
116035 +
116036 +// Get the field decl of a component ref for intentional_overflow checking
116037 +static const_tree search_field_decl(const_tree comp_ref)
116038 +{
116039 + const_tree field = NULL_TREE;
116040 + unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref);
116041 +
116042 + for (i = 0; i < len; i++) {
116043 + field = TREE_OPERAND(comp_ref, i);
116044 + if (TREE_CODE(field) == FIELD_DECL)
116045 + break;
116046 + }
116047 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
116048 + return field;
116049 +}
116050 +
116051 +/* Get the type of the intentional_overflow attribute of a node
116052 + * * MARK_TURN_OFF
116053 + * * MARK_YES
116054 + * * MARK_NO
116055 + * * MARK_NOT_INTENTIONAL
116056 + */
116057 +enum mark get_intentional_attr_type(const_tree node)
116058 +{
116059 + const_tree cur_decl;
116060 +
116061 + if (node == NULL_TREE)
116062 + return MARK_NO;
116063 +
116064 + switch (TREE_CODE(node)) {
116065 + case COMPONENT_REF:
116066 + cur_decl = search_field_decl(node);
116067 + if (is_turn_off_intentional_attr(cur_decl))
116068 + return MARK_TURN_OFF;
116069 + if (is_end_intentional_intentional_attr(cur_decl, 1))
116070 + return MARK_YES;
116071 + break;
116072 + case PARM_DECL: {
116073 + unsigned int argnum;
116074 +
116075 + cur_decl = DECL_ORIGIN(current_function_decl);
116076 + argnum = find_arg_number_tree(node, cur_decl);
116077 + if (argnum == CANNOT_FIND_ARG)
116078 + return MARK_NO;
116079 + if (is_yes_intentional_attr(cur_decl, argnum))
116080 + return MARK_YES;
116081 + if (is_end_intentional_intentional_attr(cur_decl, argnum))
116082 + return MARK_NOT_INTENTIONAL;
116083 + break;
116084 + }
116085 + case FUNCTION_DECL:
116086 + if (is_turn_off_intentional_attr(DECL_ORIGIN(node)))
116087 + return MARK_TURN_OFF;
116088 + break;
116089 + default:
116090 + break;
116091 + }
116092 + return MARK_NO;
116093 +}
116094 +
116095 +// Search for the intentional_overflow attribute on the last nodes
116096 +static enum mark search_last_nodes_intentional(struct interesting_node *cur_node)
116097 +{
116098 + unsigned int i;
116099 + tree last_node;
116100 + enum mark mark = MARK_NO;
116101 +
116102 +#if BUILDING_GCC_VERSION <= 4007
116103 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) {
116104 +#else
116105 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) {
116106 +#endif
116107 + mark = get_intentional_attr_type(last_node);
116108 + if (mark != MARK_NO)
116109 + break;
116110 + }
116111 + return mark;
116112 +}
116113 +
116114 +/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and
116115 + * set the appropriate intentional_overflow type. Delete the asm stmt in the end.
116116 + */
116117 +static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node)
116118 +{
116119 + if (!cur_node->intentional_mark_from_gimple)
116120 + return false;
116121 +
116122 + if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple))
116123 + cur_node->intentional_attr_cur_fndecl = MARK_YES;
116124 + else
116125 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
116126 +
116127 + // skip param decls
116128 + if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0)
116129 + return true;
116130 + return true;
116131 +}
116132 +
116133 +/* Search intentional_overflow attribute on caller and on callee too.
116134 + * 0</MARK_YES: no dup, search size_overflow and intentional_overflow attributes
116135 + * 0/MARK_NOT_INTENTIONAL: no dup, search size_overflow attribute (int)
116136 + * -1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
116137 +*/
116138 +void check_intentional_attribute_ipa(struct interesting_node *cur_node)
116139 +{
116140 + const_tree fndecl;
116141 +
116142 + if (is_intentional_attribute_from_gimple(cur_node))
116143 + return;
116144 +
116145 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
116146 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
116147 + return;
116148 + }
116149 +
116150 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) {
116151 + cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL;
116152 + return;
116153 + }
116154 +
116155 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN)
116156 + return;
116157 +
116158 + fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num);
116159 + if (is_turn_off_intentional_attr(fndecl)) {
116160 + cur_node->intentional_attr_decl = MARK_TURN_OFF;
116161 + return;
116162 + }
116163 +
116164 + if (is_end_intentional_intentional_attr(fndecl, cur_node->num))
116165 + cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL;
116166 + else if (is_yes_intentional_attr(fndecl, cur_node->num))
116167 + cur_node->intentional_attr_decl = MARK_YES;
116168 +
116169 + cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node);
116170 + print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num);
116171 +}
116172 +
116173 +bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
116174 +{
116175 + const_tree rhs1, lhs, rhs1_type, lhs_type;
116176 + enum machine_mode lhs_mode, rhs_mode;
116177 + gimple def_stmt = get_def_stmt(no_const_rhs);
116178 +
116179 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116180 + return false;
116181 +
116182 + rhs1 = gimple_assign_rhs1(def_stmt);
116183 + lhs = gimple_assign_lhs(def_stmt);
116184 + rhs1_type = TREE_TYPE(rhs1);
116185 + lhs_type = TREE_TYPE(lhs);
116186 + rhs_mode = TYPE_MODE(rhs1_type);
116187 + lhs_mode = TYPE_MODE(lhs_type);
116188 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
116189 + return false;
116190 +
116191 + return true;
116192 +}
116193 +
116194 +static unsigned int uses_num(tree node)
116195 +{
116196 + imm_use_iterator imm_iter;
116197 + use_operand_p use_p;
116198 + unsigned int num = 0;
116199 +
116200 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
116201 + gimple use_stmt = USE_STMT(use_p);
116202 +
116203 + if (use_stmt == NULL)
116204 + return num;
116205 + if (is_gimple_debug(use_stmt))
116206 + continue;
116207 + if (gimple_assign_cast_p(use_stmt) && is_size_overflow_type(gimple_assign_lhs(use_stmt)))
116208 + continue;
116209 + num++;
116210 + }
116211 + return num;
116212 +}
116213 +
116214 +static bool no_uses(tree node)
116215 +{
116216 + return !uses_num(node);
116217 +}
116218 +
116219 +// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max
116220 +bool is_const_plus_unsigned_signed_truncation(const_tree lhs)
116221 +{
116222 + tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs;
116223 + gimple def_stmt = get_def_stmt(lhs);
116224 +
116225 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116226 + return false;
116227 +
116228 + rhs1 = gimple_assign_rhs1(def_stmt);
116229 + rhs_type = TREE_TYPE(rhs1);
116230 + lhs_type = TREE_TYPE(lhs);
116231 + if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type))
116232 + return false;
116233 + if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type))
116234 + return false;
116235 +
116236 + def_stmt = get_def_stmt(rhs1);
116237 + if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3)
116238 + return false;
116239 +
116240 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR)
116241 + return false;
116242 +
116243 + rhs1 = gimple_assign_rhs1(def_stmt);
116244 + rhs2 = gimple_assign_rhs2(def_stmt);
116245 + if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
116246 + return false;
116247 +
116248 + if (is_gimple_constant(rhs2))
116249 + not_const_rhs = rhs1;
116250 + else
116251 + not_const_rhs = rhs2;
116252 +
116253 + return no_uses(not_const_rhs);
116254 +}
116255 +
116256 +static bool is_lt_signed_type_max(const_tree rhs)
116257 +{
116258 + const_tree new_type, type_max, type = TREE_TYPE(rhs);
116259 +
116260 + if (!TYPE_UNSIGNED(type))
116261 + return true;
116262 +
116263 + switch (TYPE_MODE(type)) {
116264 + case QImode:
116265 + new_type = intQI_type_node;
116266 + break;
116267 + case HImode:
116268 + new_type = intHI_type_node;
116269 + break;
116270 + case SImode:
116271 + new_type = intSI_type_node;
116272 + break;
116273 + case DImode:
116274 + new_type = intDI_type_node;
116275 + break;
116276 + default:
116277 + debug_tree((tree)type);
116278 + gcc_unreachable();
116279 + }
116280 +
116281 + type_max = TYPE_MAX_VALUE(new_type);
116282 + if (!tree_int_cst_lt(type_max, rhs))
116283 + return true;
116284 +
116285 + return false;
116286 +}
116287 +
116288 +static bool is_gt_zero(const_tree rhs)
116289 +{
116290 + const_tree type = TREE_TYPE(rhs);
116291 +
116292 + if (TYPE_UNSIGNED(type))
116293 + return true;
116294 +
116295 + if (!tree_int_cst_lt(rhs, integer_zero_node))
116296 + return true;
116297 +
116298 + return false;
116299 +}
116300 +
116301 +bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
116302 +{
116303 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
116304 + return false;
116305 + if (!is_gimple_constant(rhs))
116306 + return false;
116307 +
116308 + // If the const is between 0 and the max value of the signed type of the same bitsize then there is no intentional overflow
116309 + if (is_lt_signed_type_max(rhs) && is_gt_zero(rhs))
116310 + return false;
116311 +
116312 + return true;
116313 +}
116314 +
116315 +static tree change_assign_rhs(struct visited *visited, gimple stmt, const_tree orig_rhs, tree new_rhs)
116316 +{
116317 + gimple assign;
116318 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116319 + tree origtype = TREE_TYPE(orig_rhs);
116320 +
116321 + gcc_assert(is_gimple_assign(stmt));
116322 +
116323 + assign = build_cast_stmt(visited, origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116324 + pointer_set_insert(visited->my_stmts, assign);
116325 + return gimple_assign_lhs(assign);
116326 +}
116327 +
116328 +tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2)
116329 +{
116330 + tree new_rhs, orig_rhs;
116331 + void (*gimple_assign_set_rhs)(gimple, tree);
116332 + tree rhs1 = gimple_assign_rhs1(stmt);
116333 + tree rhs2 = gimple_assign_rhs2(stmt);
116334 + tree lhs = gimple_assign_lhs(stmt);
116335 +
116336 + if (!check_overflow)
116337 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116338 +
116339 + if (change_rhs == NULL_TREE)
116340 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116341 +
116342 + if (new_rhs2 == NULL_TREE) {
116343 + orig_rhs = rhs1;
116344 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
116345 + } else {
116346 + orig_rhs = rhs2;
116347 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
116348 + }
116349 +
116350 + check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
116351 +
116352 + new_rhs = change_assign_rhs(visited, stmt, orig_rhs, change_rhs);
116353 + gimple_assign_set_rhs(stmt, new_rhs);
116354 + update_stmt(stmt);
116355 +
116356 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116357 +}
116358 +
116359 +static bool is_subtraction_special(struct visited *visited, const_gimple stmt)
116360 +{
116361 + gimple rhs1_def_stmt, rhs2_def_stmt;
116362 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
116363 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
116364 + const_tree rhs1 = gimple_assign_rhs1(stmt);
116365 + const_tree rhs2 = gimple_assign_rhs2(stmt);
116366 +
116367 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
116368 + return false;
116369 +
116370 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
116371 +
116372 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
116373 + return false;
116374 +
116375 + rhs1_def_stmt = get_def_stmt(rhs1);
116376 + rhs2_def_stmt = get_def_stmt(rhs2);
116377 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
116378 + return false;
116379 +
116380 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116381 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
116382 + rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt);
116383 + rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt);
116384 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
116385 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
116386 + rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
116387 + rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
116388 + if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
116389 + return false;
116390 + if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
116391 + return false;
116392 +
116393 + pointer_set_insert(visited->no_cast_check, rhs1_def_stmt);
116394 + pointer_set_insert(visited->no_cast_check, rhs2_def_stmt);
116395 + return true;
116396 +}
116397 +
116398 +static gimple create_binary_assign(struct visited *visited, enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
116399 +{
116400 + gimple assign;
116401 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116402 + tree type = TREE_TYPE(rhs1);
116403 + tree lhs = create_new_var(type);
116404 +
116405 + gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
116406 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
116407 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
116408 +
116409 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
116410 + update_stmt(assign);
116411 + pointer_set_insert(visited->my_stmts, assign);
116412 + return assign;
116413 +}
116414 +
116415 +static tree cast_to_TI_type(struct visited *visited, gimple stmt, tree node)
116416 +{
116417 + gimple_stmt_iterator gsi;
116418 + gimple cast_stmt;
116419 + tree type = TREE_TYPE(node);
116420 +
116421 + if (types_compatible_p(type, intTI_type_node))
116422 + return node;
116423 +
116424 + gsi = gsi_for_stmt(stmt);
116425 + cast_stmt = build_cast_stmt(visited, intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116426 + pointer_set_insert(visited->my_stmts, cast_stmt);
116427 + return gimple_assign_lhs(cast_stmt);
116428 +}
116429 +
116430 +static tree get_def_stmt_rhs(struct visited *visited, const_tree var)
116431 +{
116432 + tree rhs1, def_stmt_rhs1;
116433 + gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
116434 +
116435 + def_stmt = get_def_stmt(var);
116436 + if (!gimple_assign_cast_p(def_stmt))
116437 + return NULL_TREE;
116438 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && pointer_set_contains(visited->my_stmts, def_stmt) && gimple_assign_cast_p(def_stmt));
116439 +
116440 + rhs1 = gimple_assign_rhs1(def_stmt);
116441 + rhs1_def_stmt = get_def_stmt(rhs1);
116442 + if (!gimple_assign_cast_p(rhs1_def_stmt))
116443 + return rhs1;
116444 +
116445 + def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116446 + def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
116447 +
116448 + switch (gimple_code(def_stmt_rhs1_def_stmt)) {
116449 + case GIMPLE_CALL:
116450 + case GIMPLE_NOP:
116451 + case GIMPLE_ASM:
116452 + case GIMPLE_PHI:
116453 + return def_stmt_rhs1;
116454 + case GIMPLE_ASSIGN:
116455 + return rhs1;
116456 + default:
116457 + debug_gimple_stmt(def_stmt_rhs1_def_stmt);
116458 + gcc_unreachable();
116459 + }
116460 +}
116461 +
116462 +tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs)
116463 +{
116464 + tree new_rhs1, new_rhs2;
116465 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
116466 + gimple assign, stmt = get_def_stmt(lhs);
116467 + tree rhs1 = gimple_assign_rhs1(stmt);
116468 + tree rhs2 = gimple_assign_rhs2(stmt);
116469 +
116470 + if (!is_subtraction_special(visited, stmt))
116471 + return NULL_TREE;
116472 +
116473 + new_rhs1 = expand(visited, caller_node, rhs1);
116474 + new_rhs2 = expand(visited, caller_node, rhs2);
116475 +
116476 + new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs1);
116477 + new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs2);
116478 +
116479 + if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE)
116480 + return NULL_TREE;
116481 +
116482 + if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
116483 + new_rhs1_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs1_def_stmt_rhs1);
116484 + new_rhs2_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs2_def_stmt_rhs1);
116485 + }
116486 +
116487 + assign = create_binary_assign(visited, MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
116488 + new_lhs = gimple_assign_lhs(assign);
116489 + check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
116490 +
116491 + return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
116492 +}
116493 +
116494 +bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
116495 +{
116496 + const_gimple def_stmt;
116497 +
116498 + if (TREE_CODE(rhs) != SSA_NAME)
116499 + return false;
116500 +
116501 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
116502 + return false;
116503 +
116504 + def_stmt = get_def_stmt(rhs);
116505 + if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
116506 + return false;
116507 +
116508 + return true;
116509 +}
116510 +
116511 +/* e.g., drivers/acpi/acpica/utids.c acpi_ut_execute_CID()
116512 + * ((count - 1) * sizeof(struct acpi_pnp_dee_id_list) -> (count + fffffff) * 16
116513 + * fffffff * 16 > signed max -> truncate
116514 + */
116515 +static bool look_for_mult_and_add(const_gimple stmt)
116516 +{
116517 + const_tree res;
116518 + tree rhs1, rhs2, def_rhs1, def_rhs2, const_rhs, def_const_rhs;
116519 + const_gimple def_stmt;
116520 +
116521 + if (!stmt || gimple_code(stmt) == GIMPLE_NOP)
116522 + return false;
116523 + if (!is_gimple_assign(stmt))
116524 + return false;
116525 + if (gimple_assign_rhs_code(stmt) != MULT_EXPR)
116526 + return false;
116527 +
116528 + rhs1 = gimple_assign_rhs1(stmt);
116529 + rhs2 = gimple_assign_rhs2(stmt);
116530 + if (is_gimple_constant(rhs1)) {
116531 + const_rhs = rhs1;
116532 + def_stmt = get_def_stmt(rhs2);
116533 + } else if (is_gimple_constant(rhs2)) {
116534 + const_rhs = rhs2;
116535 + def_stmt = get_def_stmt(rhs1);
116536 + } else
116537 + return false;
116538 +
116539 + if (!is_gimple_assign(def_stmt))
116540 + return false;
116541 +
116542 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR && gimple_assign_rhs_code(def_stmt) != MINUS_EXPR)
116543 + return false;
116544 +
116545 + def_rhs1 = gimple_assign_rhs1(def_stmt);
116546 + def_rhs2 = gimple_assign_rhs2(def_stmt);
116547 + if (is_gimple_constant(def_rhs1))
116548 + def_const_rhs = def_rhs1;
116549 + else if (is_gimple_constant(def_rhs2))
116550 + def_const_rhs = def_rhs2;
116551 + else
116552 + return false;
116553 +
116554 + res = fold_binary_loc(gimple_location(def_stmt), MULT_EXPR, TREE_TYPE(const_rhs), const_rhs, def_const_rhs);
116555 + if (is_lt_signed_type_max(res) && is_gt_zero(res))
116556 + return false;
116557 + return true;
116558 +}
116559 +
116560 +enum intentional_overflow_type add_mul_intentional_overflow(const_gimple stmt)
116561 +{
116562 + const_gimple def_stmt_1, def_stmt_2;
116563 + const_tree rhs1, rhs2;
116564 + bool add_mul_rhs1, add_mul_rhs2;
116565 +
116566 + rhs1 = gimple_assign_rhs1(stmt);
116567 + def_stmt_1 = get_def_stmt(rhs1);
116568 + add_mul_rhs1 = look_for_mult_and_add(def_stmt_1);
116569 +
116570 + rhs2 = gimple_assign_rhs2(stmt);
116571 + def_stmt_2 = get_def_stmt(rhs2);
116572 + add_mul_rhs2 = look_for_mult_and_add(def_stmt_2);
116573 +
116574 + if (add_mul_rhs1)
116575 + return RHS1_INTENTIONAL_OVERFLOW;
116576 + if (add_mul_rhs2)
116577 + return RHS2_INTENTIONAL_OVERFLOW;
116578 + return NO_INTENTIONAL_OVERFLOW;
116579 +}
116580 +
116581 +static gimple get_dup_stmt(struct visited *visited, gimple stmt)
116582 +{
116583 + gimple my_stmt;
116584 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116585 +
116586 + gsi_next(&gsi);
116587 + my_stmt = gsi_stmt(gsi);
116588 +
116589 + gcc_assert(pointer_set_contains(visited->my_stmts, my_stmt));
116590 + gcc_assert(gimple_assign_rhs_code(stmt) == gimple_assign_rhs_code(my_stmt));
116591 +
116592 + return my_stmt;
116593 +}
116594 +
116595 +/* unsigned type -> unary or binary assign (rhs1 or rhs2 is constant)
116596 + * unsigned type cast to signed type, unsigned type: no more uses
116597 + * e.g., lib/vsprintf.c:simple_strtol()
116598 + * _10 = (unsigned long int) _9
116599 + * _11 = -_10;
116600 + * _12 = (long int) _11; (_11_ no more uses)
116601 + */
116602 +static bool is_call_or_cast(gimple stmt)
116603 +{
116604 + return gimple_assign_cast_p(stmt) || is_gimple_call(stmt);
116605 +}
116606 +
116607 +static bool is_unsigned_cast_or_call_def_stmt(const_tree node)
116608 +{
116609 + const_tree rhs;
116610 + gimple def_stmt;
116611 +
116612 + if (node == NULL_TREE)
116613 + return true;
116614 + if (is_gimple_constant(node))
116615 + return true;
116616 +
116617 + def_stmt = get_def_stmt(node);
116618 + if (!def_stmt)
116619 + return false;
116620 +
116621 + if (is_call_or_cast(def_stmt))
116622 + return true;
116623 +
116624 + if (!is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 2)
116625 + return false;
116626 + rhs = gimple_assign_rhs1(def_stmt);
116627 + def_stmt = get_def_stmt(rhs);
116628 + if (!def_stmt)
116629 + return false;
116630 + return is_call_or_cast(def_stmt);
116631 +}
116632 +
116633 +void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt)
116634 +{
116635 + unsigned int use_num;
116636 + gimple so_stmt;
116637 + const_gimple def_stmt;
116638 + const_tree rhs1, rhs2;
116639 + tree rhs = gimple_assign_rhs1(stmt);
116640 + tree lhs_type = TREE_TYPE(gimple_assign_lhs(stmt));
116641 + const_tree rhs_type = TREE_TYPE(rhs);
116642 +
116643 + if (!(TYPE_UNSIGNED(rhs_type) && !TYPE_UNSIGNED(lhs_type)))
116644 + return;
116645 + if (GET_MODE_BITSIZE(TYPE_MODE(rhs_type)) != GET_MODE_BITSIZE(TYPE_MODE(lhs_type)))
116646 + return;
116647 + use_num = uses_num(rhs);
116648 + if (use_num != 1)
116649 + return;
116650 +
116651 + def_stmt = get_def_stmt(rhs);
116652 + if (!def_stmt)
116653 + return;
116654 + if (!is_gimple_assign(def_stmt))
116655 + return;
116656 +
116657 + rhs1 = gimple_assign_rhs1(def_stmt);
116658 + if (!is_unsigned_cast_or_call_def_stmt(rhs1))
116659 + return;
116660 +
116661 + rhs2 = gimple_assign_rhs2(def_stmt);
116662 + if (!is_unsigned_cast_or_call_def_stmt(rhs2))
116663 + return;
116664 + if (gimple_num_ops(def_stmt) == 3 && !is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
116665 + return;
116666 +
116667 + so_stmt = get_dup_stmt(visited, stmt);
116668 + create_up_and_down_cast(visited, so_stmt, lhs_type, gimple_assign_rhs1(so_stmt));
116669 +}
116670 +
116671 diff --git a/tools/gcc/size_overflow_plugin/misc.c b/tools/gcc/size_overflow_plugin/misc.c
116672 new file mode 100644
116673 index 0000000..4bddad2
116674 --- /dev/null
116675 +++ b/tools/gcc/size_overflow_plugin/misc.c
116676 @@ -0,0 +1,203 @@
116677 +/*
116678 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
116679 + * Licensed under the GPL v2, or (at your option) v3
116680 + *
116681 + * Homepage:
116682 + * http://www.grsecurity.net/~ephox/overflow_plugin/
116683 + *
116684 + * Documentation:
116685 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
116686 + *
116687 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
116688 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
116689 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
116690 + *
116691 + * Usage:
116692 + * $ make
116693 + * $ make run
116694 + */
116695 +
116696 +#include "gcc-common.h"
116697 +#include "size_overflow.h"
116698 +
116699 +void set_current_function_decl(tree fndecl)
116700 +{
116701 + gcc_assert(fndecl != NULL_TREE);
116702 +
116703 + push_cfun(DECL_STRUCT_FUNCTION(fndecl));
116704 + calculate_dominance_info(CDI_DOMINATORS);
116705 + current_function_decl = fndecl;
116706 +}
116707 +
116708 +void unset_current_function_decl(void)
116709 +{
116710 + free_dominance_info(CDI_DOMINATORS);
116711 + pop_cfun();
116712 + current_function_decl = NULL_TREE;
116713 +}
116714 +
116715 +static bool is_bool(const_tree node)
116716 +{
116717 + const_tree type;
116718 +
116719 + if (node == NULL_TREE)
116720 + return false;
116721 +
116722 + type = TREE_TYPE(node);
116723 + if (!INTEGRAL_TYPE_P(type))
116724 + return false;
116725 + if (TREE_CODE(type) == BOOLEAN_TYPE)
116726 + return true;
116727 + if (TYPE_PRECISION(type) == 1)
116728 + return true;
116729 + return false;
116730 +}
116731 +
116732 +bool skip_types(const_tree var)
116733 +{
116734 + tree type;
116735 + enum tree_code code;
116736 +
116737 + if (is_gimple_constant(var))
116738 + return true;
116739 +
116740 + switch (TREE_CODE(var)) {
116741 + case ADDR_EXPR:
116742 +#if BUILDING_GCC_VERSION >= 4006
116743 + case MEM_REF:
116744 +#endif
116745 + case ARRAY_REF:
116746 + case BIT_FIELD_REF:
116747 + case INDIRECT_REF:
116748 + case TARGET_MEM_REF:
116749 + case COMPONENT_REF:
116750 + case VAR_DECL:
116751 + case VIEW_CONVERT_EXPR:
116752 + return true;
116753 + default:
116754 + break;
116755 + }
116756 +
116757 + code = TREE_CODE(var);
116758 + gcc_assert(code == SSA_NAME || code == PARM_DECL);
116759 +
116760 + type = TREE_TYPE(var);
116761 + switch (TREE_CODE(type)) {
116762 + case INTEGER_TYPE:
116763 + case ENUMERAL_TYPE:
116764 + return false;
116765 + case BOOLEAN_TYPE:
116766 + return is_bool(var);
116767 + default:
116768 + return true;
116769 + }
116770 +}
116771 +
116772 +gimple get_def_stmt(const_tree node)
116773 +{
116774 + gcc_assert(node != NULL_TREE);
116775 +
116776 + if (skip_types(node))
116777 + return NULL;
116778 +
116779 + if (TREE_CODE(node) != SSA_NAME)
116780 + return NULL;
116781 + return SSA_NAME_DEF_STMT(node);
116782 +}
116783 +
116784 +tree create_new_var(tree type)
116785 +{
116786 + tree new_var = create_tmp_var(type, "cicus");
116787 +
116788 + add_referenced_var(new_var);
116789 + return new_var;
116790 +}
116791 +
116792 +static bool skip_cast(tree dst_type, const_tree rhs, bool force)
116793 +{
116794 + const_gimple def_stmt = get_def_stmt(rhs);
116795 +
116796 + if (force)
116797 + return false;
116798 +
116799 + if (is_gimple_constant(rhs))
116800 + return false;
116801 +
116802 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
116803 + return false;
116804 +
116805 + if (!types_compatible_p(dst_type, TREE_TYPE(rhs)))
116806 + return false;
116807 +
116808 + // DI type can be on 32 bit (from create_assign) but overflow type stays DI
116809 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
116810 + return false;
116811 +
116812 + return true;
116813 +}
116814 +
116815 +tree cast_a_tree(tree type, tree var)
116816 +{
116817 + gcc_assert(type != NULL_TREE);
116818 + gcc_assert(var != NULL_TREE);
116819 + gcc_assert(fold_convertible_p(type, var));
116820 +
116821 + return fold_convert(type, var);
116822 +}
116823 +
116824 +gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force)
116825 +{
116826 + gimple assign, def_stmt;
116827 +
116828 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
116829 + gcc_assert(!is_gimple_constant(rhs));
116830 + if (gsi_end_p(*gsi) && before == AFTER_STMT)
116831 + gcc_unreachable();
116832 +
116833 + def_stmt = get_def_stmt(rhs);
116834 + if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && pointer_set_contains(visited->my_stmts, def_stmt))
116835 + return def_stmt;
116836 +
116837 + if (lhs == CREATE_NEW_VAR)
116838 + lhs = create_new_var(dst_type);
116839 +
116840 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
116841 +
116842 + if (!gsi_end_p(*gsi)) {
116843 + location_t loc = gimple_location(gsi_stmt(*gsi));
116844 + gimple_set_location(assign, loc);
116845 + }
116846 +
116847 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
116848 +
116849 + if (before)
116850 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
116851 + else
116852 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
116853 + update_stmt(assign);
116854 + return assign;
116855 +}
116856 +
116857 +bool is_size_overflow_type(const_tree var)
116858 +{
116859 + const char *name;
116860 + const_tree type_name, type;
116861 +
116862 + if (var == NULL_TREE)
116863 + return false;
116864 +
116865 + type = TREE_TYPE(var);
116866 + type_name = TYPE_NAME(type);
116867 + if (type_name == NULL_TREE)
116868 + return false;
116869 +
116870 + if (DECL_P(type_name))
116871 + name = DECL_NAME_POINTER(type_name);
116872 + else
116873 + name = IDENTIFIER_POINTER(type_name);
116874 +
116875 + if (!strncmp(name, "size_overflow_type", 18))
116876 + return true;
116877 + return false;
116878 +}
116879 +
116880 diff --git a/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
116881 new file mode 100644
116882 index 0000000..7c9e6d1
116883 --- /dev/null
116884 +++ b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
116885 @@ -0,0 +1,138 @@
116886 +/*
116887 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
116888 + * Licensed under the GPL v2, or (at your option) v3
116889 + *
116890 + * Homepage:
116891 + * http://www.grsecurity.net/~ephox/overflow_plugin/
116892 + *
116893 + * Documentation:
116894 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
116895 + *
116896 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
116897 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
116898 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
116899 + *
116900 + * Usage:
116901 + * $ make
116902 + * $ make run
116903 + */
116904 +
116905 +#include "gcc-common.h"
116906 +#include "size_overflow.h"
116907 +
116908 +bool skip_expr_on_double_type(const_gimple stmt)
116909 +{
116910 + enum tree_code code = gimple_assign_rhs_code(stmt);
116911 +
116912 + switch (code) {
116913 + case RSHIFT_EXPR:
116914 + case TRUNC_DIV_EXPR:
116915 + case CEIL_DIV_EXPR:
116916 + case FLOOR_DIV_EXPR:
116917 + case ROUND_DIV_EXPR:
116918 + case EXACT_DIV_EXPR:
116919 + case RDIV_EXPR:
116920 + case TRUNC_MOD_EXPR:
116921 + case CEIL_MOD_EXPR:
116922 + case FLOOR_MOD_EXPR:
116923 + case ROUND_MOD_EXPR:
116924 + return true;
116925 + default:
116926 + return false;
116927 + }
116928 +}
116929 +
116930 +void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs)
116931 +{
116932 + const_tree orig_rhs1;
116933 + tree down_lhs, new_lhs, dup_type = TREE_TYPE(rhs);
116934 + gimple down_cast, up_cast;
116935 + gimple_stmt_iterator gsi = gsi_for_stmt(use_stmt);
116936 +
116937 + down_cast = build_cast_stmt(visited, orig_type, rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116938 + down_lhs = gimple_assign_lhs(down_cast);
116939 +
116940 + gsi = gsi_for_stmt(use_stmt);
116941 + up_cast = build_cast_stmt(visited, dup_type, down_lhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116942 + new_lhs = gimple_assign_lhs(up_cast);
116943 +
116944 + orig_rhs1 = gimple_assign_rhs1(use_stmt);
116945 + if (operand_equal_p(orig_rhs1, rhs, 0))
116946 + gimple_assign_set_rhs1(use_stmt, new_lhs);
116947 + else
116948 + gimple_assign_set_rhs2(use_stmt, new_lhs);
116949 + update_stmt(use_stmt);
116950 +
116951 + pointer_set_insert(visited->my_stmts, up_cast);
116952 + pointer_set_insert(visited->my_stmts, down_cast);
116953 + pointer_set_insert(visited->skip_expr_casts, up_cast);
116954 + pointer_set_insert(visited->skip_expr_casts, down_cast);
116955 +}
116956 +
116957 +static tree get_proper_unsigned_half_type(const_tree node)
116958 +{
116959 + tree new_type, type;
116960 +
116961 + gcc_assert(is_size_overflow_type(node));
116962 +
116963 + type = TREE_TYPE(node);
116964 + switch (TYPE_MODE(type)) {
116965 + case HImode:
116966 + new_type = unsigned_intQI_type_node;
116967 + break;
116968 + case SImode:
116969 + new_type = unsigned_intHI_type_node;
116970 + break;
116971 + case DImode:
116972 + new_type = unsigned_intSI_type_node;
116973 + break;
116974 + case TImode:
116975 + new_type = unsigned_intDI_type_node;
116976 + break;
116977 + default:
116978 + gcc_unreachable();
116979 + }
116980 +
116981 + if (TYPE_QUALS(type) != 0)
116982 + return build_qualified_type(new_type, TYPE_QUALS(type));
116983 + return new_type;
116984 +}
116985 +
116986 +static void insert_cast_rhs(struct visited *visited, gimple stmt, tree rhs)
116987 +{
116988 + tree type;
116989 +
116990 + if (rhs == NULL_TREE)
116991 + return;
116992 + if (!is_size_overflow_type(rhs))
116993 + return;
116994 +
116995 + type = get_proper_unsigned_half_type(rhs);
116996 + if (is_gimple_constant(rhs))
116997 + return;
116998 + create_up_and_down_cast(visited, stmt, type, rhs);
116999 +}
117000 +
117001 +static void insert_cast(struct visited *visited, gimple stmt, tree rhs)
117002 +{
117003 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && !is_size_overflow_type(rhs))
117004 + return;
117005 + gcc_assert(is_size_overflow_type(rhs));
117006 + insert_cast_rhs(visited, stmt, rhs);
117007 +}
117008 +
117009 +void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type)
117010 +{
117011 + tree rhs1, rhs2;
117012 +
117013 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS1_INTENTIONAL_OVERFLOW) {
117014 + rhs1 = gimple_assign_rhs1(stmt);
117015 + insert_cast(visited, stmt, rhs1);
117016 + }
117017 +
117018 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS2_INTENTIONAL_OVERFLOW) {
117019 + rhs2 = gimple_assign_rhs2(stmt);
117020 + insert_cast(visited, stmt, rhs2);
117021 + }
117022 +}
117023 +
117024 diff --git a/tools/gcc/size_overflow_plugin/size_overflow.h b/tools/gcc/size_overflow_plugin/size_overflow.h
117025 new file mode 100644
117026 index 0000000..e5b4e50
117027 --- /dev/null
117028 +++ b/tools/gcc/size_overflow_plugin/size_overflow.h
117029 @@ -0,0 +1,127 @@
117030 +#ifndef SIZE_OVERFLOW_H
117031 +#define SIZE_OVERFLOW_H
117032 +
117033 +#define CREATE_NEW_VAR NULL_TREE
117034 +#define CANNOT_FIND_ARG 32
117035 +#define MAX_PARAM 31
117036 +#define BEFORE_STMT true
117037 +#define AFTER_STMT false
117038 +
117039 +#define TURN_OFF_ASM_STR "# size_overflow MARK_TURN_OFF "
117040 +#define YES_ASM_STR "# size_overflow MARK_YES "
117041 +#define OK_ASM_STR "# size_overflow "
117042 +
117043 +enum mark {
117044 + MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF
117045 +};
117046 +
117047 +enum intentional_overflow_type {
117048 + NO_INTENTIONAL_OVERFLOW, RHS1_INTENTIONAL_OVERFLOW, RHS2_INTENTIONAL_OVERFLOW
117049 +};
117050 +
117051 +struct visited {
117052 + struct pointer_set_t *stmts;
117053 + struct pointer_set_t *my_stmts;
117054 + struct pointer_set_t *skip_expr_casts;
117055 + struct pointer_set_t *no_cast_check;
117056 +};
117057 +
117058 +// size_overflow_plugin.c
117059 +extern tree report_size_overflow_decl;
117060 +extern tree size_overflow_type_HI;
117061 +extern tree size_overflow_type_SI;
117062 +extern tree size_overflow_type_DI;
117063 +extern tree size_overflow_type_TI;
117064 +
117065 +
117066 +// size_overflow_plugin_hash.c
117067 +struct size_overflow_hash {
117068 + const struct size_overflow_hash * const next;
117069 + const char * const name;
117070 + const unsigned int param;
117071 +};
117072 +
117073 +struct interesting_node {
117074 + struct interesting_node *next;
117075 + gimple first_stmt;
117076 + const_tree fndecl;
117077 + tree node;
117078 +#if BUILDING_GCC_VERSION <= 4007
117079 + VEC(tree, gc) *last_nodes;
117080 +#else
117081 + vec<tree, va_gc> *last_nodes;
117082 +#endif
117083 + unsigned int num;
117084 + enum mark intentional_attr_decl;
117085 + enum mark intentional_attr_cur_fndecl;
117086 + gimple intentional_mark_from_gimple;
117087 +};
117088 +
117089 +extern bool is_size_overflow_asm(const_gimple stmt);
117090 +extern unsigned int get_function_num(const_tree node, const_tree orig_fndecl);
117091 +extern unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl);
117092 +extern bool is_missing_function(const_tree orig_fndecl, unsigned int num);
117093 +extern bool is_a_return_check(const_tree node);
117094 +extern const struct size_overflow_hash *get_function_hash(const_tree fndecl);
117095 +extern unsigned int find_arg_number_tree(const_tree arg, const_tree func);
117096 +
117097 +
117098 +// size_overflow_debug.c
117099 +extern struct opt_pass *make_dump_pass(void);
117100 +
117101 +
117102 +// intentional_overflow.c
117103 +extern enum mark get_intentional_attr_type(const_tree node);
117104 +extern bool is_size_overflow_intentional_asm_yes(const_gimple stmt);
117105 +extern bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt);
117106 +extern bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum);
117107 +extern bool is_yes_intentional_attr(const_tree decl, unsigned int argnum);
117108 +extern bool is_turn_off_intentional_attr(const_tree decl);
117109 +extern void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum);
117110 +extern void check_intentional_attribute_ipa(struct interesting_node *cur_node);
117111 +extern bool is_a_cast_and_const_overflow(const_tree no_const_rhs);
117112 +extern bool is_const_plus_unsigned_signed_truncation(const_tree lhs);
117113 +extern bool is_a_constant_overflow(const_gimple stmt, const_tree rhs);
117114 +extern tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2);
117115 +extern tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs);
117116 +extern bool is_a_neg_overflow(const_gimple stmt, const_tree rhs);
117117 +extern enum intentional_overflow_type add_mul_intentional_overflow(const_gimple def_stmt);
117118 +extern void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt);
117119 +
117120 +
117121 +// insert_size_overflow_check_ipa.c
117122 +extern unsigned int search_function(void);
117123 +extern unsigned int call_count;
117124 +extern struct opt_pass *make_insert_size_overflow_check(void);
117125 +extern const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum);
117126 +
117127 +
117128 +// insert_size_overflow_asm.c
117129 +extern struct opt_pass *make_insert_size_overflow_asm_pass(void);
117130 +
117131 +
117132 +// misc.c
117133 +extern void set_current_function_decl(tree fndecl);
117134 +extern void unset_current_function_decl(void);
117135 +extern gimple get_def_stmt(const_tree node);
117136 +extern tree create_new_var(tree type);
117137 +extern gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force);
117138 +extern bool skip_types(const_tree var);
117139 +extern tree cast_a_tree(tree type, tree var);
117140 +extern bool is_size_overflow_type(const_tree var);
117141 +
117142 +
117143 +// insert_size_overflow_check_core.c
117144 +extern tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs);
117145 +extern void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
117146 +extern tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
117147 +extern tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before);
117148 +
117149 +
117150 +// remove_unnecessary_dup.c
117151 +extern struct opt_pass *make_remove_unnecessary_dup_pass(void);
117152 +extern void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type);
117153 +extern bool skip_expr_on_double_type(const_gimple stmt);
117154 +extern void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs);
117155 +
117156 +#endif
117157 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_debug.c b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
117158 new file mode 100644
117159 index 0000000..4378111
117160 --- /dev/null
117161 +++ b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
117162 @@ -0,0 +1,116 @@
117163 +/*
117164 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
117165 + * Licensed under the GPL v2, or (at your option) v3
117166 + *
117167 + * Homepage:
117168 + * http://www.grsecurity.net/~ephox/overflow_plugin/
117169 + *
117170 + * Documentation:
117171 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
117172 + *
117173 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
117174 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
117175 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
117176 + *
117177 + * Usage:
117178 + * $ make
117179 + * $ make run
117180 + */
117181 +
117182 +#include "gcc-common.h"
117183 +
117184 +static unsigned int dump_functions(void)
117185 +{
117186 + struct cgraph_node *node;
117187 +
117188 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
117189 + basic_block bb;
117190 +
117191 + push_cfun(DECL_STRUCT_FUNCTION(NODE_DECL(node)));
117192 + current_function_decl = NODE_DECL(node);
117193 +
117194 + fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", DECL_NAME_POINTER(current_function_decl));
117195 +
117196 + FOR_ALL_BB_FN(bb, cfun) {
117197 + gimple_stmt_iterator si;
117198 +
117199 + fprintf(stderr, "<bb %u>:\n", bb->index);
117200 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
117201 + debug_gimple_stmt(gsi_stmt(si));
117202 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
117203 + debug_gimple_stmt(gsi_stmt(si));
117204 + fprintf(stderr, "\n");
117205 + }
117206 +
117207 + fprintf(stderr, "-------------------------------------------------------------------------\n");
117208 +
117209 + pop_cfun();
117210 + current_function_decl = NULL_TREE;
117211 + }
117212 +
117213 + fprintf(stderr, "###############################################################################\n");
117214 +
117215 + return 0;
117216 +}
117217 +
117218 +#if BUILDING_GCC_VERSION >= 4009
117219 +static const struct pass_data dump_pass_data = {
117220 +#else
117221 +static struct ipa_opt_pass_d dump_pass = {
117222 + .pass = {
117223 +#endif
117224 + .type = SIMPLE_IPA_PASS,
117225 + .name = "dump",
117226 +#if BUILDING_GCC_VERSION >= 4008
117227 + .optinfo_flags = OPTGROUP_NONE,
117228 +#endif
117229 +#if BUILDING_GCC_VERSION >= 4009
117230 + .has_gate = false,
117231 + .has_execute = true,
117232 +#else
117233 + .gate = NULL,
117234 + .execute = dump_functions,
117235 + .sub = NULL,
117236 + .next = NULL,
117237 + .static_pass_number = 0,
117238 +#endif
117239 + .tv_id = TV_NONE,
117240 + .properties_required = 0,
117241 + .properties_provided = 0,
117242 + .properties_destroyed = 0,
117243 + .todo_flags_start = 0,
117244 + .todo_flags_finish = 0,
117245 +#if BUILDING_GCC_VERSION < 4009
117246 + },
117247 + .generate_summary = NULL,
117248 + .write_summary = NULL,
117249 + .read_summary = NULL,
117250 +#if BUILDING_GCC_VERSION >= 4006
117251 + .write_optimization_summary = NULL,
117252 + .read_optimization_summary = NULL,
117253 +#endif
117254 + .stmt_fixup = NULL,
117255 + .function_transform_todo_flags_start = 0,
117256 + .function_transform = NULL,
117257 + .variable_transform = NULL,
117258 +#endif
117259 +};
117260 +
117261 +#if BUILDING_GCC_VERSION >= 4009
117262 +namespace {
117263 +class dump_pass : public ipa_opt_pass_d {
117264 +public:
117265 + dump_pass() : ipa_opt_pass_d(dump_pass_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
117266 + unsigned int execute() { return dump_functions(); }
117267 +};
117268 +}
117269 +#endif
117270 +
117271 +struct opt_pass *make_dump_pass(void)
117272 +{
117273 +#if BUILDING_GCC_VERSION >= 4009
117274 + return new dump_pass();
117275 +#else
117276 + return &dump_pass.pass;
117277 +#endif
117278 +}
117279 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash.data b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
117280 new file mode 100644
117281 index 0000000..367aa34
117282 --- /dev/null
117283 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
117284 @@ -0,0 +1,6028 @@
117285 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
117286 +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
117287 +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
117288 +carl9170_alloc_27 carl9170_alloc 1 27 NULL
117289 +sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
117290 +padzero_55 padzero 1 55 &sel_read_policyvers_55
117291 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
117292 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
117293 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
117294 +load_msg_95 load_msg 2 95 NULL
117295 +ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL
117296 +init_q_132 init_q 4 132 NULL
117297 +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
117298 +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
117299 +ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
117300 +ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
117301 +tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
117302 +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
117303 +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
117304 +obd_proc_jobid_var_seq_write_199 obd_proc_jobid_var_seq_write 3 199 NULL
117305 +ll_xattr_cache_seq_write_250 ll_xattr_cache_seq_write 3 250 NULL
117306 +vpdma_create_desc_list_255 vpdma_create_desc_list 2 255 NULL
117307 +br_port_info_size_268 br_port_info_size 0 268 NULL
117308 +read_file_war_stats_292 read_file_war_stats 3 292 NULL
117309 +SYSC_connect_304 SYSC_connect 3 304 NULL
117310 +syslog_print_307 syslog_print 2 307 NULL
117311 +dn_setsockopt_314 dn_setsockopt 5 314 NULL
117312 +mlx5_core_access_reg_361 mlx5_core_access_reg 3-5 361 NULL
117313 +aio_read_events_ring_410 aio_read_events_ring 3-0 410 NULL
117314 +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
117315 +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
117316 +cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
117317 +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
117318 +iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
117319 +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
117320 +smp_send_cmd_512 smp_send_cmd 3 512 NULL
117321 +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
117322 +zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
117323 +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
117324 +sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
117325 +lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL
117326 +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
117327 +start_isoc_chain_565 start_isoc_chain 2 565 NULL nohasharray
117328 +dev_hard_header_565 dev_hard_header 0 565 &start_isoc_chain_565
117329 +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
117330 +btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
117331 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
117332 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
117333 +ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
117334 +viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
117335 +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
117336 +cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL
117337 +unlink_queued_645 unlink_queued 4 645 NULL
117338 +dtim_interval_read_654 dtim_interval_read 3 654 NULL
117339 +nvif_notify_new_671 nvif_notify_new 6 671 NULL
117340 +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
117341 +persistent_ram_vmap_709 persistent_ram_vmap 2-1 709 NULL
117342 +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
117343 +dvb_video_write_754 dvb_video_write 3 754 NULL
117344 +cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
117345 +ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
117346 +if_writecmd_815 if_writecmd 2 815 NULL
117347 +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
117348 +error_state_read_859 error_state_read 6 859 NULL
117349 +lustre_init_msg_v2_864 lustre_init_msg_v2 2 864 NULL
117350 +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
117351 +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
117352 +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
117353 +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
117354 +__nodes_weight_956 __nodes_weight 2-0 956 NULL
117355 +bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
117356 +usnic_ib_qp_grp_dump_hdr_989 usnic_ib_qp_grp_dump_hdr 2 989 NULL
117357 +readreg_1017 readreg 0-1 1017 NULL
117358 +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
117359 +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
117360 +mce_request_packet_1073 mce_request_packet 3 1073 NULL
117361 +agp_create_memory_1075 agp_create_memory 1 1075 NULL
117362 +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
117363 +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
117364 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
117365 +__arch_hweight8_1105 __arch_hweight8 0 1105 NULL
117366 +utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
117367 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
117368 +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
117369 +ipc_alloc_1192 ipc_alloc 1 1192 NULL
117370 +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
117371 +pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
117372 +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
117373 +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
117374 +i2cdev_read_1206 i2cdev_read 3 1206 NULL
117375 +lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
117376 +kernfs_file_direct_read_1238 kernfs_file_direct_read 3 1238 NULL
117377 +acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
117378 +drm_primary_helper_create_plane_1262 drm_primary_helper_create_plane 3 1262 NULL
117379 +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
117380 +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
117381 +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
117382 +SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
117383 +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
117384 +posix_acl_xattr_set_1301 posix_acl_xattr_set 4 1301 NULL
117385 +ffs_1322 ffs 0 1322 NULL
117386 +qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL
117387 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
117388 +bond_verify_device_path_1352 bond_verify_device_path 3 1352 NULL
117389 +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
117390 +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
117391 +fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
117392 +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
117393 +xpcs_reg_addr_read_1381 xpcs_reg_addr_read 3 1381 NULL
117394 +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
117395 +do_msgsnd_1387 do_msgsnd 4 1387 NULL
117396 +SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
117397 +cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
117398 +init_rs_internal_1436 init_rs_internal 1 1436 NULL
117399 +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
117400 +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
117401 +xprt_alloc_1475 xprt_alloc 2 1475 NULL
117402 +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
117403 +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
117404 +fpregs_set_1497 fpregs_set 4 1497 NULL
117405 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
117406 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
117407 +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
117408 +ffs_mutex_lock_1564 ffs_mutex_lock 0 1564 NULL
117409 +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
117410 +ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL
117411 +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
117412 +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
117413 +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
117414 +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
117415 +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
117416 +rmap_add_1677 rmap_add 3 1677 NULL
117417 +configfs_read_file_1683 configfs_read_file 3 1683 NULL
117418 +iwl_dbgfs_d0i3_refs_read_1705 iwl_dbgfs_d0i3_refs_read 3 1705 NULL
117419 +pdu_write_u_1710 pdu_write_u 3 1710 NULL
117420 +coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
117421 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
117422 +internal_create_group_1733 internal_create_group 0 1733 NULL
117423 +dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
117424 +usb_ep_align_maybe_1743 usb_ep_align_maybe 0-3 1743 NULL
117425 +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
117426 +cosa_write_1774 cosa_write 3 1774 NULL
117427 +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
117428 +__nodelist_scnprintf_1815 __nodelist_scnprintf 2-0 1815 NULL
117429 +sb_issue_zeroout_1884 sb_issue_zeroout 3 1884 NULL
117430 +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
117431 +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
117432 +SyS_add_key_1900 SyS_add_key 4 1900 NULL
117433 +uhid_char_read_1920 uhid_char_read 3 1920 NULL
117434 +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
117435 +azx_get_position_1927 azx_get_position 0 1927 NULL
117436 +bdev_erase_1933 bdev_erase 3 1933 NULL
117437 +ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
117438 +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL nohasharray
117439 +nvif_object_sclass_1940 nvif_object_sclass 3 1940 &cyttsp_probe_1940
117440 +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
117441 +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
117442 +qla2xxx_get_vpd_field_1965 qla2xxx_get_vpd_field 4 1965 NULL
117443 +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
117444 +gpio_power_write_1991 gpio_power_write 3 1991 NULL
117445 +__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
117446 +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
117447 +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
117448 +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
117449 +BcmCopySection_2035 BcmCopySection 5 2035 NULL
117450 +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
117451 +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
117452 +__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
117453 +diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL
117454 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
117455 +xgmac_reg_value_read_2095 xgmac_reg_value_read 3 2095 NULL
117456 +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
117457 +audit_expand_2098 audit_expand 0 2098 NULL
117458 +__set_print_fmt_2106 __set_print_fmt 0 2106 NULL
117459 +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
117460 +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
117461 +btrfs_file_extent_inline_len_2116 btrfs_file_extent_inline_len 0 2116 NULL
117462 +enable_read_2117 enable_read 3 2117 NULL
117463 +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
117464 +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
117465 +iov_iter_count_2152 iov_iter_count 0 2152 NULL
117466 +__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
117467 +_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
117468 +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
117469 +picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
117470 +u32_array_read_2219 u32_array_read 3 2219 NULL nohasharray
117471 +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 &u32_array_read_2219
117472 +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
117473 +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
117474 +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
117475 +do_update_counters_2259 do_update_counters 4 2259 NULL
117476 +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
117477 +vpdma_alloc_desc_buf_2278 vpdma_alloc_desc_buf 2 2278 NULL
117478 +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
117479 +sr_read_cmd_2299 sr_read_cmd 5 2299 NULL
117480 +kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
117481 +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
117482 +hfsplus_find_init_2318 hfsplus_find_init 0 2318 NULL nohasharray
117483 +picolcd_fb_write_2318 picolcd_fb_write 3 2318 &hfsplus_find_init_2318
117484 +dice_hwdep_read_2326 dice_hwdep_read 3 2326 NULL
117485 +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
117486 +zr364xx_read_2354 zr364xx_read 3 2354 NULL
117487 +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
117488 +xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
117489 +rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
117490 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
117491 +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
117492 +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
117493 +raid1_size_2419 raid1_size 0-2 2419 NULL
117494 +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
117495 +wiphy_new_2482 wiphy_new 2 2482 NULL
117496 +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
117497 +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
117498 +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
117499 +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
117500 +batadv_tvlv_container_list_size_2524 batadv_tvlv_container_list_size 0 2524 NULL
117501 +smk_write_syslog_2529 smk_write_syslog 3 2529 NULL
117502 +__ceph_setxattr_2532 __ceph_setxattr 4 2532 NULL
117503 +sfw_create_rpc_2562 sfw_create_rpc 4 2562 NULL
117504 +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
117505 +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
117506 +mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
117507 +slot_bytes_2609 slot_bytes 0 2609 NULL
117508 +smk_write_logging_2618 smk_write_logging 3 2618 NULL
117509 +switch_status_2629 switch_status 5 2629 NULL
117510 +_proc_do_string_2632 _proc_do_string 2 2632 NULL
117511 +tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
117512 +osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
117513 +ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
117514 +oti6858_write_2692 oti6858_write 4 2692 NULL
117515 +copy_to_iter_iovec_2697 copy_to_iter_iovec 2 2697 NULL
117516 +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
117517 +memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
117518 +lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 NULL
117519 +xfs_readdir_2767 xfs_readdir 3 2767 NULL
117520 +fsl_edma_alloc_desc_2769 fsl_edma_alloc_desc 2 2769 NULL
117521 +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL
117522 +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
117523 +device_add_attrs_2789 device_add_attrs 0 2789 NULL
117524 +iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
117525 +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
117526 +vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL
117527 +sock_create_2838 sock_create 0 2838 NULL
117528 +wait_for_avail_2847 wait_for_avail 0 2847 NULL
117529 +sfq_alloc_2861 sfq_alloc 1 2861 NULL
117530 +irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
117531 +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
117532 +nla_padlen_2883 nla_padlen 1 2883 NULL
117533 +cmm_write_2896 cmm_write 3 2896 NULL
117534 +osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
117535 +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
117536 +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
117537 +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
117538 +i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
117539 +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
117540 +free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
117541 +bio_setup_sector_2970 bio_setup_sector 3 2970 NULL
117542 +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
117543 +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
117544 +lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
117545 +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
117546 +depth_write_3021 depth_write 3 3021 NULL
117547 +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
117548 +nvme_split_and_submit_3027 nvme_split_and_submit 3 3027 NULL
117549 +kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
117550 +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
117551 +lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
117552 +iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
117553 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
117554 +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
117555 +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
117556 +__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL
117557 +hfsplus_asc2uni_3071 hfsplus_asc2uni 0 3071 NULL nohasharray
117558 +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 &hfsplus_asc2uni_3071
117559 +read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
117560 +bio_integrity_intervals_3094 bio_integrity_intervals 0-2 3094 NULL
117561 +ttusb2_msg_3100 ttusb2_msg 4 3100 NULL
117562 +rb_alloc_3102 rb_alloc 1 3102 NULL
117563 +ufshcd_get_rsp_upiu_result_3114 ufshcd_get_rsp_upiu_result 0 3114 NULL
117564 +simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
117565 +print_time_3132 print_time 0 3132 NULL
117566 +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
117567 +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
117568 +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
117569 +pkcs7_sig_note_signature_3178 pkcs7_sig_note_signature 5 3178 NULL
117570 +uinput_ioctl_handler_3181 uinput_ioctl_handler 2 3181 NULL nohasharray
117571 +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 &uinput_ioctl_handler_3181
117572 +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
117573 +mempool_create_node_3191 mempool_create_node 1 3191 NULL
117574 +alloc_context_3194 alloc_context 1 3194 NULL
117575 +dma_init_coherent_memory_3197 dma_init_coherent_memory 3 3197 NULL
117576 +shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
117577 +codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
117578 +SyS_sendto_3219 SyS_sendto 6 3219 NULL
117579 +btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
117580 +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
117581 +write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
117582 +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
117583 +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
117584 +key_key_read_3241 key_key_read 3 3241 NULL
117585 +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
117586 +ieee80211_if_write_beacon_loss_3296 ieee80211_if_write_beacon_loss 3 3296 NULL
117587 +cgroup_name_3300 cgroup_name 3 3300 NULL
117588 +__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
117589 +_iwl_dbgfs_d3_sram_write_3315 _iwl_dbgfs_d3_sram_write 3 3315 NULL
117590 +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
117591 +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
117592 +sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
117593 +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
117594 +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
117595 +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
117596 +scnprintf_3360 scnprintf 0-2 3360 NULL
117597 +sr_read_3366 sr_read 3 3366 NULL
117598 +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
117599 +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
117600 +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
117601 +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
117602 +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
117603 +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
117604 +softsynth_write_3455 softsynth_write 3 3455 NULL
117605 +snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 NULL
117606 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
117607 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
117608 +mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
117609 +SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
117610 +SyS_readv_3539 SyS_readv 3 3539 NULL
117611 +nouveau_fuse_create__3546 nouveau_fuse_create_ 4 3546 NULL
117612 +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
117613 +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
117614 +evtchn_read_3569 evtchn_read 3 3569 NULL
117615 +ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
117616 +vc_resize_3585 vc_resize 3-2 3585 NULL
117617 +kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
117618 +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
117619 +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
117620 +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
117621 +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
117622 +fm10k_alloc_q_vector_3638 fm10k_alloc_q_vector 4-6 3638 NULL
117623 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
117624 +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
117625 +_iwl_dbgfs_tx_flush_write_3675 _iwl_dbgfs_tx_flush_write 3 3675 NULL
117626 +snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL
117627 +ci_ll_write_3740 ci_ll_write 4 3740 NULL
117628 +msm_otg_mode_write_3788 msm_otg_mode_write 3 3788 NULL
117629 +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
117630 +ncp_file_write_3813 ncp_file_write 3 3813 NULL
117631 +llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
117632 +ceph_do_getattr_3838 ceph_do_getattr 0 3838 NULL
117633 +create_one_cdev_3852 create_one_cdev 2 3852 NULL
117634 +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
117635 +get_fd_set_3866 get_fd_set 1 3866 NULL
117636 +garp_attr_create_3883 garp_attr_create 3 3883 NULL
117637 +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
117638 +nvram_write_3894 nvram_write 3 3894 NULL
117639 +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
117640 +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
117641 +vcs_write_3910 vcs_write 3 3910 NULL
117642 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
117643 +hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
117644 +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
117645 +mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
117646 +copy_from_user_atomic_iovec_3990 copy_from_user_atomic_iovec 0-4 3990 NULL
117647 +do_add_counters_3992 do_add_counters 3 3992 NULL
117648 +userspace_status_4004 userspace_status 4 4004 NULL
117649 +xfs_check_block_4005 xfs_check_block 4 4005 NULL nohasharray
117650 +mei_write_4005 mei_write 3 4005 &xfs_check_block_4005
117651 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
117652 +blk_end_request_4024 blk_end_request 3 4024 NULL
117653 +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
117654 +mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
117655 +read_file_queues_4078 read_file_queues 3 4078 NULL
117656 +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
117657 +C_SYSC_rt_sigpending_4114 C_SYSC_rt_sigpending 2 4114 NULL
117658 +tm6000_read_4151 tm6000_read 3 4151 NULL
117659 +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
117660 +msg_bits_4158 msg_bits 0-3-4 4158 NULL
117661 +get_alua_req_4166 get_alua_req 3 4166 NULL
117662 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
117663 +read_file_bool_4180 read_file_bool 3 4180 NULL
117664 +lstcon_test_add_4190 lstcon_test_add 10 4190 NULL
117665 +vring_new_virtqueue_4199 vring_new_virtqueue 2 4199 NULL
117666 +f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
117667 +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
117668 +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
117669 +ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
117670 +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
117671 +get_connectors_for_crtc_4291 get_connectors_for_crtc 0 4291 NULL
117672 +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
117673 +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
117674 +count_strings_4315 count_strings 0 4315 NULL nohasharray
117675 +cfg80211_inform_bss_4315 cfg80211_inform_bss 9 4315 &count_strings_4315
117676 +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
117677 +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
117678 +ima_eventdigest_init_common_4338 ima_eventdigest_init_common 2 4338 NULL
117679 +__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray
117680 +lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365
117681 +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
117682 +access_process_vm_4412 access_process_vm 0 4412 NULL nohasharray
117683 +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412
117684 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
117685 +rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
117686 +do_pages_stat_4437 do_pages_stat 2 4437 NULL
117687 +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
117688 +snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
117689 +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
117690 +set_link_security_4502 set_link_security 4 4502 NULL
117691 +ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
117692 +tty_register_device_4544 tty_register_device 2 4544 NULL
117693 +fsl_edma_prep_slave_sg_4555 fsl_edma_prep_slave_sg 3 4555 NULL
117694 +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
117695 +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
117696 +bch_alloc_4593 bch_alloc 1 4593 NULL
117697 +ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
117698 +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
117699 +nve0_gpio_intr_mask_4665 nve0_gpio_intr_mask 4-3 4665 NULL
117700 +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
117701 +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
117702 +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
117703 +kone_receive_4690 kone_receive 4 4690 NULL
117704 +hash_netportnet6_expire_4702 hash_netportnet6_expire 4 4702 NULL
117705 +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
117706 +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
117707 +show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
117708 +ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
117709 +bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
117710 +lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
117711 +pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
117712 +create_subvol_4791 create_subvol 4 4791 NULL
117713 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
117714 +C_SYSC_setsockopt_4806 C_SYSC_setsockopt 5 4806 NULL
117715 +repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
117716 +scsi_end_request_4839 scsi_end_request 3-4 4839 NULL
117717 +comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
117718 +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
117719 +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
117720 +ocfs2_defrag_extent_4873 ocfs2_defrag_extent 2 4873 NULL
117721 +hid_register_field_4874 hid_register_field 2-3 4874 NULL
117722 +vga_arb_read_4886 vga_arb_read 3 4886 NULL
117723 +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
117724 +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
117725 +ath10k_read_chip_id_4969 ath10k_read_chip_id 3 4969 NULL
117726 +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
117727 +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
117728 +compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
117729 +do_mincore_5018 do_mincore 0-2-1 5018 NULL
117730 +cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
117731 +ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
117732 +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
117733 +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
117734 +get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray
117735 +kfifo_copy_from_user_5091 kfifo_copy_from_user 3-4-0 5091 &get_random_bytes_5091 nohasharray
117736 +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091
117737 +sound_write_5102 sound_write 3 5102 NULL
117738 +i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
117739 +qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
117740 +bucket_table_alloc_5149 bucket_table_alloc 1 5149 NULL
117741 +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
117742 +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
117743 +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
117744 +trf7970a_read_cont_5179 trf7970a_read_cont 4 5179 NULL
117745 +ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
117746 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
117747 +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
117748 +ipv4_tun_to_nlattr_5261 ipv4_tun_to_nlattr 4 5261 NULL
117749 +dvb_ringbuffer_write_user_5270 dvb_ringbuffer_write_user 3 5270 NULL
117750 +xgmac_reg_addr_read_5278 xgmac_reg_addr_read 3 5278 NULL
117751 +usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
117752 +r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
117753 +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
117754 +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
117755 +uinput_ioctl_5342 uinput_ioctl 2 5342 NULL
117756 +cq_free_res_5355 cq_free_res 5 5355 NULL
117757 +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
117758 +cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
117759 +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
117760 +ll_xattr_cache_refill_5468 ll_xattr_cache_refill 0 5468 NULL
117761 +kernfs_fop_write_5471 kernfs_fop_write 3 5471 NULL
117762 +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
117763 +pci_enable_msix_exact_5482 pci_enable_msix_exact 3 5482 NULL
117764 +cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
117765 +tty_write_5494 tty_write 3 5494 NULL
117766 +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
117767 +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
117768 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
117769 +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
117770 +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
117771 +le_readq_5557 le_readq 0 5557 NULL
117772 +inw_5558 inw 0 5558 NULL
117773 +bioset_create_5580 bioset_create 1 5580 NULL
117774 +oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
117775 +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
117776 +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
117777 +posix_clock_register_5662 posix_clock_register 2 5662 NULL
117778 +get_arg_5694 get_arg 3 5694 NULL
117779 +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
117780 +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
117781 +sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
117782 +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
117783 +nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
117784 +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL nohasharray
117785 +ath10k_core_create_5806 ath10k_core_create 1 5806 &skb_copy_datagram_iovec_5806
117786 +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
117787 +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
117788 +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
117789 +setup_req_5848 setup_req 3 5848 NULL
117790 +ria_page_count_5849 ria_page_count 0 5849 NULL
117791 +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
117792 +uinput_compat_ioctl_5861 uinput_compat_ioctl 2 5861 NULL
117793 +config_buf_5862 config_buf 0 5862 NULL nohasharray
117794 +ufshcd_check_query_response_5862 ufshcd_check_query_response 0 5862 &config_buf_5862
117795 +lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
117796 +port_show_regs_5904 port_show_regs 3 5904 NULL
117797 +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
117798 +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
117799 +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
117800 +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
117801 +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
117802 +ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
117803 +__apu_get_register_5967 __apu_get_register 0 5967 NULL
117804 +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
117805 +SyS_semop_5980 SyS_semop 3 5980 NULL
117806 +btrfs_item_offset_6019 btrfs_item_offset 0 6019 NULL
117807 +alloc_msg_6072 alloc_msg 1 6072 NULL
117808 +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
117809 +_random_read_6098 _random_read 3 6098 NULL
117810 +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL nohasharray
117811 +force_static_address_read_6110 force_static_address_read 3 6110 &ipmi_addr_length_6110
117812 +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
117813 +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
117814 +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
117815 +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
117816 +maybe_insert_hole_6167 maybe_insert_hole 3 6167 NULL
117817 +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
117818 +SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
117819 +snd_efw_command_get_phys_meters_6190 snd_efw_command_get_phys_meters 3 6190 NULL
117820 +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
117821 +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
117822 +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
117823 +f_hidg_read_6238 f_hidg_read 3 6238 NULL
117824 +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
117825 +of_gpio_count_6270 of_gpio_count 0 6270 NULL
117826 +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
117827 +snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
117828 +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
117829 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
117830 +serial_port_in_6291 serial_port_in 0 6291 NULL
117831 +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
117832 +hfsplus_direct_IO_6313 hfsplus_direct_IO 4 6313 NULL
117833 +SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray
117834 +hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329
117835 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
117836 +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
117837 +regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
117838 +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
117839 +arch_gnttab_valloc_6372 arch_gnttab_valloc 2 6372 NULL
117840 +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL nohasharray
117841 +sync_fence_alloc_6378 sync_fence_alloc 1 6378 &osd_req_read_sg_kern_6378
117842 +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
117843 +add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
117844 +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
117845 +__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
117846 +C_SYSC_vmsplice_6470 C_SYSC_vmsplice 3 6470 NULL
117847 +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
117848 +qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
117849 +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
117850 +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
117851 +mei_read_6507 mei_read 3 6507 NULL
117852 +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
117853 +wdm_read_6549 wdm_read 3 6549 NULL
117854 +dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
117855 +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
117856 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
117857 +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
117858 +xfs_do_div_6649 xfs_do_div 0-2 6649 NULL
117859 +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
117860 +btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3 6696 NULL
117861 +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
117862 +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
117863 +mpeg_read_6708 mpeg_read 3 6708 NULL
117864 +ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
117865 +check_clk_sync_6717 check_clk_sync 2 6717 NULL
117866 +video_proc_write_6724 video_proc_write 3 6724 NULL
117867 +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
117868 +inet_recv_error_6744 inet_recv_error 3 6744 NULL
117869 +kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
117870 +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
117871 +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
117872 +zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
117873 +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
117874 +ll_xattr_cache_find_6798 ll_xattr_cache_find 0 6798 NULL
117875 +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
117876 +rounded_hashtable_size_6802 rounded_hashtable_size 0 6802 NULL
117877 +lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
117878 +calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
117879 +blk_alloc_flush_queue_6839 blk_alloc_flush_queue 3 6839 NULL
117880 +mon_bin_read_6841 mon_bin_read 3 6841 NULL
117881 +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
117882 +perf_output_sample_ustack_6868 perf_output_sample_ustack 2 6868 NULL
117883 +dio_complete_6879 dio_complete 0-3-2 6879 NULL
117884 +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 NULL nohasharray
117885 +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 &raw_seticmpfilter_6888
117886 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
117887 +proc_sessionid_read_6911 proc_sessionid_read 3 6911 NULL nohasharray
117888 +spi_show_regs_6911 spi_show_regs 3 6911 &proc_sessionid_read_6911 nohasharray
117889 +acm_alloc_minor_6911 acm_alloc_minor 0 6911 &spi_show_regs_6911
117890 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
117891 +do_msgrcv_6921 do_msgrcv 3 6921 NULL
117892 +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
117893 +ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
117894 +qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
117895 +tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
117896 +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
117897 +i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
117898 +rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
117899 +lustre_pack_reply_6982 lustre_pack_reply 2 6982 NULL
117900 +request_key_async_6990 request_key_async 4 6990 NULL
117901 +tpl_write_6998 tpl_write 3 6998 NULL
117902 +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
117903 +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
117904 +ld_usb_write_7022 ld_usb_write 3 7022 NULL
117905 +wimax_msg_7030 wimax_msg 4 7030 NULL
117906 +ceph_kvmalloc_7033 ceph_kvmalloc 1 7033 NULL
117907 +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
117908 +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
117909 +nouveau_device_create__7063 nouveau_device_create_ 7 7063 NULL
117910 +hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
117911 +event_enable_read_7074 event_enable_read 3 7074 NULL
117912 +beacon_interval_read_7091 beacon_interval_read 3 7091 NULL nohasharray
117913 +tipc_send_packet_7091 tipc_send_packet 4 7091 &beacon_interval_read_7091
117914 +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
117915 +osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
117916 +qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
117917 +kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
117918 +qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
117919 +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
117920 +hdlc_loop_7255 hdlc_loop 0 7255 NULL
117921 +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL nohasharray
117922 +kimage_alloc_init_7282 kimage_alloc_init 3 7282 &rx_rate_rx_frames_per_rates_read_7282
117923 +get_string_7302 get_string 0 7302 NULL
117924 +pci_vpd_info_field_size_7324 pci_vpd_info_field_size 0 7324 NULL
117925 +mgmt_control_7349 mgmt_control 3 7349 NULL
117926 +at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
117927 +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
117928 +ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
117929 +hweight_long_7388 hweight_long 0-1 7388 NULL
117930 +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
117931 +_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
117932 +audmux_read_file_7400 audmux_read_file 3 7400 NULL
117933 +readb_7401 readb 0 7401 NULL
117934 +tipc_recvmsg_7402 tipc_recvmsg 4 7402 NULL
117935 +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
117936 +__copy_to_user_nocheck_7443 __copy_to_user_nocheck 0-3 7443 NULL
117937 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
117938 +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
117939 +rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
117940 +l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
117941 +garp_request_join_7471 garp_request_join 4 7471 NULL nohasharray
117942 +ReadHSCX_7471 ReadHSCX 0 7471 &garp_request_join_7471
117943 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
117944 +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 NULL nohasharray
117945 +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 &ahash_instance_headroom_7509
117946 +array_zalloc_7519 array_zalloc 1-2 7519 NULL
117947 +ath10k_read_htt_stats_mask_7557 ath10k_read_htt_stats_mask 3 7557 NULL
117948 +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
117949 +netvsc_get_slots_7565 netvsc_get_slots 0 7565 NULL
117950 +cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
117951 +groups_alloc_7614 groups_alloc 1 7614 NULL nohasharray
117952 +create_dir_7614 create_dir 0 7614 &groups_alloc_7614
117953 +_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
117954 +fault_inject_write_7662 fault_inject_write 3 7662 NULL
117955 +acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 NULL
117956 +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
117957 +dev_write_7708 dev_write 3 7708 NULL
117958 +pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
117959 +vxge_device_register_7752 vxge_device_register 4 7752 NULL
117960 +iwl_dbgfs_bt_cmd_read_7770 iwl_dbgfs_bt_cmd_read 3 7770 NULL
117961 +alloc_candev_7776 alloc_candev 1-2 7776 NULL
117962 +__videobuf_read_start_7782 __videobuf_read_start 0 7782 NULL
117963 +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
117964 +bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
117965 +diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
117966 +lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
117967 +seq_buf_alloc_7828 seq_buf_alloc 1 7828 NULL
117968 +cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
117969 +tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
117970 +config_desc_7878 config_desc 0 7878 NULL
117971 +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
117972 +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
117973 +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
117974 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
117975 +integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL
117976 +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
117977 +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
117978 +vcs_read_8017 vcs_read 3 8017 NULL
117979 +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
117980 +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
117981 +spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
117982 +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 NULL
117983 +venus_lookup_8121 venus_lookup 4 8121 NULL
117984 +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
117985 +xfs_file_fallocate_8150 xfs_file_fallocate 3-4 8150 NULL
117986 +ufshcd_wait_for_dev_cmd_8168 ufshcd_wait_for_dev_cmd 0 8168 NULL
117987 +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
117988 +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
117989 +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
117990 +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
117991 +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
117992 +play_iframe_8219 play_iframe 3 8219 NULL
117993 +kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 NULL
117994 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
117995 +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
117996 +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
117997 +init_cdev_8274 init_cdev 1 8274 NULL
117998 +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
117999 +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
118000 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
118001 +rtw_cfg80211_rx_action_8329 rtw_cfg80211_rx_action 3 8329 NULL
118002 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
118003 +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
118004 +generic_write_sync_8358 generic_write_sync 0 8358 NULL
118005 +ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
118006 +ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
118007 +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
118008 +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
118009 +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
118010 +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
118011 +roccat_common2_sysfs_read_8431 roccat_common2_sysfs_read 6 8431 NULL
118012 +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
118013 +fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
118014 +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
118015 +dev_config_8506 dev_config 3 8506 NULL
118016 +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
118017 +nouveau_platform_device_create__8514 nouveau_platform_device_create_ 2 8514 NULL
118018 +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
118019 +user_on_off_8552 user_on_off 2 8552 NULL
118020 +profile_remove_8556 profile_remove 3 8556 NULL
118021 +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
118022 +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
118023 +tower_write_8580 tower_write 3 8580 NULL
118024 +cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
118025 +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
118026 +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
118027 +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
118028 +fuse_send_write_pages_8636 fuse_send_write_pages 5-0 8636 NULL
118029 +mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
118030 +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
118031 +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
118032 +bpf_prog_size_8685 bpf_prog_size 0 8685 NULL
118033 +rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
118034 +skb_frag_size_8695 skb_frag_size 0 8695 NULL
118035 +arcfb_write_8702 arcfb_write 3 8702 NULL
118036 +i_size_read_8703 i_size_read 0 8703 NULL nohasharray
118037 +init_header_8703 init_header 0 8703 &i_size_read_8703
118038 +ufshcd_get_tr_ocs_8706 ufshcd_get_tr_ocs 0 8706 NULL
118039 +HDLC_irq_8709 HDLC_irq 2 8709 NULL
118040 +ctrl_out_8712 ctrl_out 3-5 8712 NULL
118041 +tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
118042 +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
118043 +iov_iter_zero_8748 iov_iter_zero 1 8748 NULL
118044 +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
118045 +compound_order_8750 compound_order 0 8750 NULL
118046 +cfg80211_inform_bss_width_8754 cfg80211_inform_bss_width 10 8754 NULL
118047 +yurex_write_8761 yurex_write 3 8761 NULL
118048 +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
118049 +kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
118050 +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
118051 +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 4-3 8785 NULL
118052 +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
118053 +metronomefb_write_8823 metronomefb_write 3 8823 NULL
118054 +SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
118055 +ll_xattr_cache_get_8829 ll_xattr_cache_get 0 8829 NULL
118056 +get_queue_depth_8833 get_queue_depth 0 8833 NULL
118057 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
118058 +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
118059 +iwl_rx_packet_len_8854 iwl_rx_packet_len 0 8854 NULL
118060 +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
118061 +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
118062 +xgmac_reg_value_write_8860 xgmac_reg_value_write 3 8860 NULL
118063 +radeon_drm_ioctl_8875 radeon_drm_ioctl 2 8875 NULL
118064 +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
118065 +ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
118066 +tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
118067 +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
118068 +sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
118069 +write_file_ani_8918 write_file_ani 3 8918 NULL
118070 +layout_commit_8926 layout_commit 3 8926 NULL
118071 +cp2112_hid_get_8933 cp2112_hid_get 4 8933 NULL
118072 +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
118073 +driver_stats_read_8944 driver_stats_read 3 8944 NULL
118074 +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
118075 +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
118076 +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL
118077 +venus_mkdir_8967 venus_mkdir 4 8967 NULL
118078 +seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
118079 +vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
118080 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
118081 +sony_register_touchpad_8981 sony_register_touchpad 2 8981 NULL
118082 +jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
118083 +il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
118084 +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
118085 +fd_ioctl_9028 fd_ioctl 3 9028 NULL
118086 +nla_put_9042 nla_put 3 9042 NULL
118087 +sta_tx_latency_stat_header_9050 sta_tx_latency_stat_header 0-3-4 9050 NULL
118088 +snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
118089 +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
118090 +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
118091 +create_queues_9088 create_queues 2-3 9088 NULL
118092 +nvkm_output_create__9091 nvkm_output_create_ 6 9091 NULL
118093 +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
118094 +adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
118095 +gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 NULL nohasharray
118096 +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 &gfn_to_rmap_9110
118097 +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
118098 +vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
118099 +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
118100 +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
118101 +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
118102 +altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
118103 +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
118104 +iwl_dbgfs_frame_stats_read_9211 iwl_dbgfs_frame_stats_read 3 9211 NULL
118105 +card_send_command_9215 card_send_command 3 9215 NULL
118106 +virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
118107 +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
118108 +l2cap_create_connless_pdu_9222 l2cap_create_connless_pdu 3 9222 NULL
118109 +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
118110 +hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
118111 +hdpvr_read_9273 hdpvr_read 3 9273 NULL
118112 +flakey_status_9274 flakey_status 5 9274 NULL
118113 +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
118114 +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
118115 +__blockdev_direct_IO_9321 __blockdev_direct_IO 0-6 9321 NULL
118116 +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
118117 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
118118 +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
118119 +ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
118120 +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
118121 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
118122 +read_9397 read 3 9397 NULL
118123 +hash_ipportip4_expire_9415 hash_ipportip4_expire 4 9415 NULL
118124 +btrfs_drop_extents_9423 btrfs_drop_extents 4 9423 NULL
118125 +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
118126 +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
118127 +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
118128 +get_registers_9470 get_registers 4 9470 NULL nohasharray
118129 +agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 &get_registers_9470
118130 +crypt_status_9492 crypt_status 5 9492 NULL
118131 +lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
118132 +lp_write_9511 lp_write 3 9511 NULL
118133 +mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL
118134 +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
118135 +ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
118136 +read_file_dma_9530 read_file_dma 3 9530 NULL
118137 +iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
118138 +il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
118139 +compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
118140 +fw_node_create_9559 fw_node_create 2 9559 NULL
118141 +kobj_map_9566 kobj_map 2-3 9566 NULL
118142 +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
118143 +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
118144 +lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
118145 +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
118146 +ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL
118147 +acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
118148 +ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
118149 +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
118150 +queue_received_packet_9657 queue_received_packet 5 9657 NULL
118151 +tipc_port_mcast_xmit_9663 tipc_port_mcast_xmit 4 9663 NULL
118152 +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
118153 +dns_query_9676 dns_query 3 9676 NULL
118154 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
118155 +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
118156 +lowpan_control_write_9699 lowpan_control_write 3 9699 NULL
118157 +vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
118158 +fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
118159 +ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
118160 +cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
118161 +parse_uac2_sample_rate_range_9718 parse_uac2_sample_rate_range 0 9718 NULL
118162 +btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
118163 +SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
118164 +nla_get_u8_9736 nla_get_u8 0 9736 NULL
118165 +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
118166 +ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
118167 +regmap_multi_reg_write_bypassed_9751 regmap_multi_reg_write_bypassed 3 9751 NULL nohasharray
118168 +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 &regmap_multi_reg_write_bypassed_9751
118169 +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
118170 +copy_page_from_iter_bvec_9767 copy_page_from_iter_bvec 0-3 9767 NULL
118171 +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
118172 +kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
118173 +bio_alloc_map_data_9798 bio_alloc_map_data 1 9798 NULL
118174 +ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 NULL nohasharray
118175 +udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 &ieee80211_if_read_state_9813
118176 +compat_SyS_vmsplice_9828 compat_SyS_vmsplice 3 9828 NULL
118177 +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
118178 +f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
118179 +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
118180 +bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray
118181 +snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893
118182 +snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 3-5 9895 NULL
118183 +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
118184 +iwl_dbgfs_prph_reg_read_9928 iwl_dbgfs_prph_reg_read 3 9928 NULL
118185 +root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
118186 +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
118187 +read_file_misc_9948 read_file_misc 3 9948 NULL
118188 +csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
118189 +SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
118190 +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
118191 +btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
118192 +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
118193 +ceph_oloc_oid_to_pg_10003 ceph_oloc_oid_to_pg 0 10003 NULL
118194 +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
118195 +asymmetric_key_generate_id_10064 asymmetric_key_generate_id 2-4 10064 NULL
118196 +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
118197 +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
118198 +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
118199 +gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
118200 +SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL
118201 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
118202 +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL nohasharray
118203 +tracing_nsecs_write_10157 tracing_nsecs_write 3 10157 &rx_out_of_mem_read_10157
118204 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL
118205 +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
118206 +kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
118207 +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
118208 +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
118209 +hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
118210 +lmv_hsm_req_count_10245 lmv_hsm_req_count 0 10245 NULL
118211 +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
118212 +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
118213 +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
118214 +nvif_object_new_10300 nvif_object_new 5 10300 NULL
118215 +read_emulate_10310 read_emulate 2-4 10310 NULL
118216 +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
118217 +compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
118218 +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
118219 +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
118220 +whci_add_cap_10350 whci_add_cap 0 10350 NULL
118221 +dbAllocAny_10354 dbAllocAny 0 10354 NULL
118222 +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
118223 +sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
118224 +ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
118225 +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
118226 +fwtty_rx_10434 fwtty_rx 3 10434 NULL
118227 +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
118228 +hash_ipportip6_expire_10478 hash_ipportip6_expire 4 10478 NULL
118229 +nouveau_pwr_create__10483 nouveau_pwr_create_ 4 10483 NULL
118230 +ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
118231 +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
118232 +sel_write_disable_10511 sel_write_disable 3 10511 NULL
118233 +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
118234 +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
118235 +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL
118236 +kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 NULL nohasharray
118237 +snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 &kstrtouint_from_user_10536
118238 +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
118239 +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
118240 +otp_read_10594 otp_read 2-4-5 10594 NULL
118241 +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
118242 +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
118243 +fq_alloc_node_10633 fq_alloc_node 1 10633 NULL
118244 +nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL
118245 +efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
118246 +parport_write_10669 parport_write 0 10669 NULL
118247 +edge_write_10692 edge_write 4 10692 NULL
118248 +selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL nohasharray
118249 +inl_10708 inl 0 10708 &selinux_inode_setxattr_10708
118250 +pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
118251 +shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
118252 +spi_sync_10731 spi_sync 0 10731 NULL
118253 +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
118254 +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
118255 +SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
118256 +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
118257 +rd_build_prot_space_10761 rd_build_prot_space 2-3 10761 NULL
118258 +kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4 10765 NULL
118259 +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
118260 +diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
118261 +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
118262 +ext4_direct_IO_10843 ext4_direct_IO 4 10843 NULL
118263 +ida_get_new_above_10853 ida_get_new_above 0 10853 NULL
118264 +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
118265 +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
118266 +wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
118267 +get_scq_10897 get_scq 2 10897 NULL
118268 +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
118269 +lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
118270 +__copy_from_user_10918 __copy_from_user 0-3 10918 NULL
118271 +kobject_add_10919 kobject_add 0 10919 NULL
118272 +ar9003_dump_modal_eeprom_10959 ar9003_dump_modal_eeprom 3-2-0 10959 NULL
118273 +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
118274 +bm_entry_read_10976 bm_entry_read 3 10976 NULL
118275 +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
118276 +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
118277 +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
118278 +SetLineNumber_11023 SetLineNumber 0 11023 NULL
118279 +nouveau_gpio_create__11048 nouveau_gpio_create_ 4 11048 NULL
118280 +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
118281 +insert_inline_extent_backref_11063 insert_inline_extent_backref 8 11063 NULL nohasharray
118282 +qlcnic_83xx_calculate_msix_vector_11063 qlcnic_83xx_calculate_msix_vector 0 11063 &insert_inline_extent_backref_11063
118283 +xfs_collapse_file_space_11075 xfs_collapse_file_space 2-3 11075 NULL
118284 +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
118285 +count_argc_11083 count_argc 0 11083 NULL
118286 +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
118287 +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
118288 +tc90522_master_xfer_11119 tc90522_master_xfer 3 11119 NULL
118289 +page_offset_11120 page_offset 0 11120 NULL
118290 +tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL
118291 +alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
118292 +snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 3-4 11172 NULL
118293 +copy_from_iter_iovec_11196 copy_from_iter_iovec 2 11196 NULL
118294 +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
118295 +comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
118296 +of_irq_count_11253 of_irq_count 0 11253 NULL
118297 +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
118298 +ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
118299 +SYSC_getrandom_11294 SYSC_getrandom 2 11294 NULL
118300 +tipc_msg_build_11304 tipc_msg_build 3-4-5 11304 NULL
118301 +__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
118302 +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
118303 +bcache_dev_sectors_dirty_add_11315 bcache_dev_sectors_dirty_add 3-4 11315 NULL
118304 +sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
118305 +tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
118306 +construct_key_11329 construct_key 3 11329 NULL nohasharray
118307 +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
118308 +next_segment_11330 next_segment 0-2-1 11330 NULL
118309 +persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
118310 +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
118311 +sel_write_create_11353 sel_write_create 3 11353 NULL nohasharray
118312 +nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 &sel_write_create_11353
118313 +of_get_available_child_count_11361 of_get_available_child_count 0 11361 NULL
118314 +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
118315 +tcf_register_action_11381 tcf_register_action 2 11381 NULL nohasharray
118316 +nft_value_dump_11381 nft_value_dump 3 11381 &tcf_register_action_11381
118317 +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
118318 +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
118319 +lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
118320 +___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
118321 +str_to_user_11411 str_to_user 2 11411 NULL
118322 +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
118323 +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
118324 +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
118325 +trace_options_read_11419 trace_options_read 3 11419 NULL
118326 +i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
118327 +bttv_read_11432 bttv_read 3 11432 NULL
118328 +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
118329 +ufshcd_change_queue_depth_11477 ufshcd_change_queue_depth 2 11477 NULL
118330 +sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL nohasharray
118331 +pci_set_power_state_11479 pci_set_power_state 0 11479 &sca3000_read_first_n_hw_rb_11479
118332 +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
118333 +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
118334 +ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
118335 +twl_direction_in_11527 twl_direction_in 2 11527 NULL
118336 +skb_cow_data_11565 skb_cow_data 0 11565 NULL
118337 +lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
118338 +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
118339 +batadv_iv_ogm_orig_add_if_11586 batadv_iv_ogm_orig_add_if 2 11586 NULL
118340 +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
118341 +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
118342 +batadv_iv_ogm_orig_del_if_11604 batadv_iv_ogm_orig_del_if 2 11604 NULL
118343 +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
118344 +C_SYSC_migrate_pages_11618 C_SYSC_migrate_pages 2 11618 NULL
118345 +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
118346 +nla_total_size_11658 nla_total_size 0-1 11658 NULL
118347 +srpc_create_client_rpc_11664 srpc_create_client_rpc 3 11664 NULL nohasharray
118348 +slab_ksize_11664 slab_ksize 0 11664 &srpc_create_client_rpc_11664
118349 +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
118350 +compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
118351 +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
118352 +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
118353 +split_11691 split 2 11691 NULL
118354 +compat_SyS_keyctl_11695 compat_SyS_keyctl 4 11695 NULL nohasharray
118355 +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 &compat_SyS_keyctl_11695
118356 +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
118357 +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
118358 +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
118359 +ieee80211_get_num_supported_channels_11768 ieee80211_get_num_supported_channels 0 11768 NULL
118360 +tipc_sendmsg_11769 tipc_sendmsg 4 11769 NULL
118361 +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
118362 +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
118363 +pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
118364 +umc_device_register_11824 umc_device_register 0 11824 NULL
118365 +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
118366 +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
118367 +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
118368 +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
118369 +pci_enable_msix_range_11852 pci_enable_msix_range 0-4 11852 NULL
118370 +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
118371 +l2cap_chan_send_11878 l2cap_chan_send 3 11878 NULL
118372 +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
118373 +mdc_rename_11899 mdc_rename 4-6 11899 NULL
118374 +xstateregs_get_11906 xstateregs_get 4 11906 NULL
118375 +ti_write_11916 ti_write 4 11916 NULL
118376 +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
118377 +bitmap_remap_11929 bitmap_remap 5 11929 NULL
118378 +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
118379 +r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
118380 +f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
118381 +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
118382 +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
118383 +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
118384 +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
118385 +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
118386 +batadv_tt_global_size_mod_12085 batadv_tt_global_size_mod 3 12085 NULL
118387 +rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
118388 +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
118389 +set_powered_12129 set_powered 4 12129 NULL
118390 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
118391 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
118392 +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
118393 +rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
118394 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
118395 +vmbus_open_12154 vmbus_open 2-3 12154 NULL
118396 +fnic_reset_stats_write_12177 fnic_reset_stats_write 3 12177 NULL
118397 +LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
118398 +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
118399 +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
118400 +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
118401 +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
118402 +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
118403 +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
118404 +__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
118405 +usnic_ib_qp_grp_dump_rows_12239 usnic_ib_qp_grp_dump_rows 3 12239 NULL
118406 +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
118407 +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
118408 +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
118409 +note_last_dentry_12285 note_last_dentry 3 12285 NULL
118410 +roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL nohasharray
118411 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288
118412 +bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
118413 +usnic_transport_sock_to_str_12322 usnic_transport_sock_to_str 2-0 12322 NULL
118414 +ufshcd_copy_query_response_12324 ufshcd_copy_query_response 0 12324 NULL
118415 +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
118416 +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
118417 +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
118418 +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
118419 +write_file_dump_12391 write_file_dump 3 12391 NULL nohasharray
118420 +btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 &write_file_dump_12391 nohasharray
118421 +populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391
118422 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
118423 +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
118424 +cfs_array_alloc_12441 cfs_array_alloc 1-2 12441 NULL
118425 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
118426 +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
118427 +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
118428 +__ceph_osdc_start_request_12502 __ceph_osdc_start_request 0 12502 NULL
118429 +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
118430 +nvkm_event_init_12565 nvkm_event_init 3-2 12565 NULL
118431 +hvc_alloc_12579 hvc_alloc 4 12579 NULL
118432 +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
118433 +_iwl_dbgfs_prph_reg_write_12597 _iwl_dbgfs_prph_reg_write 3 12597 NULL
118434 +tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
118435 +vhci_put_user_12604 vhci_put_user 4 12604 NULL
118436 +sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
118437 +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
118438 +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
118439 +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
118440 +nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
118441 +rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
118442 +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
118443 +lustre_pack_request_v2_12665 lustre_pack_request_v2 2 12665 NULL
118444 +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
118445 +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
118446 +ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
118447 +iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
118448 +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
118449 +ivtv_write_12721 ivtv_write 3 12721 NULL
118450 +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
118451 +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
118452 +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
118453 +listxattr_12769 listxattr 3 12769 NULL
118454 +sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
118455 +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
118456 +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
118457 +SyS_add_key_12834 SyS_add_key 4 12834 NULL
118458 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
118459 +spidev_sync_12842 spidev_sync 0 12842 NULL
118460 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
118461 +ath9k_dump_4k_modal_eeprom_12883 ath9k_dump_4k_modal_eeprom 3-2 12883 NULL
118462 +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
118463 +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
118464 +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
118465 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
118466 +bm_status_write_12964 bm_status_write 3 12964 NULL
118467 +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
118468 +TransmitTcb_12989 TransmitTcb 4 12989 NULL
118469 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
118470 +bset_prev_bytes_13020 bset_prev_bytes 0 13020 NULL
118471 +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
118472 +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
118473 +__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL nohasharray
118474 +ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 &__dn_setsockopt_13060
118475 +ufshcd_compose_upiu_13076 ufshcd_compose_upiu 0 13076 NULL
118476 +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
118477 +ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
118478 +SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL
118479 +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
118480 +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
118481 +blk_update_request_13146 blk_update_request 3 13146 NULL
118482 +caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
118483 +pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
118484 +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
118485 +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
118486 +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
118487 +comedi_read_13199 comedi_read 3 13199 NULL
118488 +hash_ipport4_expire_13201 hash_ipport4_expire 4 13201 NULL
118489 +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
118490 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
118491 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
118492 +_iwl_dbgfs_disable_power_off_write_13243 _iwl_dbgfs_disable_power_off_write 3 13243 NULL
118493 +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
118494 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
118495 +bio_integrity_trim_13259 bio_integrity_trim 3-2 13259 NULL
118496 +simple_attr_write_13260 simple_attr_write 3 13260 NULL
118497 +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
118498 +nvkm_ltc_create__13275 nvkm_ltc_create_ 4 13275 NULL
118499 +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
118500 +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
118501 +nvkm_i2c_pad_create__13292 nvkm_i2c_pad_create_ 5 13292 NULL
118502 +sd_major_13294 sd_major 0-1 13294 NULL
118503 +read_file_phy_err_13318 read_file_phy_err 3 13318 NULL
118504 +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 NULL
118505 +round_event_name_len_13348 round_event_name_len 0 13348 NULL
118506 +hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
118507 +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
118508 +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
118509 +ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
118510 +lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
118511 +dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
118512 +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
118513 +sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
118514 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 7-8-9 13443 NULL
118515 +sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
118516 +data_read_13494 data_read 3 13494 NULL nohasharray
118517 +ext_prop_data_store_13494 ext_prop_data_store 3 13494 &data_read_13494
118518 +ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 0-2 13512 NULL
118519 +core_status_13515 core_status 4 13515 NULL
118520 +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
118521 +bm_init_13529 bm_init 2 13529 NULL
118522 +llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
118523 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
118524 +hash_net4_expire_13559 hash_net4_expire 4 13559 NULL
118525 +read_file_antenna_13574 read_file_antenna 3 13574 NULL
118526 +cache_write_13589 cache_write 3 13589 NULL
118527 +Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
118528 +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
118529 +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
118530 +packet_snd_13634 packet_snd 3 13634 NULL
118531 +blk_msg_write_13655 blk_msg_write 3 13655 NULL
118532 +cache_downcall_13666 cache_downcall 3 13666 NULL
118533 +usb_get_string_13693 usb_get_string 0 13693 NULL
118534 +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
118535 +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
118536 +udf_direct_IO_13765 udf_direct_IO 4 13765 NULL
118537 +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
118538 +fb_sys_read_13778 fb_sys_read 3 13778 NULL
118539 +alloc_indirect_13783 alloc_indirect 1 13783 NULL
118540 +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
118541 +random_read_13815 random_read 3 13815 NULL
118542 +mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
118543 +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
118544 +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
118545 +qce_ahash_hmac_setkey_13837 qce_ahash_hmac_setkey 3 13837 NULL
118546 +enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
118547 +evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
118548 +compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
118549 +qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL
118550 +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
118551 +cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
118552 +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
118553 +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
118554 +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
118555 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
118556 +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
118557 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
118558 +osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
118559 +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
118560 +qcam_read_13977 qcam_read 3 13977 NULL
118561 +dsp_read_13980 dsp_read 2 13980 NULL
118562 +dvb_demux_read_13981 dvb_demux_read 3 13981 NULL
118563 +sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
118564 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
118565 +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
118566 +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
118567 +pci_add_ext_cap_save_buffer_14032 pci_add_ext_cap_save_buffer 3 14032 NULL
118568 +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
118569 +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
118570 +ovs_nla_alloc_flow_actions_14056 ovs_nla_alloc_flow_actions 1 14056 NULL
118571 +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
118572 +lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
118573 +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
118574 +ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
118575 +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
118576 +em_canid_change_14150 em_canid_change 3 14150 NULL
118577 +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
118578 +midi_alloc_ep_req_14159 midi_alloc_ep_req 2 14159 NULL
118579 +print_input_mask_14168 print_input_mask 3-0 14168 NULL
118580 +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
118581 +datafab_read_data_14186 datafab_read_data 4 14186 NULL
118582 +hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
118583 +alloc_async_14208 alloc_async 1 14208 NULL
118584 +ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
118585 +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
118586 +dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
118587 +btrfs_token_file_extent_ram_bytes_14247 btrfs_token_file_extent_ram_bytes 0 14247 NULL
118588 +ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
118589 +rr_status_14293 rr_status 5 14293 NULL
118590 +read_default_ldt_14302 read_default_ldt 2 14302 NULL nohasharray
118591 +lustre_pack_reply_flags_14302 lustre_pack_reply_flags 2 14302 &read_default_ldt_14302
118592 +oo_objects_14319 oo_objects 0 14319 NULL
118593 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
118594 +alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
118595 +hash_ipportnet4_expire_14354 hash_ipportnet4_expire 4 14354 NULL
118596 +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
118597 +lowpan_read_14369 lowpan_read 3 14369 NULL
118598 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
118599 +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
118600 +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
118601 +get_kcore_size_14425 get_kcore_size 0 14425 NULL
118602 +_iwl_dbgfs_sram_write_14439 _iwl_dbgfs_sram_write 3 14439 NULL
118603 +block_size_14443 block_size 0 14443 NULL
118604 +lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
118605 +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
118606 +ath10k_write_htt_stats_mask_14458 ath10k_write_htt_stats_mask 3 14458 NULL
118607 +lustre_msg_size_v2_14470 lustre_msg_size_v2 0-1 14470 NULL
118608 +dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
118609 +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
118610 +ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
118611 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
118612 +dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 NULL nohasharray
118613 +ep0_write_14536 ep0_write 3 14536 &dataflash_read_user_otp_14536
118614 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
118615 +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
118616 +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
118617 +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
118618 +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
118619 +ufshcd_compose_dev_cmd_14626 ufshcd_compose_dev_cmd 0 14626 NULL
118620 +dbJoin_14644 dbJoin 0 14644 NULL
118621 +profile_replace_14652 profile_replace 3 14652 NULL
118622 +usnic_vnic_dump_14662 usnic_vnic_dump 3 14662 NULL
118623 +min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
118624 +nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
118625 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
118626 +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
118627 +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
118628 +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
118629 +u_audio_playback_14709 u_audio_playback 3 14709 NULL
118630 +rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
118631 +vfd_write_14717 vfd_write 3 14717 NULL
118632 +__blk_end_request_14729 __blk_end_request 3 14729 NULL
118633 +raid1_resize_14740 raid1_resize 2 14740 NULL
118634 +i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
118635 +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
118636 +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
118637 +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
118638 +sta_dev_read_14782 sta_dev_read 3 14782 NULL
118639 +keys_proc_write_14792 keys_proc_write 3 14792 NULL
118640 +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
118641 +__kfifo_in_14797 __kfifo_in 3-0 14797 NULL nohasharray
118642 +ttm_page_pool_free_14797 ttm_page_pool_free 2-0 14797 &__kfifo_in_14797
118643 +hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
118644 +snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
118645 +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
118646 +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
118647 +lcd_write_14857 lcd_write 3 14857 NULL
118648 +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
118649 +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
118650 +SYSC_readv_14901 SYSC_readv 3 14901 NULL
118651 +netlbl_catmap_walk_14902 netlbl_catmap_walk 0-2 14902 NULL
118652 +__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
118653 +qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923 nohasharray
118654 +ptlrpc_prep_req_pool_14923 ptlrpc_prep_req_pool 4 14923 &qp_memcpy_to_queue_iov_14923
118655 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
118656 +queue_cnt_14951 queue_cnt 0 14951 NULL
118657 +unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
118658 +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
118659 +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
118660 +setkey_14987 setkey 3 14987 NULL nohasharray
118661 +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
118662 +sctp_setsockopt_default_sndinfo_15011 sctp_setsockopt_default_sndinfo 3 15011 NULL
118663 +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
118664 +read_file_node_aggr_15040 read_file_node_aggr 3 15040 NULL
118665 +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
118666 +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
118667 +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
118668 +ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
118669 +pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
118670 +smscore_load_firmware_family2_15086 smscore_load_firmware_family2 3 15086 NULL
118671 +compat_SyS_pwritev_15118 compat_SyS_pwritev 3 15118 NULL
118672 +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
118673 +start_port_15124 start_port 0 15124 NULL
118674 +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
118675 +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
118676 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
118677 +mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
118678 +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
118679 +iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
118680 +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
118681 +wacom_led_putimage_15264 wacom_led_putimage 4 15264 NULL
118682 +simple_strtol_15273 simple_strtol 0 15273 NULL
118683 +fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
118684 +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
118685 +ioread16_15342 ioread16 0 15342 NULL
118686 +ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
118687 +blkdev_readpages_15357 blkdev_readpages 4 15357 NULL
118688 +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
118689 +graph_depth_read_15371 graph_depth_read 3 15371 NULL
118690 +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
118691 +alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
118692 +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
118693 +get_modalias_15406 get_modalias 2 15406 NULL
118694 +__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
118695 +tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
118696 +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
118697 +memweight_15450 memweight 2 15450 NULL
118698 +__clone_and_map_data_bio_15498 __clone_and_map_data_bio 3 15498 NULL
118699 +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
118700 +ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
118701 +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
118702 +xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
118703 +persistent_status_15574 persistent_status 4 15574 NULL
118704 +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
118705 +vme_user_write_15587 vme_user_write 3 15587 NULL
118706 +compat_fillonedir_15620 compat_fillonedir 3 15620 NULL
118707 +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
118708 +tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
118709 +pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &tomoyo_scan_bprm_15642 nohasharray
118710 +sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &pipeline_hs_tx_stat_fifo_int_read_15642
118711 +joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
118712 +fs_path_add_15648 fs_path_add 3 15648 NULL
118713 +xsd_read_15653 xsd_read 3 15653 NULL
118714 +unix_bind_15668 unix_bind 3 15668 NULL
118715 +dm_read_15674 dm_read 3 15674 NULL nohasharray
118716 +SyS_connect_15674 SyS_connect 3 15674 &dm_read_15674
118717 +uinput_str_to_user_15695 uinput_str_to_user 3 15695 NULL
118718 +__sk_migrate_realloc_15709 __sk_migrate_realloc 3 15709 NULL
118719 +tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
118720 +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
118721 +smk_read_direct_15803 smk_read_direct 3 15803 NULL
118722 +gnttab_expand_15817 gnttab_expand 1 15817 NULL nohasharray
118723 +nameseq_list_15817 nameseq_list 3-0 15817 &gnttab_expand_15817
118724 +afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
118725 +table_size_15851 table_size 0-1-2 15851 NULL
118726 +write_file_tx99_15856 write_file_tx99 3 15856 NULL
118727 +media_entity_init_15870 media_entity_init 2-4 15870 NULL
118728 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
118729 +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
118730 +power_read_15939 power_read 3 15939 NULL
118731 +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
118732 +snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
118733 +memblock_virt_alloc_try_nid_15954 memblock_virt_alloc_try_nid 1 15954 NULL
118734 +smk_read_ptrace_15974 smk_read_ptrace 3 15974 NULL
118735 +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
118736 +dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
118737 +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
118738 +SYSC_kexec_file_load_16058 SYSC_kexec_file_load 3 16058 NULL
118739 +si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
118740 +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
118741 +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 NULL nohasharray
118742 +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 &isr_hw_pm_mode_changes_read_16110
118743 +udelay_test_write_16111 udelay_test_write 3 16111 NULL
118744 +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
118745 +fsm_init_16134 fsm_init 2 16134 NULL
118746 +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
118747 +optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
118748 +mapping_level_16188 mapping_level 2-0 16188 NULL
118749 +i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
118750 +ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
118751 +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
118752 +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
118753 +create_table_16213 create_table 2 16213 NULL
118754 +ath9k_hw_ar9287_dump_eeprom_16224 ath9k_hw_ar9287_dump_eeprom 5-4 16224 NULL
118755 +atomic_read_file_16227 atomic_read_file 3 16227 NULL
118756 +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
118757 +lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
118758 +i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL
118759 +il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
118760 +SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
118761 +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
118762 +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
118763 +nand_bch_init_16280 nand_bch_init 3-2 16280 NULL nohasharray
118764 +drbd_setsockopt_16280 drbd_setsockopt 5 16280 &nand_bch_init_16280
118765 +account_16283 account 0-4-2 16283 NULL nohasharray
118766 +mirror_status_16283 mirror_status 5 16283 &account_16283
118767 +jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
118768 +mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
118769 +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
118770 +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
118771 +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
118772 +kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
118773 +sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
118774 +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
118775 +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
118776 +nv50_pioc_create_16389 nv50_pioc_create 5 16389 NULL
118777 +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
118778 +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
118779 +__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
118780 +cmdline_store_16442 cmdline_store 4 16442 NULL
118781 +copy_from_user_bvec_16447 copy_from_user_bvec 0-4 16447 NULL
118782 +btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 4 16452 NULL
118783 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
118784 +req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
118785 +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
118786 +KEY_OFFSET_16504 KEY_OFFSET 0 16504 NULL
118787 +snd_interval_max_16529 snd_interval_max 0 16529 NULL
118788 +raid10_resize_16537 raid10_resize 2 16537 NULL
118789 +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
118790 +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
118791 +lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0-1 16589 NULL
118792 +compat_SyS_migrate_pages_16618 compat_SyS_migrate_pages 2 16618 NULL
118793 +rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
118794 +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
118795 +__wa_populate_dto_urb_16699 __wa_populate_dto_urb 3-4 16699 NULL
118796 +_iwl_dbgfs_bt_force_ant_write_16701 _iwl_dbgfs_bt_force_ant_write 3 16701 NULL
118797 +__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
118798 +__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
118799 +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
118800 +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
118801 +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
118802 +get_server_iovec_16804 get_server_iovec 2 16804 NULL
118803 +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
118804 +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
118805 +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
118806 +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
118807 +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
118808 +st_write_16874 st_write 3 16874 NULL
118809 +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
118810 +psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
118811 +snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
118812 +_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
118813 +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
118814 +svcxdr_dupstr_16963 svcxdr_dupstr 3 16963 NULL
118815 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
118816 +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
118817 +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
118818 +C_SYSC_keyctl_17041 C_SYSC_keyctl 4 17041 NULL
118819 +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
118820 +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
118821 +sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
118822 +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
118823 +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
118824 +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
118825 +entry_length_17093 entry_length 0 17093 NULL
118826 +write_mem_17114 write_mem 3 17114 NULL
118827 +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
118828 +do_blockdev_direct_IO_17143 do_blockdev_direct_IO 0-6 17143 NULL
118829 +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
118830 +jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
118831 +mxt_upload_cfg_mem_17157 mxt_upload_cfg_mem 4 17157 NULL
118832 +sep_read_17161 sep_read 3 17161 NULL
118833 +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
118834 +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
118835 +UniStrnlen_17169 UniStrnlen 0 17169 NULL
118836 +access_remote_vm_17189 access_remote_vm 0 17189 NULL nohasharray
118837 +iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
118838 +driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray
118839 +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194
118840 +sync_request_17208 sync_request 2 17208 NULL
118841 +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
118842 +lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
118843 +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
118844 +alloc_ep_17269 alloc_ep 1 17269 NULL
118845 +pg_read_17276 pg_read 3 17276 NULL
118846 +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
118847 +hmac_sha256_17278 hmac_sha256 2 17278 NULL
118848 +neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
118849 +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
118850 +__ptlrpc_request_bufs_pack_17298 __ptlrpc_request_bufs_pack 4 17298 NULL
118851 +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
118852 +mb_cache_create_17307 mb_cache_create 2 17307 NULL
118853 +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
118854 +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
118855 +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
118856 +mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
118857 +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
118858 +copy_from_iter_17433 copy_from_iter 2 17433 NULL
118859 +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
118860 +libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
118861 +nla_get_u32_17455 nla_get_u32 0 17455 NULL
118862 +__ref_totlen_17461 __ref_totlen 0 17461 NULL
118863 +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
118864 +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
118865 +copy_page_from_iter_17512 copy_page_from_iter 3-0 17512 NULL
118866 +reiserfs_direct_IO_17513 reiserfs_direct_IO 4 17513 NULL
118867 +lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
118868 +qp_free_res_17541 qp_free_res 5 17541 NULL
118869 +__copy_to_user_17551 __copy_to_user 0-3 17551 NULL
118870 +copy_from_user_17559 copy_from_user 3-0 17559 NULL
118871 +hash_netport4_expire_17573 hash_netport4_expire 4 17573 NULL
118872 +wil_write_file_rxon_17581 wil_write_file_rxon 3 17581 NULL
118873 +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
118874 +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
118875 +osst_execute_17607 osst_execute 7-6 17607 NULL
118876 +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
118877 +dma_map_page_17628 dma_map_page 0 17628 NULL
118878 +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
118879 +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
118880 +packet_setsockopt_17662 packet_setsockopt 5 17662 NULL
118881 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
118882 +venus_rename_17707 venus_rename 4-5 17707 NULL
118883 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
118884 +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
118885 +nv92_gpio_intr_mask_17773 nv92_gpio_intr_mask 4-3 17773 NULL
118886 +shrink_slab_node_17794 shrink_slab_node 3 17794 NULL
118887 +lpuart_copy_rx_to_tty_17801 lpuart_copy_rx_to_tty 3 17801 NULL
118888 +_iwl_dbgfs_set_nic_temperature_write_17804 _iwl_dbgfs_set_nic_temperature_write 3 17804 NULL
118889 +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
118890 +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
118891 +em28xx_audio_ep_packet_size_17844 em28xx_audio_ep_packet_size 0 17844 NULL
118892 +dm_stats_message_17863 dm_stats_message 5 17863 NULL
118893 +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
118894 +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
118895 +virtio_cread32_17873 virtio_cread32 0 17873 NULL
118896 +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
118897 +orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL nohasharray
118898 +i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
118899 +init_per_cpu_17880 init_per_cpu 1 17880 NULL
118900 +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
118901 +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
118902 +dev_pm_opp_get_opp_count_17911 dev_pm_opp_get_opp_count 0 17911 NULL
118903 +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
118904 +tipc_port_iovec_rcv_17921 tipc_port_iovec_rcv 3 17921 NULL
118905 +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
118906 +__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
118907 +beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
118908 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
118909 +ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
118910 +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
118911 +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
118912 +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
118913 +o2hb_highest_node_18034 o2hb_highest_node 0 18034 NULL
118914 +cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
118915 +__btrfs_drop_extents_18049 __btrfs_drop_extents 5 18049 NULL
118916 +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
118917 +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
118918 +fpregs_get_18066 fpregs_get 4 18066 NULL
118919 +kvm_read_guest_page_18074 kvm_read_guest_page 5 18074 NULL
118920 +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
118921 +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
118922 +mpi_alloc_18094 mpi_alloc 1 18094 NULL
118923 +dfs_file_read_18116 dfs_file_read 3 18116 NULL
118924 +svc_getnl_18120 svc_getnl 0 18120 NULL
118925 +paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
118926 +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
118927 +enable_ints_write_18170 enable_ints_write 3 18170 NULL
118928 +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
118929 +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
118930 +gsm_control_message_18209 gsm_control_message 4 18209 NULL
118931 +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
118932 +fill_ext_prop_18233 fill_ext_prop 0 18233 NULL
118933 +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
118934 +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
118935 +rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
118936 +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
118937 +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
118938 +alloc_ring_18278 alloc_ring 2-4 18278 NULL
118939 +bio_phys_segments_18281 bio_phys_segments 0 18281 NULL nohasharray
118940 +nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 &bio_phys_segments_18281
118941 +ext4_readpages_18283 ext4_readpages 4 18283 NULL
118942 +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
118943 +um_idi_write_18293 um_idi_write 3 18293 NULL
118944 +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
118945 +lustre_msg_hdr_size_18308 lustre_msg_hdr_size 2 18308 NULL
118946 +class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
118947 +csio_mem_read_18319 csio_mem_read 3 18319 NULL
118948 +alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
118949 +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
118950 +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
118951 +copy_page_to_iter_18345 copy_page_to_iter 0-3 18345 NULL
118952 +lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
118953 +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
118954 +SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL
118955 +ep_io_18367 ep_io 0 18367 NULL
118956 +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
118957 +__ceph_getxattr_18386 __ceph_getxattr 0 18386 NULL
118958 +ci_role_write_18388 ci_role_write 3 18388 NULL
118959 +hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
118960 +adis16136_show_serial_18402 adis16136_show_serial 3 18402 NULL
118961 +nvif_device_init_18418 nvif_device_init 6 18418 NULL
118962 +memblock_virt_alloc_node_nopanic_18431 memblock_virt_alloc_node_nopanic 1 18431 NULL
118963 +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 NULL
118964 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
118965 +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
118966 +regset_tls_set_18459 regset_tls_set 4 18459 NULL
118967 +pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
118968 +mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
118969 +udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
118970 +btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL
118971 +__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
118972 +snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
118973 +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
118974 +nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
118975 +tipc_send2port_18531 tipc_send2port 4 18531 NULL
118976 +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
118977 +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
118978 +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
118979 +debug_output_18575 debug_output 3 18575 NULL
118980 +filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
118981 +slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
118982 +iowarrior_write_18604 iowarrior_write 3 18604 NULL
118983 +from_buffer_18625 from_buffer 3 18625 NULL
118984 +kmalloc_kernel_18641 kmalloc_kernel 1 18641 NULL
118985 +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
118986 +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
118987 +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
118988 +fnic_stats_debugfs_read_18688 fnic_stats_debugfs_read 3 18688 NULL
118989 +echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
118990 +iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
118991 +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
118992 +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
118993 +nfs4_init_callback_netid_18717 nfs4_init_callback_netid 3 18717 NULL
118994 +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
118995 +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
118996 +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
118997 +wep_packets_read_18751 wep_packets_read 3 18751 NULL
118998 +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
118999 +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
119000 +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
119001 +fence_context_alloc_18792 fence_context_alloc 1 18792 NULL
119002 +dm_stats_print_18815 dm_stats_print 7 18815 NULL
119003 +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
119004 +mtf_test_write_18844 mtf_test_write 3 18844 NULL
119005 +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
119006 +ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
119007 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
119008 +devm_mdiobus_alloc_size_18902 devm_mdiobus_alloc_size 2 18902 NULL
119009 +tracing_thresh_write_18909 tracing_thresh_write 3 18909 NULL
119010 +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
119011 +xfs_buf_read_uncached_18922 xfs_buf_read_uncached 3 18922 NULL
119012 +ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
119013 +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
119014 +__nla_reserve_18974 __nla_reserve 3 18974 NULL
119015 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
119016 +huge_page_size_19008 huge_page_size 0 19008 NULL
119017 +hash_netport6_expire_19013 hash_netport6_expire 4 19013 NULL
119018 +sysfs_create_dir_ns_19033 sysfs_create_dir_ns 0 19033 NULL
119019 +revalidate_19043 revalidate 2 19043 NULL
119020 +afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
119021 +osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
119022 +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
119023 +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
119024 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
119025 +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
119026 +skb_gro_offset_19123 skb_gro_offset 0 19123 NULL
119027 +cma_bitmap_maxno_19135 cma_bitmap_maxno 0 19135 NULL
119028 +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
119029 +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
119030 +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
119031 +smk_write_access2_19170 smk_write_access2 3 19170 NULL
119032 +read_extent_buffer_to_user_19189 read_extent_buffer_to_user 4-3 19189 NULL
119033 +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
119034 +__copy_to_user_inatomic_19214 __copy_to_user_inatomic 0-3 19214 NULL
119035 +dev_counters_read_19216 dev_counters_read 3 19216 NULL
119036 +wbcir_tx_19219 wbcir_tx 3 19219 NULL
119037 +snd_mask_max_19224 snd_mask_max 0 19224 NULL
119038 +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
119039 +ucma_query_19260 ucma_query 4 19260 NULL
119040 +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
119041 +batadv_tt_save_orig_buffer_19288 batadv_tt_save_orig_buffer 4 19288 NULL nohasharray
119042 +cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 &batadv_tt_save_orig_buffer_19288
119043 +qc_capture_19298 qc_capture 3 19298 NULL
119044 +ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL
119045 +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
119046 +debug_read_19322 debug_read 3 19322 NULL
119047 +lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 NULL nohasharray
119048 +cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 &lbs_host_sleep_write_19332
119049 +closure_sub_19359 closure_sub 2 19359 NULL
119050 +firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
119051 +read_zero_19366 read_zero 3 19366 NULL
119052 +interpret_user_input_19393 interpret_user_input 2 19393 NULL
119053 +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
119054 +pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
119055 +hid_hw_raw_request_19408 hid_hw_raw_request 0 19408 NULL
119056 +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
119057 +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
119058 +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
119059 +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
119060 +gp2ap020a00f_get_thresh_reg_19468 gp2ap020a00f_get_thresh_reg 0 19468 NULL
119061 +sky2_read16_19475 sky2_read16 0 19475 NULL
119062 +__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL
119063 +kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
119064 +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
119065 +batadv_tvlv_container_register_19520 batadv_tvlv_container_register 5 19520 NULL
119066 +ttm_dma_page_pool_free_19527 ttm_dma_page_pool_free 2-0 19527 NULL
119067 +cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL
119068 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
119069 +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
119070 +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
119071 +nfsd_read_19568 nfsd_read 5 19568 NULL
119072 +ieee80211_key_alloc_19575 ieee80211_key_alloc 3 19575 NULL
119073 +bm_status_read_19583 bm_status_read 3 19583 NULL
119074 +load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
119075 +drbg_sec_strength_19604 drbg_sec_strength 0 19604 NULL
119076 +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
119077 +parser_init_19651 parser_init 2 19651 NULL
119078 +LoadBitmap_19658 LoadBitmap 2 19658 NULL
119079 +memblock_virt_alloc_low_nopanic_19714 memblock_virt_alloc_low_nopanic 1 19714 NULL
119080 +read_reg_19723 read_reg 0 19723 NULL
119081 +wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
119082 +memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
119083 +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
119084 +p9_client_read_19750 p9_client_read 5-0 19750 NULL
119085 +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
119086 +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
119087 +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
119088 +readhscx_19769 readhscx 0 19769 NULL
119089 +ath10k_write_htt_max_amsdu_ampdu_19820 ath10k_write_htt_max_amsdu_ampdu 3 19820 NULL
119090 +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
119091 +vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
119092 +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
119093 +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
119094 +__nla_put_19857 __nla_put 3 19857 NULL
119095 +mrp_request_join_19882 mrp_request_join 4 19882 NULL
119096 +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
119097 +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
119098 +mangle_name_19923 mangle_name 0 19923 NULL
119099 +tipc_sk_show_19928 tipc_sk_show 3-0 19928 NULL
119100 +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
119101 +guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
119102 +azx_get_pos_lpib_19933 azx_get_pos_lpib 0 19933 NULL
119103 +v4l2_ctrl_new_19942 v4l2_ctrl_new 8-12 19942 NULL
119104 +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
119105 +cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
119106 +ll_xattr_cache_list_19954 ll_xattr_cache_list 0 19954 NULL
119107 +get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
119108 +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
119109 +rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL nohasharray
119110 +i40e_reserve_msix_vectors_19989 i40e_reserve_msix_vectors 2 19989 &rtw_set_wps_probe_resp_19989
119111 +lustre_pack_request_19992 lustre_pack_request 3 19992 NULL
119112 +find_overflow_devnum_19995 find_overflow_devnum 0 19995 NULL
119113 +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
119114 +lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL nohasharray
119115 +event_trigger_write_20009 event_trigger_write 3 20009 &lov_stripe_md_size_20009
119116 +tree_mod_log_eb_move_20011 tree_mod_log_eb_move 5 20011 NULL
119117 +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
119118 +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
119119 +iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 0-4 20067 NULL
119120 +target_message_20072 target_message 2 20072 NULL
119121 +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
119122 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
119123 +aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
119124 +team_options_register_20091 team_options_register 3 20091 NULL
119125 +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
119126 +root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
119127 +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
119128 +ext4_ext_direct_IO_20165 ext4_ext_direct_IO 4 20165 NULL
119129 +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
119130 +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
119131 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
119132 +crystalhd_map_dio_20181 crystalhd_map_dio 3 20181 NULL
119133 +pvr2_ctrl_value_to_sym_20229 pvr2_ctrl_value_to_sym 5 20229 NULL
119134 +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
119135 +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
119136 +btrfs_header_nritems_20296 btrfs_header_nritems 0 20296 NULL
119137 +r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
119138 +dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
119139 +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
119140 +vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
119141 +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
119142 +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
119143 +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
119144 +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
119145 +snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL
119146 +SyS_get_mempolicy_20399 SyS_get_mempolicy 3 20399 NULL nohasharray
119147 +__kfifo_from_user_20399 __kfifo_from_user 3 20399 &SyS_get_mempolicy_20399
119148 +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
119149 +read_buf_20469 read_buf 2 20469 NULL
119150 +bio_trim_20472 bio_trim 2 20472 NULL
119151 +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
119152 +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
119153 +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
119154 +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
119155 +scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
119156 +venus_create_20555 venus_create 4 20555 NULL
119157 +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
119158 +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
119159 +kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
119160 +set_secure_conn_20596 set_secure_conn 4 20596 NULL
119161 +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
119162 +lirc_write_20604 lirc_write 3 20604 NULL
119163 +qib_qsfp_write_20614 qib_qsfp_write 0-4-2 20614 NULL
119164 +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
119165 +get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
119166 +kfifo_copy_to_user_20646 kfifo_copy_to_user 3-4 20646 NULL
119167 +cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
119168 +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
119169 +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
119170 +snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL
119171 +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 NULL
119172 +cpumask_size_20683 cpumask_size 0 20683 NULL
119173 +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
119174 +xpcs_reg_addr_write_20694 xpcs_reg_addr_write 3 20694 NULL
119175 +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
119176 +__maestro_read_20700 __maestro_read 0 20700 NULL
119177 +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
119178 +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
119179 +hfs_direct_IO_20714 hfs_direct_IO 4 20714 NULL
119180 +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
119181 +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
119182 +fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
119183 +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
119184 +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
119185 +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL
119186 +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
119187 +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
119188 +edid_write_20797 edid_write 3 20797 NULL
119189 +lowpan_write_20800 lowpan_write 3 20800 NULL
119190 +strndup_user_20819 strndup_user 2 20819 NULL
119191 +tipc_msg_build_20825 tipc_msg_build 3 20825 NULL
119192 +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
119193 +uvc_alloc_entity_20836 uvc_alloc_entity 4-3 20836 NULL
119194 +p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
119195 +nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
119196 +get_name_20855 get_name 4 20855 NULL
119197 +iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
119198 +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
119199 +srq_free_res_20868 srq_free_res 5 20868 NULL
119200 +cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
119201 +req_capsule_filled_sizes_20888 req_capsule_filled_sizes 0 20888 NULL
119202 +rb_simple_write_20890 rb_simple_write 3 20890 NULL
119203 +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
119204 +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
119205 +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
119206 +lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
119207 +htable_bits_20933 htable_bits 0 20933 NULL
119208 +cfg80211_rx_assoc_resp_20934 cfg80211_rx_assoc_resp 4 20934 NULL
119209 +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
119210 +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
119211 +rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
119212 +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
119213 +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
119214 +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
119215 +qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
119216 +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
119217 +arch_gnttab_init_21030 arch_gnttab_init 1 21030 NULL
119218 +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
119219 +srp_change_queue_depth_21038 srp_change_queue_depth 2 21038 NULL
119220 +fsl_edma_prep_dma_cyclic_21042 fsl_edma_prep_dma_cyclic 4-3 21042 NULL
119221 +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
119222 +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
119223 +qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
119224 +event_calibration_read_21083 event_calibration_read 3 21083 NULL
119225 +bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
119226 +multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
119227 +rate_control_pid_events_read_21099 rate_control_pid_events_read 3 21099 NULL
119228 +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
119229 +_efx_mcdi_rpc_async_21119 _efx_mcdi_rpc_async 4-5 21119 NULL
119230 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
119231 +mei_dbgfs_read_active_21172 mei_dbgfs_read_active 3 21172 NULL
119232 +bioset_create_nobvec_21180 bioset_create_nobvec 1 21180 NULL
119233 +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
119234 +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
119235 +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
119236 +get_numpages_21227 get_numpages 0-1-2 21227 NULL
119237 +input_ff_create_21240 input_ff_create 2 21240 NULL
119238 +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
119239 +fru_length_21257 fru_length 0 21257 NULL
119240 +rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
119241 +ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL
119242 +drm_universal_plane_init_21296 drm_universal_plane_init 6 21296 NULL
119243 +do_msg_fill_21307 do_msg_fill 3 21307 NULL
119244 +add_res_range_21310 add_res_range 4 21310 NULL
119245 +get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
119246 +ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
119247 +read_file_bool_bmps_21344 read_file_bool_bmps 3 21344 NULL
119248 +azx_get_delay_from_lpib_21348 azx_get_delay_from_lpib 3 21348 NULL
119249 +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
119250 +allocate_cmdlines_buffer_21355 allocate_cmdlines_buffer 1 21355 NULL
119251 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
119252 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
119253 +video_ioctl2_21380 video_ioctl2 2 21380 NULL
119254 +insert_ptr_21386 insert_ptr 6 21386 NULL
119255 +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
119256 +snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
119257 +usnic_ib_dump_vf_hdr_21423 usnic_ib_dump_vf_hdr 3 21423 NULL
119258 +snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
119259 +tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
119260 +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
119261 +nouveau_clock_create__21449 nouveau_clock_create_ 8 21449 NULL
119262 +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
119263 +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
119264 +read_file_xmit_21487 read_file_xmit 3 21487 NULL
119265 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
119266 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
119267 +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
119268 +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
119269 +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
119270 +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
119271 +snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
119272 +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
119273 +filemap_get_page_21606 filemap_get_page 2 21606 NULL
119274 +ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL
119275 +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
119276 +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
119277 +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
119278 +regmap_register_patch_21681 regmap_register_patch 3 21681 NULL
119279 +rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL nohasharray
119280 +proc_maps_open_21687 proc_maps_open 4 21687 &rtllib_alloc_txb_21687
119281 +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
119282 +unix_skb_len_21722 unix_skb_len 0 21722 NULL
119283 +lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
119284 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
119285 +usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
119286 +gen_pool_add_21776 gen_pool_add 3 21776 NULL
119287 +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
119288 +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
119289 +_iwl_dbgfs_sta_drain_write_21837 _iwl_dbgfs_sta_drain_write 3 21837 NULL
119290 +oom_adj_read_21847 oom_adj_read 3 21847 NULL
119291 +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
119292 +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
119293 +msix_capability_init_21870 msix_capability_init 0 21870 NULL
119294 +sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
119295 +ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
119296 +__btrfs_direct_write_21894 __btrfs_direct_write 3 21894 NULL
119297 +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL nohasharray
119298 +nvme_submit_sync_cmd_21911 nvme_submit_sync_cmd 0 21911 &dbAllocCtl_21911
119299 +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
119300 +twl_i2c_write_u16_21953 twl_i2c_write_u16 3 21953 NULL
119301 +__build_xattrs_21979 __build_xattrs 0 21979 NULL
119302 +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
119303 +compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 0-3 22001 NULL nohasharray
119304 +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
119305 +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
119306 +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
119307 +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
119308 +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
119309 +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
119310 +btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
119311 +mem_rw_22085 mem_rw 3 22085 NULL
119312 +kstrtos32_from_user_22087 kstrtos32_from_user 2 22087 NULL
119313 +rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
119314 +snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
119315 +SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
119316 +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
119317 +nve0_aux_mask_22158 nve0_aux_mask 2 22158 NULL
119318 +__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL
119319 +rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL
119320 +mem_write_22232 mem_write 3 22232 NULL
119321 +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
119322 +prepare_to_wait_event_22247 prepare_to_wait_event 0 22247 NULL
119323 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
119324 +ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
119325 +add_res_tree_22263 add_res_tree 7 22263 NULL
119326 +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
119327 +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 NULL nohasharray
119328 +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 &__tun_chr_ioctl_22300
119329 +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
119330 +lov_setstripe_22307 lov_setstripe 2 22307 NULL
119331 +udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
119332 +C_SYSC_msgrcv_22320 C_SYSC_msgrcv 3 22320 NULL
119333 +atomic_read_22342 atomic_read 0 22342 NULL
119334 +ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
119335 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
119336 +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
119337 +alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL
119338 +zoran_write_22404 zoran_write 3 22404 NULL
119339 +queue_reply_22416 queue_reply 3 22416 NULL
119340 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
119341 +queue_max_segments_22441 queue_max_segments 0 22441 NULL
119342 +handle_received_packet_22457 handle_received_packet 3 22457 NULL
119343 +ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
119344 +qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL nohasharray
119345 +video_write_22490 video_write 3 22490 &qib_user_sdma_alloc_header_22490
119346 +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
119347 +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
119348 +trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
119349 +ntb_setup_bwd_msix_22549 ntb_setup_bwd_msix 2 22549 NULL
119350 +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
119351 +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
119352 +dbFindCtl_22587 dbFindCtl 0 22587 NULL
119353 +cfs_expr_list_values_22600 cfs_expr_list_values 0 22600 NULL
119354 +snapshot_read_22601 snapshot_read 3 22601 NULL
119355 +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
119356 +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
119357 +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
119358 +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
119359 +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
119360 +compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL
119361 +l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 NULL
119362 +bch_dump_read_22685 bch_dump_read 3 22685 NULL
119363 +reg_umr_22686 reg_umr 5 22686 NULL
119364 +SYSC_vmsplice_22697 SYSC_vmsplice 3 22697 NULL
119365 +nr_cpusets_22705 nr_cpusets 0 22705 NULL
119366 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
119367 +cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
119368 +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
119369 +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
119370 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
119371 +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
119372 +print_frame_22769 print_frame 0 22769 NULL
119373 +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
119374 +vnic_dev_get_res_count_22791 vnic_dev_get_res_count 0 22791 NULL
119375 +__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
119376 +create_attr_set_22861 create_attr_set 1 22861 NULL
119377 +hash_ip6_expire_22867 hash_ip6_expire 4 22867 NULL
119378 +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
119379 +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
119380 +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
119381 +ion_handle_test_kernel_22900 ion_handle_test_kernel 4-3 22900 NULL nohasharray
119382 +policy_emit_config_values_22900 policy_emit_config_values 3 22900 &ion_handle_test_kernel_22900
119383 +nfs4_acl_bytes_22915 nfs4_acl_bytes 0-1 22915 NULL
119384 +__set_xattr_22923 __set_xattr 0 22923 NULL
119385 +xstateregs_set_22932 xstateregs_set 4 22932 NULL
119386 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
119387 +alloc_sglist_22960 alloc_sglist 2-3 22960 NULL
119388 +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
119389 +vme_get_size_22964 vme_get_size 0 22964 NULL
119390 +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
119391 +cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
119392 +usb_get_langid_22983 usb_get_langid 0 22983 NULL
119393 +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
119394 +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
119395 +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
119396 +ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 6-7 23029 NULL
119397 +st_status_23032 st_status 5 23032 NULL
119398 +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
119399 +comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
119400 +reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
119401 +unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
119402 +mei_cl_send_23068 mei_cl_send 3 23068 NULL
119403 +kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL
119404 +raw_sendmsg_23078 raw_sendmsg 4 23078 NULL
119405 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
119406 +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
119407 +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
119408 +ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
119409 +dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
119410 +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
119411 +bset_tree_bytes_23111 bset_tree_bytes 0 23111 NULL nohasharray
119412 +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 &bset_tree_bytes_23111
119413 +__clear_user_23118 __clear_user 0-2 23118 NULL
119414 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
119415 +ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
119416 +read_file_ani_23161 read_file_ani 3 23161 NULL
119417 +usblp_write_23178 usblp_write 3 23178 NULL
119418 +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
119419 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
119420 +tipc_sendmcast_23214 tipc_sendmcast 4 23214 NULL
119421 +mcryptd_alloc_instance_23221 mcryptd_alloc_instance 2-3 23221 NULL
119422 +nft_hash_tbl_alloc_23224 nft_hash_tbl_alloc 1 23224 NULL
119423 +tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
119424 +xlog_get_bp_23229 xlog_get_bp 2 23229 NULL nohasharray
119425 +__read_status_pci_23229 __read_status_pci 0 23229 &xlog_get_bp_23229
119426 +ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
119427 +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
119428 +__gfn_to_rmap_23240 __gfn_to_rmap 1-2 23240 NULL
119429 +nv50_ram_create__23241 nv50_ram_create_ 4 23241 NULL
119430 +sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
119431 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
119432 +ec_i2c_count_message_23285 ec_i2c_count_message 0-2 23285 NULL
119433 +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
119434 +i2cdev_write_23310 i2cdev_write 3 23310 NULL
119435 +__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
119436 +page_readlink_23346 page_readlink 3 23346 NULL
119437 +kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
119438 +get_dst_timing_23358 get_dst_timing 0 23358 NULL
119439 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
119440 +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
119441 +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
119442 +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
119443 +__ata_change_queue_depth_23484 __ata_change_queue_depth 3 23484 NULL
119444 +linear_conf_23485 linear_conf 2 23485 NULL
119445 +event_filter_read_23494 event_filter_read 3 23494 NULL
119446 +lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
119447 +devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
119448 +__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
119449 +hash_ipmark6_expire_23518 hash_ipmark6_expire 4 23518 NULL
119450 +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
119451 +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
119452 +btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
119453 +venus_symlink_23570 venus_symlink 6-4 23570 NULL
119454 +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
119455 +xfpregs_get_23586 xfpregs_get 4 23586 NULL
119456 +snd_interval_min_23590 snd_interval_min 0 23590 NULL
119457 +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
119458 +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
119459 +sInW_23663 sInW 0 23663 NULL
119460 +SyS_connect_23669 SyS_connect 3 23669 NULL
119461 +cx18_read_23699 cx18_read 3 23699 NULL
119462 +at_get_23708 at_get 0 23708 NULL
119463 +get_conn_info_23723 get_conn_info 4 23723 NULL
119464 +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
119465 +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
119466 +__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
119467 +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
119468 +cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
119469 +mpt_free_res_23793 mpt_free_res 5 23793 NULL
119470 +map_write_23795 map_write 3 23795 NULL
119471 +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
119472 +__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
119473 +lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
119474 +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
119475 +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
119476 +p54_init_common_23850 p54_init_common 1 23850 NULL
119477 +bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
119478 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
119479 +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
119480 +tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
119481 +iov_iter_get_pages_alloc_23903 iov_iter_get_pages_alloc 3-0 23903 NULL
119482 +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
119483 +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
119484 +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
119485 +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
119486 +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
119487 +kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
119488 +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
119489 +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
119490 +size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
119491 +sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
119492 +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
119493 +xfs_zero_file_space_24000 xfs_zero_file_space 2-3 24000 NULL
119494 +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
119495 +give_pages_24021 give_pages 3 24021 NULL
119496 +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
119497 +hmac_setkey_24043 hmac_setkey 3 24043 NULL
119498 +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
119499 +iwl_dbgfs_low_latency_read_24062 iwl_dbgfs_low_latency_read 3 24062 NULL
119500 +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
119501 +C_SYSC_process_vm_writev_24102 C_SYSC_process_vm_writev 3-5 24102 NULL
119502 +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
119503 +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
119504 +lov_brw_24122 lov_brw 4 24122 NULL
119505 +mpu401_read_24126 mpu401_read 3 24126 NULL
119506 +_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
119507 +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
119508 +SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
119509 +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
119510 +adu_read_24177 adu_read 3 24177 NULL
119511 +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
119512 +nv94_aux_24197 nv94_aux 3-6 24197 NULL
119513 +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
119514 +efx_vf_size_24213 efx_vf_size 0 24213 NULL
119515 +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
119516 +pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
119517 +mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
119518 +pci_num_vf_24235 pci_num_vf 0 24235 NULL
119519 +sel_read_bool_24236 sel_read_bool 3 24236 NULL
119520 +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
119521 +calculate_sizes_24273 calculate_sizes 2 24273 NULL
119522 +thin_status_24278 thin_status 5 24278 NULL
119523 +msg_size_24288 msg_size 0 24288 NULL
119524 +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
119525 +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
119526 +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
119527 +C_SYSC_pwritev_24345 C_SYSC_pwritev 3 24345 NULL
119528 +kzalloc_node_24352 kzalloc_node 1 24352 NULL
119529 +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
119530 +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
119531 +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
119532 +igetword_24373 igetword 0 24373 NULL
119533 +mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
119534 +osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
119535 +getxattr_24398 getxattr 4 24398 NULL nohasharray
119536 +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 &getxattr_24398
119537 +populate_msi_sysfs_24399 populate_msi_sysfs 0 24399 NULL
119538 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
119539 +nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
119540 +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
119541 +xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
119542 +ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
119543 +copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
119544 +ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL
119545 +smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray
119546 +rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440
119547 +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
119548 +lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
119549 +skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL
119550 +dut_mode_read_24489 dut_mode_read 3 24489 NULL
119551 +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
119552 +pd_video_read_24510 pd_video_read 3 24510 NULL
119553 +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
119554 +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
119555 +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
119556 +write_cache_pages_24562 write_cache_pages 0 24562 NULL
119557 +SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
119558 +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
119559 +sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
119560 +lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605 nohasharray
119561 +i915_error_state_buf_init_24605 i915_error_state_buf_init 3 24605 &lov_alloc_memmd_24605
119562 +SyS_poll_24620 SyS_poll 2 24620 NULL
119563 +context_alloc_24645 context_alloc 3 24645 NULL
119564 +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
119565 +datafab_write_data_24696 datafab_write_data 4 24696 NULL
119566 +intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
119567 +simple_attr_read_24738 simple_attr_read 3 24738 NULL
119568 +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
119569 +get_dma_residue_24749 get_dma_residue 0 24749 NULL
119570 +ocfs2_cow_file_pos_24751 ocfs2_cow_file_pos 3 24751 NULL
119571 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
119572 +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
119573 +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
119574 +cache_read_24790 cache_read 3 24790 NULL
119575 +user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
119576 +kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
119577 +ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
119578 +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
119579 +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
119580 +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
119581 +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
119582 +queues_read_24877 queues_read 3 24877 NULL
119583 +iov_iter_npages_bvec_24905 iov_iter_npages_bvec 0-2 24905 NULL
119584 +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
119585 +xpcs_reg_value_write_24922 xpcs_reg_value_write 3 24922 NULL
119586 +v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL
119587 +ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
119588 +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
119589 +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
119590 +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL nohasharray
119591 +ath10k_fw_crash_dump_read_24987 ath10k_fw_crash_dump_read 3 24987 &llc_ui_sendmsg_24987
119592 +info_debugfs_read_helper_24988 info_debugfs_read_helper 0 24988 NULL
119593 +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
119594 +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
119595 +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
119596 +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
119597 +load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL
119598 +btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
119599 +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
119600 +ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
119601 +do_add_page_to_bio_25071 do_add_page_to_bio 2 25071 NULL
119602 +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
119603 +ima_appraise_measurement_25093 ima_appraise_measurement 6 25093 NULL
119604 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
119605 +ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
119606 +kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
119607 +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
119608 +security_socket_post_create_25221 security_socket_post_create 0 25221 NULL
119609 +mon_stat_read_25238 mon_stat_read 3 25238 NULL
119610 +stripe_status_25259 stripe_status 5 25259 NULL
119611 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
119612 +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
119613 +vfs_writev_25278 vfs_writev 3 25278 NULL
119614 +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
119615 +cx25821_write_frame_25315 cx25821_write_frame 3 25315 NULL
119616 +ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
119617 +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
119618 +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
119619 +unix_mkname_25368 unix_mkname 0-2 25368 NULL
119620 +sel_read_mls_25369 sel_read_mls 3 25369 NULL
119621 +vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
119622 +mcp795_rtcc_read_25415 mcp795_rtcc_read 4 25415 NULL
119623 +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
119624 +ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
119625 +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
119626 +ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
119627 +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
119628 +mxt_obj_size_25510 mxt_obj_size 0 25510 NULL
119629 +sb_permission_25523 sb_permission 0 25523 NULL
119630 +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
119631 +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
119632 +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
119633 +ht_print_chan_25556 ht_print_chan 0-3-4 25556 NULL
119634 +skb_tailroom_25567 skb_tailroom 0 25567 NULL
119635 +ping_recvmsg_25597 ping_recvmsg 4 25597 NULL
119636 +copy_user_generic_25611 copy_user_generic 0 25611 NULL
119637 +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
119638 +befs_utf2nls_25628 befs_utf2nls 3 25628 NULL nohasharray
119639 +__get_user_pages_25628 __get_user_pages 0 25628 &befs_utf2nls_25628
119640 +__direct_map_25647 __direct_map 6-5 25647 NULL
119641 +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
119642 +lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
119643 +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
119644 +prom_early_alloc_25692 prom_early_alloc 1 25692 NULL
119645 +rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
119646 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
119647 +__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 NULL nohasharray
119648 +sel_write_context_25726 sel_write_context 3 25726 &__alloc_bootmem_low_node_25726
119649 +xgbe_common_read_25743 xgbe_common_read 2 25743 NULL
119650 +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
119651 +event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
119652 +sg_read_25799 sg_read 3 25799 NULL
119653 +system_enable_read_25815 system_enable_read 3 25815 NULL
119654 +realloc_buffer_25816 realloc_buffer 2 25816 NULL
119655 +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
119656 +parport_read_25855 parport_read 0 25855 NULL
119657 +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
119658 +key_attr_size_25865 key_attr_size 0 25865 NULL
119659 +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
119660 +run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
119661 +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
119662 +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
119663 +nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
119664 +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
119665 +rcname_read_25919 rcname_read 3 25919 NULL
119666 +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
119667 +key_flags_read_25931 key_flags_read 3 25931 NULL
119668 +copy_play_buf_25932 copy_play_buf 3 25932 NULL
119669 +flush_25957 flush 2 25957 NULL
119670 +_regmap_multi_reg_write_25967 _regmap_multi_reg_write 3 25967 NULL
119671 +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
119672 +lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
119673 +SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
119674 +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
119675 +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
119676 +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
119677 +pri_wm_latency_write_26063 pri_wm_latency_write 3 26063 NULL
119678 +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
119679 +i8042_pnp_id_to_string_26108 i8042_pnp_id_to_string 3 26108 NULL
119680 +read_sb_page_26119 read_sb_page 5 26119 NULL
119681 +ath9k_hw_name_26146 ath9k_hw_name 3 26146 NULL
119682 +copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
119683 +gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
119684 +ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
119685 +disk_devt_26180 disk_devt 0 26180 NULL
119686 +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
119687 +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
119688 +mce_write_26201 mce_write 3 26201 NULL
119689 +mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
119690 +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
119691 +rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
119692 +nlm_end_grace_read_26234 nlm_end_grace_read 3 26234 NULL
119693 +genwqe_ffdc_buff_size_26263 genwqe_ffdc_buff_size 0 26263 NULL
119694 +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
119695 +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
119696 +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL
119697 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
119698 +check_can_nocow_26336 check_can_nocow 2 26336 NULL
119699 +snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
119700 +ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 6-3 26357 NULL
119701 +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
119702 +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
119703 +ntty_write_26404 ntty_write 3 26404 NULL
119704 +firmware_store_26408 firmware_store 4 26408 NULL
119705 +pagemap_read_26441 pagemap_read 3 26441 NULL
119706 +tower_read_26461 tower_read 3 26461 NULL nohasharray
119707 +enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461
119708 +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
119709 +ulong_write_file_26485 ulong_write_file 3 26485 NULL
119710 +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL nohasharray
119711 +msi_verify_entries_26490 msi_verify_entries 0 26490 &dvb_ca_en50221_io_ioctl_26490
119712 +read_vmcore_26501 read_vmcore 3 26501 NULL
119713 +uhid_char_write_26502 uhid_char_write 3 26502 NULL
119714 +vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
119715 +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
119716 +alloc_ep_req_26521 alloc_ep_req 3-2 26521 NULL
119717 +SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
119718 +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
119719 +dio_new_bio_26562 dio_new_bio 0 26562 NULL
119720 +rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
119721 +kernfs_name_locked_26617 kernfs_name_locked 3 26617 NULL
119722 +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
119723 +amdtp_stream_get_max_payload_26645 amdtp_stream_get_max_payload 0 26645 NULL
119724 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL
119725 +nouveau_volt_create__26654 nouveau_volt_create_ 4 26654 NULL
119726 +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
119727 +flowinfo_read_26683 flowinfo_read 3 26683 NULL
119728 +sysfs_add_file_26716 sysfs_add_file 0 26716 NULL
119729 +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
119730 +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
119731 +bos_desc_26752 bos_desc 0 26752 NULL
119732 +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
119733 +dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
119734 +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
119735 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
119736 +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
119737 +smk_write_load_26829 smk_write_load 3 26829 NULL
119738 +snd_pcm_action_mutex_26832 snd_pcm_action_mutex 0 26832 NULL
119739 +scnprint_id_26842 scnprint_id 3-0 26842 NULL
119740 +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
119741 +ss_alloc_ep_req_26848 ss_alloc_ep_req 2 26848 NULL
119742 +tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
119743 +ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
119744 +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
119745 +skb_zerocopy_headlen_26910 skb_zerocopy_headlen 0 26910 NULL
119746 +hhf_zalloc_26912 hhf_zalloc 1 26912 NULL
119747 +cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
119748 +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
119749 +brcmf_usb_dl_cmd_26931 brcmf_usb_dl_cmd 4 26931 NULL
119750 +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
119751 +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 NULL nohasharray
119752 +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 &sctp_setsockopt_adaptation_layer_26935
119753 +hecubafb_write_26942 hecubafb_write 3 26942 NULL
119754 +do_trimming_26952 do_trimming 3 26952 NULL nohasharray
119755 +extract_entropy_user_26952 extract_entropy_user 3 26952 &do_trimming_26952
119756 +do_direct_IO_26979 do_direct_IO 0 26979 NULL
119757 +lustre_msg_size_26995 lustre_msg_size 2 26995 NULL
119758 +sc16is7xx_port_read_27051 sc16is7xx_port_read 0 27051 NULL
119759 +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
119760 +ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3 27064 NULL
119761 +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
119762 +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
119763 +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
119764 +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL nohasharray
119765 +ath9k_hw_4k_dump_eeprom_27089 ath9k_hw_4k_dump_eeprom 5-4 27089 &btmrvl_hscmd_write_27089
119766 +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
119767 +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
119768 +pms_capture_27142 pms_capture 4 27142 NULL
119769 +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
119770 +wil_write_file_wmi_27150 wil_write_file_wmi 3 27150 NULL
119771 +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
119772 +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
119773 +write_kmem_27225 write_kmem 3 27225 NULL nohasharray
119774 +svcxdr_tmpalloc_27225 svcxdr_tmpalloc 2 27225 &write_kmem_27225
119775 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
119776 +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
119777 +ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
119778 +comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
119779 +get_rx_fifo_content_27283 get_rx_fifo_content 0 27283 NULL
119780 +copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
119781 +virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
119782 +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
119783 +afs_cell_create_27346 afs_cell_create 2 27346 NULL
119784 +iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
119785 +pcbit_stat_27364 pcbit_stat 2 27364 NULL
119786 +seq_read_27411 seq_read 3 27411 NULL
119787 +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
119788 +ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
119789 +ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 3-4 27422 NULL
119790 +cypress_write_27423 cypress_write 4 27423 NULL
119791 +sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
119792 +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
119793 +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
119794 +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
119795 +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
119796 +garmin_read_process_27509 garmin_read_process 3 27509 NULL nohasharray
119797 +mcryptd_hash_setkey_27509 mcryptd_hash_setkey 3 27509 &garmin_read_process_27509
119798 +oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
119799 +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
119800 +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
119801 +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
119802 +sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
119803 +libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
119804 +C_SYSC_mbind_27636 C_SYSC_mbind 5 27636 NULL
119805 +ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 NULL nohasharray
119806 +read_flush_procfs_27642 read_flush_procfs 3 27642 &ocfs2_xattr_ibody_get_27642 nohasharray
119807 +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642
119808 +add_new_gdb_27643 add_new_gdb 3 27643 NULL
119809 +btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
119810 +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
119811 +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
119812 +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
119813 +fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL
119814 +evm_write_key_27715 evm_write_key 3 27715 NULL
119815 +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
119816 +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
119817 +load_scode_27738 load_scode 2 27738 NULL
119818 +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
119819 +transport_init_session_tags_27776 transport_init_session_tags 1-2 27776 NULL
119820 +__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
119821 +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
119822 +SyS_readv_27804 SyS_readv 3 27804 NULL
119823 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
119824 +hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
119825 +init_header_complete_27833 init_header_complete 0 27833 NULL
119826 +read_profile_27859 read_profile 3 27859 NULL
119827 +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
119828 +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
119829 +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
119830 +i915_error_object_create_sized_27919 i915_error_object_create_sized 4 27919 NULL
119831 +check_mapped_name_27943 check_mapped_name 3 27943 NULL
119832 +bio_next_split_27961 bio_next_split 2 27961 NULL nohasharray
119833 +tracing_clock_write_27961 tracing_clock_write 3 27961 &bio_next_split_27961
119834 +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
119835 +mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL nohasharray
119836 +device_register_27972 device_register 0 27972 &mic_rx_pkts_read_27972
119837 +compat_SyS_set_mempolicy_27975 compat_SyS_set_mempolicy 3 27975 NULL
119838 +pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
119839 +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
119840 +seq_get_buf_28006 seq_get_buf 0 28006 NULL
119841 +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
119842 +powercap_register_zone_28028 powercap_register_zone 6 28028 NULL
119843 +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
119844 +cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
119845 +pool_status_28055 pool_status 5 28055 NULL
119846 +init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
119847 +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
119848 +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
119849 +acpi_gsb_i2c_write_bytes_28082 acpi_gsb_i2c_write_bytes 4 28082 NULL
119850 +mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
119851 +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
119852 +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
119853 +m25p80_read_reg_28132 m25p80_read_reg 4 28132 NULL
119854 +video_read_28148 video_read 3 28148 NULL
119855 +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
119856 +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
119857 +vread_28173 vread 0-3 28173 NULL
119858 +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
119859 +counter_free_res_28187 counter_free_res 5 28187 NULL
119860 +read_disk_sb_28188 read_disk_sb 2 28188 NULL
119861 +nvkm_output_dp_create__28192 nvkm_output_dp_create_ 6 28192 NULL
119862 +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
119863 +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
119864 +line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
119865 +amd_nb_num_28228 amd_nb_num 0 28228 NULL
119866 +usemap_size_28281 usemap_size 0 28281 NULL
119867 +inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
119868 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
119869 +SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
119870 +kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
119871 +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 NULL
119872 +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
119873 +xpcs_mmd_read_28331 xpcs_mmd_read 3 28331 NULL
119874 +bm_entry_write_28338 bm_entry_write 3 28338 NULL
119875 +tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
119876 +snapshot_write_28351 snapshot_write 3 28351 NULL
119877 +xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
119878 +batadv_handle_tt_response_28370 batadv_handle_tt_response 4 28370 NULL
119879 +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
119880 +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
119881 +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
119882 +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
119883 +__videobuf_mmap_setup_28421 __videobuf_mmap_setup 0 28421 NULL
119884 +ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
119885 +hid_hw_output_report_28429 hid_hw_output_report 0 28429 NULL
119886 +mpage_readpages_28436 mpage_readpages 3 28436 NULL
119887 +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
119888 +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
119889 +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
119890 +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
119891 +sh_irda_init_iobuf_28527 sh_irda_init_iobuf 2 28527 NULL nohasharray
119892 +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 &sh_irda_init_iobuf_28527
119893 +early_init_dt_alloc_memory_arch_28528 early_init_dt_alloc_memory_arch 1 28528 NULL
119894 +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
119895 +run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray
119896 +aio_read_events_28545 aio_read_events 3 28545 &run_delalloc_range_28545 nohasharray
119897 +mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &aio_read_events_28545
119898 +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
119899 +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
119900 +oxygen_read32_28582 oxygen_read32 0 28582 NULL
119901 +task_cgroup_path_28599 task_cgroup_path 3 28599 NULL
119902 +extract_entropy_28604 extract_entropy 5-3 28604 NULL
119903 +xgbe_common_write_28609 xgbe_common_write 2 28609 NULL
119904 +kfifo_unused_28612 kfifo_unused 0 28612 NULL
119905 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
119906 +setup_usemap_28636 setup_usemap 3-4 28636 NULL
119907 +qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
119908 +p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
119909 +iwl_dbgfs_nic_temp_read_28662 iwl_dbgfs_nic_temp_read 3 28662 NULL
119910 +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
119911 +SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
119912 +kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
119913 +drm_plane_init_28731 drm_plane_init 6 28731 NULL
119914 +spi_execute_28736 spi_execute 5 28736 NULL
119915 +snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
119916 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
119917 +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
119918 +nv50_dmac_create_28762 nv50_dmac_create 5 28762 NULL
119919 +rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
119920 +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
119921 +sel_write_member_28800 sel_write_member 3 28800 NULL
119922 +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
119923 +kernel_tree_alloc_28833 kernel_tree_alloc 1 28833 NULL
119924 +parser_init_byteStream_28841 parser_init_byteStream 2 28841 NULL
119925 +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
119926 +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
119927 +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
119928 +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
119929 +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
119930 +iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
119931 +push_rx_28939 push_rx 3 28939 NULL
119932 +mxuport_prepare_write_buffer_28943 mxuport_prepare_write_buffer 3 28943 NULL
119933 +btrfs_trim_block_group_28963 btrfs_trim_block_group 3-4 28963 NULL
119934 +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
119935 +hash_net6_expire_28979 hash_net6_expire 4 28979 NULL
119936 +hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
119937 +bin_uuid_28999 bin_uuid 3 28999 NULL
119938 +fd_execute_rw_29004 fd_execute_rw 3 29004 NULL
119939 +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
119940 +rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL
119941 +btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
119942 +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
119943 +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
119944 +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
119945 +iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
119946 +ccp_init_dm_workarea_29097 ccp_init_dm_workarea 3 29097 NULL
119947 +__compat_sys_preadv64_29103 __compat_sys_preadv64 3 29103 NULL
119948 +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
119949 +snprintf_29125 snprintf 0 29125 NULL
119950 +iov_shorten_29130 iov_shorten 0 29130 NULL
119951 +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
119952 +kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
119953 +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
119954 +wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
119955 +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
119956 +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
119957 +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
119958 +evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
119959 +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
119960 +rbd_osd_req_create_29260 rbd_osd_req_create 3 29260 NULL
119961 +mwifiex_hscfg_write_29262 mwifiex_hscfg_write 3 29262 NULL
119962 +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
119963 +ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
119964 +sn9c102_read_29305 sn9c102_read 3 29305 NULL
119965 +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
119966 +lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
119967 +kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
119968 +obd_proc_jobid_name_seq_write_29332 obd_proc_jobid_name_seq_write 3 29332 NULL
119969 +tun_put_user_29337 tun_put_user 5 29337 NULL
119970 +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
119971 +l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
119972 +read_file_tx99_power_29405 read_file_tx99_power 3 29405 NULL
119973 +mempool_create_29437 mempool_create 1 29437 NULL
119974 +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
119975 +p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
119976 +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
119977 +memcg_update_cache_params_29465 memcg_update_cache_params 2 29465 NULL
119978 +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
119979 +do_register_entry_29478 do_register_entry 4 29478 NULL
119980 +simple_strtoul_29480 simple_strtoul 0 29480 NULL
119981 +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
119982 +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
119983 +usnic_vnic_spec_dump_29508 usnic_vnic_spec_dump 2 29508 NULL
119984 +write_file_regidx_29517 write_file_regidx 3 29517 NULL
119985 +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
119986 +pci_enable_msix_29524 pci_enable_msix 0 29524 NULL
119987 +mic_vringh_copy_29531 mic_vringh_copy 4 29531 NULL
119988 +ftrace_write_29551 ftrace_write 3 29551 NULL
119989 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
119990 +leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
119991 +kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
119992 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
119993 +iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
119994 +pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
119995 +dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
119996 +slots_per_page_29601 slots_per_page 0 29601 NULL
119997 +osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
119998 +lstcon_rpc_init_29623 lstcon_rpc_init 4 29623 NULL
119999 +nla_get_u16_29624 nla_get_u16 0 29624 NULL
120000 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
120001 +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL nohasharray
120002 +spmi_controller_alloc_29654 spmi_controller_alloc 2 29654 &sctp_make_abort_user_29654
120003 +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
120004 +lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
120005 +posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
120006 +probes_write_29711 probes_write 3 29711 NULL
120007 +read_cis_cache_29735 read_cis_cache 4 29735 NULL
120008 +xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
120009 +std_nic_write_29752 std_nic_write 3 29752 NULL
120010 +static_key_count_29771 static_key_count 0 29771 NULL
120011 +tg3_irq_count_29786 tg3_irq_count 0 29786 NULL
120012 +dbAlloc_29794 dbAlloc 0 29794 NULL
120013 +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
120014 +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
120015 +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
120016 +count_partial_29850 count_partial 0 29850 NULL
120017 +write_file_bool_bmps_29870 write_file_bool_bmps 3 29870 NULL
120018 +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
120019 +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
120020 +rtw_cfg80211_indicate_sta_assoc_29897 rtw_cfg80211_indicate_sta_assoc 3 29897 NULL
120021 +nv94_gpio_intr_mask_29907 nv94_gpio_intr_mask 4-3 29907 NULL
120022 +lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
120023 +write_file_queue_29922 write_file_queue 3 29922 NULL
120024 +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL nohasharray
120025 +ipv6_recv_error_29947 ipv6_recv_error 3 29947 &__btrfs_getxattr_29947
120026 +zero_iovec_29955 zero_iovec 1 29955 NULL
120027 +dev_mem_write_30028 dev_mem_write 3 30028 NULL
120028 +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
120029 +sysfs_add_file_mode_ns_30038 sysfs_add_file_mode_ns 0 30038 NULL
120030 +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 0-4 30040 NULL
120031 +drp_wmove_30043 drp_wmove 4 30043 NULL
120032 +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
120033 +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
120034 +rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
120035 +defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
120036 +spi_async_locked_30117 spi_async_locked 0 30117 NULL
120037 +u_memcpya_30139 u_memcpya 3-2 30139 NULL
120038 +dbg_port_buf_30145 dbg_port_buf 2 30145 NULL
120039 +elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
120040 +alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
120041 +expand_inode_data_30169 expand_inode_data 3-2 30169 NULL
120042 +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
120043 +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
120044 +__genwqe_readq_30197 __genwqe_readq 0 30197 NULL
120045 +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
120046 +SyS_semop_30227 SyS_semop 3 30227 NULL
120047 +bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
120048 +rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
120049 +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
120050 +compat_readv_30273 compat_readv 3 30273 NULL
120051 +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
120052 +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
120053 +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
120054 +osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
120055 +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
120056 +i8254_read_30330 i8254_read 0 30330 NULL
120057 +resource_from_user_30341 resource_from_user 3 30341 NULL
120058 +o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
120059 +kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
120060 +pvscsi_change_queue_depth_30365 pvscsi_change_queue_depth 2 30365 NULL
120061 +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
120062 +blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3 30392 NULL
120063 +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
120064 +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
120065 +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
120066 +lstcon_session_info_30425 lstcon_session_info 6 30425 NULL
120067 +enable_write_30456 enable_write 3 30456 NULL
120068 +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
120069 +urandom_read_30462 urandom_read 3 30462 NULL
120070 +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
120071 +adu_write_30487 adu_write 3 30487 NULL
120072 +dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
120073 +batadv_send_tt_request_30493 batadv_send_tt_request 5 30493 NULL
120074 +memblock_virt_alloc_node_30515 memblock_virt_alloc_node 1 30515 NULL
120075 +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
120076 +debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray
120077 +set_config_30526 set_config 0 30526 &debug_debug2_read_30526
120078 +xfs_sb_version_hasftype_30559 xfs_sb_version_hasftype 0 30559 NULL nohasharray
120079 +ixgbevf_acquire_msix_vectors_30559 ixgbevf_acquire_msix_vectors 2 30559 &xfs_sb_version_hasftype_30559
120080 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
120081 +set_le_30581 set_le 4 30581 NULL
120082 +blk_init_tags_30592 blk_init_tags 1 30592 NULL
120083 +sgl_map_user_pages_30610 sgl_map_user_pages 2 30610 NULL
120084 +SyS_msgrcv_30611 SyS_msgrcv 3 30611 NULL
120085 +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
120086 +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
120087 +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
120088 +mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
120089 +SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
120090 +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
120091 +ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
120092 +sst_hsw_get_dsp_position_30691 sst_hsw_get_dsp_position 0 30691 NULL
120093 +get_pages_alloc_iovec_30699 get_pages_alloc_iovec 3-0 30699 NULL
120094 +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
120095 +lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
120096 +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
120097 +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
120098 +snapshot_status_30744 snapshot_status 5 30744 NULL
120099 +fuse_direct_IO_30753 fuse_direct_IO 4 30753 NULL
120100 +fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
120101 +__bio_alloc_30787 __bio_alloc 3 30787 NULL
120102 +smk_read_doi_30813 smk_read_doi 3 30813 NULL
120103 +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
120104 +ath10k_write_fw_dbglog_30835 ath10k_write_fw_dbglog 3 30835 NULL
120105 +of_gpio_named_count_30841 of_gpio_named_count 0 30841 NULL
120106 +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
120107 +cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL
120108 +wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
120109 +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
120110 +pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
120111 +copy_to_iter_30901 copy_to_iter 2 30901 NULL
120112 +usnic_debugfs_buildinfo_read_30928 usnic_debugfs_buildinfo_read 3 30928 NULL
120113 +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
120114 +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
120115 +huge_page_mask_30981 huge_page_mask 0 30981 NULL
120116 +read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
120117 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
120118 +ima_eventsig_init_31022 ima_eventsig_init 5 31022 NULL
120119 +template_fmt_size_31033 template_fmt_size 0 31033 NULL
120120 +stride_pg_count_31053 stride_pg_count 0-3-2-1-4-5 31053 NULL
120121 +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
120122 +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
120123 +proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
120124 +depth_read_31112 depth_read 3 31112 NULL
120125 +hash_ipportnet6_expire_31118 hash_ipportnet6_expire 4 31118 NULL
120126 +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
120127 +size_inside_page_31141 size_inside_page 0 31141 NULL
120128 +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
120129 +nvme_set_features_31169 nvme_set_features 0 31169 NULL
120130 +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
120131 +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
120132 +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
120133 +cpumask_weight_31215 cpumask_weight 0 31215 NULL
120134 +__read_reg_31216 __read_reg 0 31216 NULL
120135 +atm_get_addr_31221 atm_get_addr 3 31221 NULL
120136 +tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
120137 +cyy_readb_31240 cyy_readb 0 31240 NULL
120138 +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
120139 +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
120140 +hash_netportnet4_expire_31290 hash_netportnet4_expire 4 31290 NULL
120141 +iwl_dbgfs_set_nic_temperature_read_31300 iwl_dbgfs_set_nic_temperature_read 3 31300 NULL
120142 +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
120143 +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
120144 +command_file_write_31318 command_file_write 3 31318 NULL
120145 +hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
120146 +_regmap_raw_multi_reg_write_31336 _regmap_raw_multi_reg_write 3 31336 NULL
120147 +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
120148 +outlen_write_31358 outlen_write 3 31358 NULL
120149 +ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
120150 +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
120151 +vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL
120152 +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
120153 +inb_31388 inb 0 31388 NULL
120154 +mp_ioapic_pin_count_31393 mp_ioapic_pin_count 0 31393 NULL
120155 +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
120156 +_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
120157 +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
120158 +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
120159 +transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
120160 +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
120161 +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
120162 +alg_setkey_31485 alg_setkey 3 31485 NULL
120163 +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
120164 +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
120165 +__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
120166 +hidraw_write_31536 hidraw_write 3 31536 NULL
120167 +usbvision_read_31555 usbvision_read 3 31555 NULL
120168 +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
120169 +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
120170 +osst_write_31581 osst_write 3 31581 NULL
120171 +snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
120172 +iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
120173 +memblock_virt_alloc_nopanic_31617 memblock_virt_alloc_nopanic 1 31617 NULL nohasharray
120174 +arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 &memblock_virt_alloc_nopanic_31617
120175 +usnic_ib_dump_vf_31623 usnic_ib_dump_vf 3 31623 NULL
120176 +videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
120177 +pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
120178 +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
120179 +__lgread_31668 __lgread 4 31668 NULL
120180 +copy_from_user_nmi_31672 copy_from_user_nmi 3-0 31672 NULL
120181 +forced_ps_read_31685 forced_ps_read 3 31685 NULL
120182 +fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
120183 +rs_pretty_print_rate_31727 rs_pretty_print_rate 0 31727 NULL
120184 +lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 NULL nohasharray
120185 +utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 &lu_buf_check_and_grow_31735
120186 +shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
120187 +input_abs_get_max_31742 input_abs_get_max 0 31742 NULL nohasharray
120188 +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 &input_abs_get_max_31742
120189 +bcm_char_read_31750 bcm_char_read 3 31750 NULL
120190 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
120191 +SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
120192 +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
120193 +get_count_order_31800 get_count_order 0 31800 NULL
120194 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
120195 +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
120196 +data_write_31805 data_write 3 31805 NULL
120197 +SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
120198 +strnlen_user_31815 strnlen_user 0-2 31815 NULL
120199 +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
120200 +clone_bio_31854 clone_bio 4-3 31854 NULL
120201 +SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
120202 +iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
120203 +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
120204 +ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
120205 +xattr_permission_31907 xattr_permission 0 31907 NULL
120206 +lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
120207 +new_dir_31919 new_dir 3 31919 NULL
120208 +kmem_alloc_31920 kmem_alloc 1 31920 NULL
120209 +era_status_31934 era_status 5 31934 NULL
120210 +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
120211 +read_mem_31942 read_mem 3 31942 NULL
120212 +ext4_zero_range_31944 ext4_zero_range 3-2 31944 NULL
120213 +vb2_write_31948 vb2_write 3 31948 NULL
120214 +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
120215 +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
120216 +iwl_rx_packet_payload_len_31965 iwl_rx_packet_payload_len 0 31965 NULL
120217 +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
120218 +iblock_execute_rw_31982 iblock_execute_rw 3 31982 NULL nohasharray
120219 +vx_read_status_31982 vx_read_status 0 31982 &iblock_execute_rw_31982
120220 +find_next_zero_bit_31990 find_next_zero_bit 0 31990 NULL
120221 +lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
120222 +sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
120223 +calc_hmac_32010 calc_hmac 3 32010 NULL
120224 +aead_len_32021 aead_len 0 32021 NULL
120225 +sci_dma_rx_push_32029 sci_dma_rx_push 2 32029 NULL
120226 +stk_read_32038 stk_read 3 32038 NULL
120227 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
120228 +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
120229 +cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
120230 +kiblnd_alloc_pages_32092 kiblnd_alloc_pages 3 32092 NULL
120231 +bio_alloc_32095 bio_alloc 2 32095 NULL
120232 +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
120233 +wil_read_file_recovery_32104 wil_read_file_recovery 3 32104 NULL
120234 +disk_status_32120 disk_status 4 32120 NULL
120235 +kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
120236 +venus_link_32165 venus_link 5 32165 NULL
120237 +ocfs2_direct_IO_32168 ocfs2_direct_IO 4 32168 NULL
120238 +do_writepages_32173 do_writepages 0 32173 NULL
120239 +del_ptr_32197 del_ptr 4 32197 NULL
120240 +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
120241 +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
120242 +caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
120243 +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
120244 +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
120245 +kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
120246 +cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
120247 +SyS_select_32319 SyS_select 1 32319 NULL
120248 +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
120249 +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
120250 +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
120251 +dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
120252 +rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
120253 +sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray
120254 +ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362
120255 +ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
120256 +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
120257 +vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
120258 +cache_status_32462 cache_status 5 32462 NULL
120259 +fill_readbuf_32464 fill_readbuf 3 32464 NULL
120260 +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
120261 +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
120262 +mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
120263 +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
120264 +disconnect_32521 disconnect 4 32521 NULL
120265 +qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
120266 +ilo_read_32531 ilo_read 3 32531 NULL
120267 +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
120268 +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
120269 +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
120270 +osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
120271 +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
120272 +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
120273 +read_file_beacon_32595 read_file_beacon 3 32595 NULL
120274 +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
120275 +irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
120276 +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
120277 +xpcs_reg_value_read_32644 xpcs_reg_value_read 3 32644 NULL
120278 +kvmalloc_32646 kvmalloc 1 32646 NULL
120279 +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
120280 +generic_readlink_32654 generic_readlink 3 32654 NULL
120281 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
120282 +compat_SyS_preadv_32679 compat_SyS_preadv 3 32679 NULL
120283 +jfs_readpages_32702 jfs_readpages 4 32702 NULL
120284 +rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
120285 +_xfs_buf_get_pages_32715 _xfs_buf_get_pages 2 32715 NULL
120286 +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
120287 +stats_read_ul_32751 stats_read_ul 3 32751 NULL
120288 +vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
120289 +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
120290 +rproc_name_read_32805 rproc_name_read 3 32805 NULL
120291 +sta_tx_latency_stat_read_32862 sta_tx_latency_stat_read 3 32862 NULL
120292 +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
120293 +cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 NULL nohasharray
120294 +ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 &cifs_writedata_alloc_32880
120295 +vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 4-6 32884 NULL
120296 +visorchannel_dump_section_32893 visorchannel_dump_section 4 32893 NULL
120297 +tipc_link_iovec_xmit_fast_32913 tipc_link_iovec_xmit_fast 3 32913 NULL nohasharray
120298 +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 &tipc_link_iovec_xmit_fast_32913
120299 +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
120300 +rmap_recycle_32938 rmap_recycle 3 32938 NULL
120301 +ptlrpc_prep_bulk_imp_32997 ptlrpc_prep_bulk_imp 2 32997 NULL
120302 +compat_filldir_32999 compat_filldir 3 32999 NULL
120303 +SyS_syslog_33007 SyS_syslog 3 33007 NULL
120304 +br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
120305 +write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
120306 +mic_virtio_copy_to_user_33048 mic_virtio_copy_to_user 3 33048 NULL
120307 +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
120308 +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
120309 +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
120310 +bitmap_resize_33054 bitmap_resize 2 33054 NULL
120311 +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
120312 +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
120313 +alloc_tio_33077 alloc_tio 3 33077 NULL
120314 +acl_permission_check_33083 acl_permission_check 0 33083 NULL
120315 +f2fs_llseek_33098 f2fs_llseek 2 33098 NULL
120316 +fb_sys_write_33130 fb_sys_write 3 33130 NULL
120317 +SyS_poll_33152 SyS_poll 2 33152 NULL
120318 +_pci_add_cap_save_buffer_33153 _pci_add_cap_save_buffer 4 33153 NULL
120319 +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
120320 +dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
120321 +pp_read_33210 pp_read 3 33210 NULL
120322 +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
120323 +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
120324 +sync_pt_create_33282 sync_pt_create 2 33282 NULL
120325 +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
120326 +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
120327 +vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
120328 +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
120329 +lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL
120330 +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
120331 +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
120332 +read_file_regidx_33370 read_file_regidx 3 33370 NULL
120333 +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
120334 +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
120335 +nvc0_ram_create__33391 nvc0_ram_create_ 5 33391 NULL
120336 +ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
120337 +cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
120338 +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 NULL
120339 +hash_netiface6_expire_33421 hash_netiface6_expire 4 33421 NULL
120340 +dis_tap_write_33426 dis_tap_write 3 33426 NULL
120341 +message_stats_list_33440 message_stats_list 5 33440 NULL
120342 +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
120343 +create_entry_33479 create_entry 2 33479 NULL
120344 +ip_setsockopt_33487 ip_setsockopt 5 33487 NULL
120345 +res_counter_read_33499 res_counter_read 4 33499 NULL
120346 +hash_netnet4_expire_33500 hash_netnet4_expire 4 33500 NULL
120347 +fb_read_33506 fb_read 3 33506 NULL
120348 +musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
120349 +ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
120350 +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
120351 +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
120352 +tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL nohasharray
120353 +osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 &tomoyo_read_self_33539
120354 +count_subheaders_33591 count_subheaders 0 33591 NULL
120355 +scsi_execute_33596 scsi_execute 5 33596 NULL
120356 +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
120357 +xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
120358 +il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 NULL nohasharray
120359 +usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 &il_dbgfs_qos_read_33615
120360 +stride_page_count_33641 stride_page_count 2 33641 NULL
120361 +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
120362 +inw_p_33668 inw_p 0 33668 NULL
120363 +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
120364 +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
120365 +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
120366 +netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
120367 +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
120368 +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
120369 +write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL
120370 +read_file_node_recv_33729 read_file_node_recv 3 33729 NULL
120371 +__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
120372 +vifs_state_read_33762 vifs_state_read 3 33762 NULL
120373 +hashtab_create_33769 hashtab_create 3 33769 NULL
120374 +__btrfs_free_reserved_extent_33782 __btrfs_free_reserved_extent 2 33782 NULL
120375 +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
120376 +filter_write_33819 filter_write 3 33819 NULL
120377 +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
120378 +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
120379 +ext4_journal_extend_33835 ext4_journal_extend 2 33835 NULL
120380 +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
120381 +azx_get_pos_posbuf_33867 azx_get_pos_posbuf 0 33867 NULL
120382 +get_user_pages_33908 get_user_pages 0 33908 NULL
120383 +sg_nents_33909 sg_nents 0 33909 NULL
120384 +ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
120385 +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
120386 +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
120387 +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
120388 +read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
120389 +rs_sta_dbgfs_drv_tx_stats_read_33946 rs_sta_dbgfs_drv_tx_stats_read 3 33946 NULL
120390 +__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
120391 +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
120392 +lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
120393 +ppp_write_34034 ppp_write 3 34034 NULL
120394 +tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
120395 +bm_page_io_async_34050 bm_page_io_async 2 34050 NULL
120396 +calc_linear_pos_34067 calc_linear_pos 0-4 34067 NULL
120397 +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
120398 +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
120399 +__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
120400 +proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL
120401 +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
120402 +ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
120403 +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
120404 +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
120405 +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
120406 +rsi_debug_zone_write_34206 rsi_debug_zone_write 3 34206 NULL nohasharray
120407 +rbd_osd_req_create_34206 rbd_osd_req_create 3 34206 &rsi_debug_zone_write_34206
120408 +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
120409 +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
120410 +device_private_init_34279 device_private_init 0 34279 NULL
120411 +xgmac_reg_addr_write_34284 xgmac_reg_addr_write 3 34284 NULL
120412 +ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
120413 +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 NULL nohasharray
120414 +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 &pcpu_need_to_extend_34326
120415 +proc_thread_self_readlink_34357 proc_thread_self_readlink 3 34357 NULL
120416 +crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL nohasharray
120417 +sync_page_io_34363 sync_page_io 3 34363 &crypto_ablkcipher_ivsize_34363
120418 +rngapi_reset_34366 rngapi_reset 3 34366 NULL
120419 +ea_read_34378 ea_read 0 34378 NULL nohasharray
120420 +_iwl_dbgfs_low_latency_write_34378 _iwl_dbgfs_low_latency_write 3 34378 &ea_read_34378
120421 +fuse_send_read_34379 fuse_send_read 0-4 34379 NULL
120422 +av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
120423 +usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
120424 +read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
120425 +ivtv_read_pos_34400 ivtv_read_pos 3 34400 NULL nohasharray
120426 +iwl_calib_set_34400 iwl_calib_set 3 34400 &ivtv_read_pos_34400
120427 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
120428 +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
120429 +security_socket_create_34439 security_socket_create 0 34439 NULL
120430 +usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
120431 +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
120432 +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
120433 +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
120434 +security_inode_permission_34488 security_inode_permission 0 34488 NULL
120435 +SyS_pwritev_34494 SyS_pwritev 3 34494 NULL
120436 +qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
120437 +lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
120438 +ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray
120439 +tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537
120440 +hugetlbfs_read_actor_34547 hugetlbfs_read_actor 2-5-4-0 34547 NULL
120441 +dbBackSplit_34561 dbBackSplit 0 34561 NULL
120442 +alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
120443 +ext4_ind_direct_IO_34574 ext4_ind_direct_IO 4 34574 NULL
120444 +lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
120445 +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
120446 +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
120447 +ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
120448 +cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
120449 +bio_integrity_bytes_34602 bio_integrity_bytes 2 34602 NULL
120450 +__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL
120451 +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
120452 +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
120453 +kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
120454 +sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
120455 +f2fs_direct_IO_34685 f2fs_direct_IO 4 34685 NULL
120456 +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
120457 +batadv_tvlv_realloc_packet_buff_34688 batadv_tvlv_realloc_packet_buff 3-4 34688 NULL
120458 +port_print_34704 port_print 3 34704 NULL
120459 +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
120460 +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
120461 +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
120462 +lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
120463 +bootmode_store_34762 bootmode_store 4 34762 NULL
120464 +device_add_34766 device_add 0 34766 NULL
120465 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
120466 +ext3_direct_IO_34798 ext3_direct_IO 4 34798 NULL
120467 +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
120468 +can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
120469 +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
120470 +ll_setxattr_34806 ll_setxattr 4 34806 NULL
120471 +file_page_index_34820 file_page_index 0-2 34820 NULL
120472 +bio_segments_34832 bio_segments 0 34832 NULL
120473 +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
120474 +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
120475 +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
120476 +usb_serial_generic_prepare_write_buffer_34857 usb_serial_generic_prepare_write_buffer 3 34857 NULL
120477 +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
120478 +msg_print_text_34889 msg_print_text 0 34889 NULL
120479 +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
120480 +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
120481 +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 NULL nohasharray
120482 +__inode_permission_34925 __inode_permission 0 34925 &btrfs_super_chunk_root_34925
120483 +sec_flags2str_34933 sec_flags2str 3 34933 NULL
120484 +snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
120485 +compat_SyS_kexec_load_34947 compat_SyS_kexec_load 2 34947 NULL
120486 +do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
120487 +sdebug_change_qdepth_34994 sdebug_change_qdepth 2 34994 NULL
120488 +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
120489 +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
120490 +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
120491 +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
120492 +hwdep_read_locked_35037 hwdep_read_locked 3 35037 NULL
120493 +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
120494 +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
120495 +capi_write_35104 capi_write 3 35104 NULL nohasharray
120496 +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
120497 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
120498 +ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
120499 +addrs_per_inode_35151 addrs_per_inode 0 35151 NULL
120500 +message_stats_print_35158 message_stats_print 6 35158 NULL
120501 +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
120502 +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
120503 +compat_SyS_pselect6_35203 compat_SyS_pselect6 1 35203 NULL
120504 +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
120505 +striped_read_35218 striped_read 0-2 35218 NULL nohasharray
120506 +security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
120507 +rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL
120508 +kimage_file_prepare_segments_35232 kimage_file_prepare_segments 5 35232 NULL
120509 +set_fd_set_35249 set_fd_set 1 35249 NULL
120510 +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
120511 +dis_disc_write_35265 dis_disc_write 3 35265 NULL
120512 +dma_show_regs_35266 dma_show_regs 3 35266 NULL
120513 +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
120514 +i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
120515 +isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL nohasharray
120516 +nvkm_notify_init_35283 nvkm_notify_init 7 35283 &isr_rx_rdys_read_35283
120517 +__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 NULL nohasharray
120518 +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 &__btrfs_buffered_write_35311
120519 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
120520 +sta_tx_latency_stat_write_35323 sta_tx_latency_stat_write 3 35323 NULL
120521 +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
120522 +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
120523 +ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
120524 +compat_filldir64_35354 compat_filldir64 3 35354 NULL
120525 +read_kmem_35372 read_kmem 3 35372 NULL
120526 +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
120527 +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
120528 +iwl_dbgfs_drv_rx_stats_read_35430 iwl_dbgfs_drv_rx_stats_read 3 35430 NULL
120529 +buffer_to_user_35439 buffer_to_user 3 35439 NULL
120530 +efx_mcdi_rpc_async_quiet_35460 efx_mcdi_rpc_async_quiet 4-5 35460 NULL
120531 +macvtap_do_read_35475 macvtap_do_read 3 35475 NULL
120532 +fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
120533 +btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4 35500 NULL
120534 +async_setkey_35521 async_setkey 3 35521 NULL
120535 +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
120536 +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
120537 +pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
120538 +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
120539 +ocfs2_write_zero_page_35539 ocfs2_write_zero_page 3 35539 NULL
120540 +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
120541 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
120542 +C_SYSC_kexec_load_35565 C_SYSC_kexec_load 2 35565 NULL
120543 +ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
120544 +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
120545 +spk_msg_set_35586 spk_msg_set 3 35586 NULL
120546 +kernel_readv_35617 kernel_readv 3 35617 NULL
120547 +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
120548 +ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
120549 +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
120550 +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
120551 +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
120552 +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
120553 +md_super_write_35703 md_super_write 4 35703 NULL
120554 +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
120555 +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
120556 +alloc_netdev_mqs_35806 alloc_netdev_mqs 1 35806 NULL
120557 +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
120558 +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
120559 +vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
120560 +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
120561 +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
120562 +ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
120563 +uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
120564 +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
120565 +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
120566 +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
120567 +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
120568 +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
120569 +generic_ocp_read_35974 generic_ocp_read 3 35974 NULL nohasharray
120570 +ceph_buffer_new_35974 ceph_buffer_new 1 35974 &generic_ocp_read_35974
120571 +acl_alloc_35979 acl_alloc 1 35979 NULL
120572 +device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
120573 +write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
120574 +kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
120575 +lov_mds_md_max_stripe_count_36008 lov_mds_md_max_stripe_count 0-1 36008 NULL
120576 +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
120577 +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
120578 +account_shadowed_36048 account_shadowed 2 36048 NULL
120579 +gpio_power_read_36059 gpio_power_read 3 36059 NULL
120580 +write_emulate_36065 write_emulate 2-4 36065 NULL
120581 +stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
120582 +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
120583 +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
120584 +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
120585 +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
120586 +mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
120587 +vga_arb_write_36112 vga_arb_write 3 36112 NULL
120588 +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
120589 +ext3_readpages_36144 ext3_readpages 4 36144 NULL
120590 +twl_set_36154 twl_set 2 36154 NULL
120591 +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
120592 +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
120593 +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
120594 +ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
120595 +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
120596 +SYSC_process_vm_readv_36216 SYSC_process_vm_readv 3-5 36216 NULL
120597 +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
120598 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
120599 +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
120600 +vmsplice_to_user_36245 vmsplice_to_user 3 36245 NULL nohasharray
120601 +rproc_recovery_read_36245 rproc_recovery_read 3 36245 &vmsplice_to_user_36245
120602 +cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 NULL
120603 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
120604 +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
120605 +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
120606 +cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
120607 +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
120608 +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL nohasharray
120609 +__compat_sys_pwritev64_36328 __compat_sys_pwritev64 3 36328 &fat_compat_ioctl_filldir_36328
120610 +lc_create_36332 lc_create 4 36332 NULL
120611 +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
120612 +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
120613 +ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL
120614 +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL
120615 +to_sector_36361 to_sector 0-1 36361 NULL
120616 +tunables_read_36385 tunables_read 3 36385 NULL
120617 +afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
120618 +sierra_write_36402 sierra_write 4 36402 NULL
120619 +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
120620 +soc_pcm_codec_params_fixup_36434 soc_pcm_codec_params_fixup 2 36434 NULL
120621 +ReadW6692B_36445 ReadW6692B 0 36445 NULL
120622 +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
120623 +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
120624 +SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL
120625 +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
120626 +ds1343_nvram_write_36489 ds1343_nvram_write 5-6 36489 NULL
120627 +tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 NULL nohasharray
120628 +ip6_append_data_36490 ip6_append_data 4 36490 &tx_tx_checksum_result_read_36490
120629 +cmd_loop_36491 cmd_loop 0 36491 NULL
120630 +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
120631 +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
120632 +_iwl_dbgfs_fw_nmi_write_36515 _iwl_dbgfs_fw_nmi_write 3 36515 NULL
120633 +get_param_l_36518 get_param_l 0 36518 NULL
120634 +ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
120635 +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
120636 +cpu_type_read_36540 cpu_type_read 3 36540 NULL
120637 +__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL
120638 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
120639 +__erst_read_36579 __erst_read 0 36579 NULL
120640 +put_cmsg_36589 put_cmsg 4 36589 NULL
120641 +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
120642 +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
120643 +convert_extent_item_v0_36645 convert_extent_item_v0 4 36645 NULL
120644 +ced_ioctl_36647 ced_ioctl 2 36647 NULL
120645 +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
120646 +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
120647 +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
120648 +xillybus_read_36678 xillybus_read 3 36678 NULL
120649 +gsmtty_write_36702 gsmtty_write 3 36702 NULL
120650 +path_getxattr_36717 path_getxattr 4 36717 NULL
120651 +snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
120652 +cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
120653 +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
120654 +ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
120655 +i40e_init_lan_hmc_36796 i40e_init_lan_hmc 5-4-3-2 36796 NULL
120656 +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
120657 +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
120658 +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
120659 +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
120660 +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
120661 +cm_write_36858 cm_write 3 36858 NULL
120662 +tipc_link_iovec_long_xmit_36871 tipc_link_iovec_long_xmit 3 36871 NULL nohasharray
120663 +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 &tipc_link_iovec_long_xmit_36871
120664 +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
120665 +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
120666 +__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
120667 +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
120668 +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
120669 +il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
120670 +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
120671 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
120672 +setxattr_37006 setxattr 4 37006 NULL
120673 +ec_i2c_xfer_37029 ec_i2c_xfer 3 37029 NULL
120674 +ieee80211_chsw_switch_vifs_37030 ieee80211_chsw_switch_vifs 2 37030 NULL
120675 +command_file_read_37038 command_file_read 3 37038 NULL
120676 +figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
120677 +qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
120678 +ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
120679 +_iwl_dbgfs_bcast_filters_macs_write_37069 _iwl_dbgfs_bcast_filters_macs_write 3 37069 NULL
120680 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
120681 +parse_command_37079 parse_command 2 37079 NULL
120682 +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
120683 +tun_get_user_37094 tun_get_user 5 37094 NULL
120684 +has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
120685 +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
120686 +mtt_free_res_37144 mtt_free_res 5 37144 NULL
120687 +msg_word_37164 msg_word 0 37164 NULL
120688 +vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
120689 +forced_ps_write_37209 forced_ps_write 3 37209 NULL
120690 +crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL
120691 +bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
120692 +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
120693 +__do_replace_37227 __do_replace 5 37227 NULL
120694 +iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
120695 +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL nohasharray
120696 +__btrfs_inc_extent_ref_37238 __btrfs_inc_extent_ref 7 37238 &rx_filter_dup_filter_read_37238
120697 +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
120698 +_iwl_dbgfs_fw_restart_write_37270 _iwl_dbgfs_fw_restart_write 3 37270 NULL
120699 +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
120700 +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
120701 +tipc_send_37315 tipc_send 3 37315 NULL
120702 +l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
120703 +bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
120704 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
120705 +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
120706 +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
120707 +seek_firmware_37372 seek_firmware 2 37372 NULL
120708 +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
120709 +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL
120710 +tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
120711 +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
120712 +fru_alloc_37442 fru_alloc 1 37442 NULL
120713 +tcp_established_options_37450 tcp_established_options 0 37450 NULL
120714 +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
120715 +get_est_timing_37484 get_est_timing 0 37484 NULL
120716 +kmem_realloc_37489 kmem_realloc 2 37489 NULL
120717 +bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
120718 +osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
120719 +bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL
120720 +xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
120721 +fault_inject_read_37534 fault_inject_read 3 37534 NULL
120722 +hdr_size_37536 hdr_size 0 37536 NULL
120723 +extent_map_end_37550 extent_map_end 0 37550 NULL
120724 +sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
120725 +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
120726 +qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
120727 +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
120728 +SYSC_mbind_37622 SYSC_mbind 5 37622 NULL
120729 +SyS_mbind_37638 SyS_mbind 5 37638 NULL
120730 +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
120731 +vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 NULL nohasharray
120732 +rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 &vmw_framebuffer_dmabuf_dirty_37661
120733 +SYSC_get_mempolicy_37664 SYSC_get_mempolicy 3 37664 NULL
120734 +__wa_seg_calculate_isoc_frame_count_37672 __wa_seg_calculate_isoc_frame_count 0 37672 NULL
120735 +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
120736 +tracing_saved_cmdlines_size_write_37684 tracing_saved_cmdlines_size_write 3 37684 NULL
120737 +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
120738 +nametbl_header_37698 nametbl_header 2-0 37698 NULL
120739 +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
120740 +dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
120741 +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
120742 +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
120743 +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
120744 +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
120745 +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
120746 +smk_read_logging_37804 smk_read_logging 3 37804 NULL
120747 +nvkm_notify_init_37806 nvkm_notify_init 6 37806 NULL
120748 +ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
120749 +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
120750 +android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
120751 +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
120752 +xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
120753 +btrfs_leaf_data_37869 btrfs_leaf_data 0 37869 NULL
120754 +btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
120755 +_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
120756 +pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
120757 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
120758 +write_file_bool_37957 write_file_bool 3 37957 NULL
120759 +fifo_alloc_37961 fifo_alloc 1 37961 NULL
120760 +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
120761 +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
120762 +vfs_readv_38011 vfs_readv 3 38011 NULL
120763 +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
120764 +il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL nohasharray
120765 +klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 &il_dbgfs_chain_noise_read_38044
120766 +parser_init_guts_38046 parser_init_guts 2 38046 NULL
120767 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
120768 +sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
120769 +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL
120770 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
120771 +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
120772 +cifs_send_async_read_38077 cifs_send_async_read 2 38077 NULL
120773 +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL
120774 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
120775 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
120776 +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
120777 +ep0_read_38095 ep0_read 3 38095 NULL
120778 +osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 NULL nohasharray
120779 +sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 &osc_checksum_seq_write_38096
120780 +o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
120781 +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
120782 +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
120783 +__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 3-4-0 38153 NULL
120784 +btrfs_extent_same_38163 btrfs_extent_same 3-2-5 38163 NULL
120785 +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
120786 +cdev_add_38176 cdev_add 2-3 38176 NULL
120787 +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
120788 +get_ucode_user_38202 get_ucode_user 3 38202 NULL
120789 +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
120790 +ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
120791 +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
120792 +nvkm_dmaobj_create__38250 nvkm_dmaobj_create_ 6 38250 NULL
120793 +mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 NULL nohasharray
120794 +ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &mthca_alloc_icm_table_38268 nohasharray
120795 +SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 &ieee80211_if_read_auto_open_plinks_38268
120796 +xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
120797 +xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
120798 +ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
120799 +C_SYSC_pselect6_38296 C_SYSC_pselect6 1 38296 NULL
120800 +ucma_query_path_38305 ucma_query_path 3 38305 NULL
120801 +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
120802 +ida_simple_get_38326 ida_simple_get 0 38326 NULL
120803 +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
120804 +usb_ext_prop_put_name_38352 usb_ext_prop_put_name 0-3 38352 NULL
120805 +btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
120806 +xfs_free_file_space_38383 xfs_free_file_space 2-3 38383 NULL
120807 +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
120808 +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
120809 +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
120810 +iov_iter_npages_iovec_38448 iov_iter_npages_iovec 0-2 38448 NULL
120811 +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
120812 +videobuf_waiton_38459 videobuf_waiton 0 38459 NULL
120813 +_iwl_dbgfs_scan_ant_rxchain_write_38479 _iwl_dbgfs_scan_ant_rxchain_write 3 38479 NULL
120814 +blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL
120815 +dev_names_read_38509 dev_names_read 3 38509 NULL
120816 +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
120817 +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
120818 +set_queue_count_38519 set_queue_count 0 38519 NULL
120819 +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
120820 +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
120821 +kuc_len_38557 kuc_len 0-1 38557 NULL
120822 +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
120823 +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
120824 +_ipw_read32_38565 _ipw_read32 0 38565 NULL
120825 +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL
120826 +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
120827 +rd_allocate_sgl_table_38607 rd_allocate_sgl_table 3 38607 NULL
120828 +icn_writecmd_38629 icn_writecmd 2 38629 NULL
120829 +write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
120830 +ext2_readpages_38640 ext2_readpages 4 38640 NULL
120831 +audit_init_entry_38644 audit_init_entry 1 38644 NULL
120832 +qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
120833 +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
120834 +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
120835 +ufshcd_read_sdev_qdepth_38676 ufshcd_read_sdev_qdepth 0 38676 NULL
120836 +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
120837 +tracing_nsecs_read_38689 tracing_nsecs_read 3 38689 NULL
120838 +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
120839 +w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
120840 +udf_readpages_38761 udf_readpages 4 38761 NULL
120841 +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
120842 +bcache_device_init_38781 bcache_device_init 3 38781 NULL
120843 +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
120844 +do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
120845 +err_decode_38804 err_decode 2 38804 NULL
120846 +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
120847 +direct_entry_38836 direct_entry 3 38836 NULL
120848 +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
120849 +interfaces_38859 interfaces 2 38859 NULL
120850 +dbgfs_state_38894 dbgfs_state 3 38894 NULL
120851 +il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
120852 +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
120853 +usb_maxpacket_38977 usb_maxpacket 0 38977 NULL nohasharray
120854 +C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 &usb_maxpacket_38977
120855 +OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
120856 +bio_clone_range_38997 bio_clone_range 2 38997 NULL
120857 +lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
120858 +get_nodes_39012 get_nodes 3 39012 NULL
120859 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
120860 +force_sc_support_read_39014 force_sc_support_read 3 39014 NULL
120861 +__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3 39020 NULL
120862 +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
120863 +do_write_kmem_39051 do_write_kmem 0-1-3 39051 NULL
120864 +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
120865 +__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
120866 +ea_foreach_39133 ea_foreach 0 39133 NULL
120867 +generic_permission_39150 generic_permission 0 39150 NULL
120868 +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
120869 +ath9k_hw_ar9003_dump_eeprom_39156 ath9k_hw_ar9003_dump_eeprom 5-4 39156 NULL
120870 +echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
120871 +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
120872 +mlx4_en_create_tx_ring_39179 mlx4_en_create_tx_ring 4 39179 NULL
120873 +ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
120874 +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
120875 +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
120876 +SyS_getrandom_39235 SyS_getrandom 2 39235 NULL
120877 +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
120878 +snd_pcm_capture_forward_39248 snd_pcm_capture_forward 2 39248 NULL
120879 +r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
120880 +pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250
120881 +i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
120882 +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
120883 +_iwl_dbgfs_pm_params_write_39325 _iwl_dbgfs_pm_params_write 3 39325 NULL
120884 +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
120885 +insert_reserved_file_extent_39327 insert_reserved_file_extent 3 39327 NULL
120886 +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
120887 +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
120888 +do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
120889 +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
120890 +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
120891 +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
120892 +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
120893 +__send_to_port_39386 __send_to_port 3 39386 NULL
120894 +user_power_read_39414 user_power_read 3 39414 NULL
120895 +hash_ipmark4_expire_39419 hash_ipmark4_expire 4 39419 NULL
120896 +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
120897 +mic_desc_size_39464 mic_desc_size 0 39464 NULL
120898 +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
120899 +usif_ioctl_39481 usif_ioctl 3 39481 NULL
120900 +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
120901 +cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
120902 +int_proc_write_39542 int_proc_write 3 39542 NULL
120903 +pp_write_39554 pp_write 3 39554 NULL
120904 +datablob_format_39571 datablob_format 2 39571 NULL nohasharray
120905 +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
120906 +memblock_virt_alloc_internal_39600 memblock_virt_alloc_internal 1 39600 NULL
120907 +ext_depth_39607 ext_depth 0 39607 NULL
120908 +batadv_tt_tvlv_generate_39615 batadv_tt_tvlv_generate 4 39615 NULL
120909 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
120910 +sdio_readb_39618 sdio_readb 0 39618 NULL
120911 +set_dev_class_39645 set_dev_class 4 39645 NULL
120912 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
120913 +tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
120914 +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
120915 +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
120916 +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
120917 +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
120918 +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
120919 +adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
120920 +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
120921 +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
120922 +get_priv_size_39828 get_priv_size 0-1 39828 NULL
120923 +netlbl_catmap_walkrng_39885 netlbl_catmap_walkrng 0-2 39885 NULL
120924 +pkt_add_39897 pkt_add 3 39897 NULL
120925 +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
120926 +gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
120927 +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
120928 +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
120929 +oom_score_adj_read_39921 oom_score_adj_read 3 39921 NULL nohasharray
120930 +exofs_read_kern_39921 exofs_read_kern 6 39921 &oom_score_adj_read_39921
120931 +__spi_async_39932 __spi_async 0 39932 NULL
120932 +__get_order_39935 __get_order 0 39935 NULL
120933 +error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
120934 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
120935 +lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
120936 +bio_chain_clone_range_39967 bio_chain_clone_range 3 39967 NULL
120937 +dma_push_rx_39973 dma_push_rx 2 39973 NULL
120938 +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
120939 +lustre_pack_reply_v2_39978 lustre_pack_reply_v2 2 39978 NULL
120940 +mthca_array_init_39987 mthca_array_init 2 39987 NULL
120941 +fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
120942 +server_name2svname_39998 server_name2svname 4 39998 NULL
120943 +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
120944 +ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
120945 +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
120946 +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
120947 +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
120948 +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 NULL nohasharray
120949 +add_tty_40055 add_tty 1 40055 &l2cap_create_iframe_pdu_40055
120950 +atomic_xchg_40070 atomic_xchg 0 40070 NULL
120951 +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
120952 +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
120953 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
120954 +ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL nohasharray
120955 +kvm_mmu_notifier_clear_flush_young_40143 kvm_mmu_notifier_clear_flush_young 3-4 40143 &ath10k_write_simulate_fw_crash_40143
120956 +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
120957 +pt_write_40159 pt_write 3 40159 NULL
120958 +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
120959 +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL
120960 +allocate_probes_40204 allocate_probes 1 40204 NULL
120961 +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
120962 +compress_file_range_40225 compress_file_range 3-4 40225 NULL
120963 +ocrdma_dbgfs_ops_read_40232 ocrdma_dbgfs_ops_read 3 40232 NULL
120964 +osst_read_40237 osst_read 3 40237 NULL
120965 +lpage_info_slot_40243 lpage_info_slot 1-3 40243 NULL
120966 +ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL
120967 +of_get_child_count_40254 of_get_child_count 0 40254 NULL nohasharray
120968 +fsl_edma_prep_dma_cyclic_40254 fsl_edma_prep_dma_cyclic 3-4 40254 &of_get_child_count_40254
120969 +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
120970 +ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
120971 +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
120972 +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
120973 +tracing_thresh_read_40295 tracing_thresh_read 3 40295 NULL
120974 +SyS_bind_40303 SyS_bind 3 40303 NULL
120975 +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
120976 +mmio_read_40348 mmio_read 4 40348 NULL
120977 +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
120978 +ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
120979 +get_chars_40373 get_chars 3 40373 NULL
120980 +fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
120981 +proc_write_driver_40432 proc_write_driver 3 40432 NULL
120982 +repair_io_failure_40452 repair_io_failure 4-3 40452 NULL
120983 +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
120984 +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
120985 +gp2ap020a00f_write_event_threshold_40461 gp2ap020a00f_write_event_threshold 2 40461 NULL
120986 +SyS_writev_40467 SyS_writev 3 40467 NULL
120987 +SyS_select_40473 SyS_select 1 40473 NULL
120988 +afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
120989 +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
120990 +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
120991 +__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
120992 +TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
120993 +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
120994 +ima_write_policy_40548 ima_write_policy 3 40548 NULL
120995 +esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
120996 +bl_alloc_init_bio_40569 bl_alloc_init_bio 1 40569 NULL
120997 +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
120998 +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
120999 +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
121000 +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
121001 +fops_read_40672 fops_read 3 40672 NULL
121002 +idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
121003 +alloc_rbio_40676 alloc_rbio 4 40676 NULL
121004 +videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 4-3 40678 NULL
121005 +pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
121006 +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
121007 +__seq_open_private_40715 __seq_open_private 3 40715 NULL
121008 +lnet_new_text_buf_40717 lnet_new_text_buf 1 40717 NULL
121009 +ip_skb_dst_mtu_40718 ip_skb_dst_mtu 0 40718 NULL
121010 +of_pdt_build_one_prop_40735 of_pdt_build_one_prop 5 40735 NULL
121011 +fuse_readpages_40737 fuse_readpages 4 40737 NULL
121012 +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL
121013 +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
121014 +card_send_command_40757 card_send_command 3 40757 NULL
121015 +ad1889_readl_40765 ad1889_readl 0 40765 NULL
121016 +pg_write_40766 pg_write 3 40766 NULL
121017 +kernfs_fop_read_40770 kernfs_fop_read 3 40770 NULL
121018 +show_list_40775 show_list 3-0 40775 NULL
121019 +kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL
121020 +bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
121021 +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
121022 +rtw_add_beacon_40801 rtw_add_beacon 3-5 40801 NULL
121023 +add_action_40811 add_action 4 40811 NULL
121024 +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
121025 +nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
121026 +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
121027 +read_file_queue_40895 read_file_queue 3 40895 NULL
121028 +waiters_read_40902 waiters_read 3 40902 NULL
121029 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
121030 +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
121031 +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
121032 +snd_vx_create_40948 snd_vx_create 4 40948 NULL
121033 +path_listxattr_40949 path_listxattr 3 40949 NULL
121034 +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
121035 +ima_appraise_measurement_40978 ima_appraise_measurement 6 40978 NULL
121036 +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
121037 +iwl_dbgfs_scan_ant_rxchain_read_40999 iwl_dbgfs_scan_ant_rxchain_read 3 40999 NULL
121038 +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
121039 +get_pages_alloc_bvec_41012 get_pages_alloc_bvec 0-3 41012 NULL
121040 +__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
121041 +_req_append_segment_41031 _req_append_segment 2 41031 NULL
121042 +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
121043 +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
121044 +lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
121045 +vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
121046 +beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
121047 +sc_only_mode_read_41076 sc_only_mode_read 3 41076 NULL
121048 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
121049 +nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 NULL nohasharray
121050 +roccat_read_41093 roccat_read 3 41093 &nvme_map_user_pages_41093
121051 +dma_attach_41094 dma_attach 5-6 41094 NULL
121052 +nl80211_send_mlme_event_41099 nl80211_send_mlme_event 4 41099 NULL
121053 +provide_user_output_41105 provide_user_output 3 41105 NULL
121054 +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
121055 +ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
121056 +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
121057 +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
121058 +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
121059 +netif_get_num_default_rss_queues_41187 netif_get_num_default_rss_queues 0 41187 NULL
121060 +dfs_file_write_41196 dfs_file_write 3 41196 NULL
121061 +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
121062 +cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
121063 +hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
121064 +erst_read_41260 erst_read 0 41260 NULL
121065 +alloc_context_41283 alloc_context 1 41283 NULL
121066 +of_count_phandle_with_args_41291 of_count_phandle_with_args 0 41291 NULL
121067 +virtscsi_change_queue_depth_41327 virtscsi_change_queue_depth 2 41327 NULL
121068 +o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
121069 +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
121070 +rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
121071 +ceph_do_getattr_41349 ceph_do_getattr 0 41349 NULL
121072 +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
121073 +kmp_init_41373 kmp_init 2 41373 NULL
121074 +isr_commands_read_41398 isr_commands_read 3 41398 NULL
121075 +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
121076 +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
121077 +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
121078 +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
121079 +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
121080 +ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
121081 +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
121082 +se_io_cb_41461 se_io_cb 3 41461 NULL
121083 +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
121084 +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
121085 +bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
121086 +kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
121087 +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
121088 +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
121089 +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
121090 +SyS_preadv_41523 SyS_preadv 3 41523 NULL
121091 +dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
121092 +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
121093 +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
121094 +nr_status_frames_41559 nr_status_frames 0-1 41559 NULL nohasharray
121095 +si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 &nr_status_frames_41559
121096 +rng_dev_read_41581 rng_dev_read 3 41581 NULL
121097 +nfsd_readv_41585 nfsd_readv 4 41585 NULL
121098 +batadv_tvlv_container_ogm_append_41588 batadv_tvlv_container_ogm_append 4 41588 NULL
121099 +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
121100 +lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
121101 +usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
121102 +a2mp_send_41615 a2mp_send 4 41615 NULL
121103 +lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
121104 +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
121105 +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
121106 +get_std_timing_41654 get_std_timing 0 41654 NULL
121107 +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
121108 +fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
121109 +lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
121110 +connector_write_41709 connector_write 3 41709 NULL
121111 +fillonedir_41746 fillonedir 3 41746 NULL
121112 +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
121113 +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
121114 +ptlrpc_new_bulk_41804 ptlrpc_new_bulk 1 41804 NULL
121115 +rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
121116 +sco_send_frame_41815 sco_send_frame 3 41815 NULL
121117 +kimage_file_alloc_init_41827 kimage_file_alloc_init 5 41827 NULL
121118 +copy_page_to_iter_bvec_41830 copy_page_to_iter_bvec 0-3 41830 NULL
121119 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
121120 +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
121121 +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
121122 +pci_map_single_41869 pci_map_single 0 41869 NULL
121123 +usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
121124 +v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
121125 +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
121126 +ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 4-3 41935 NULL
121127 +sci_rxfill_41945 sci_rxfill 0 41945 NULL
121128 +read_gssp_41947 read_gssp 3 41947 NULL
121129 +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
121130 +portnames_read_41958 portnames_read 3 41958 NULL
121131 +dst_mtu_41969 dst_mtu 0 41969 NULL
121132 +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
121133 +pool_allocate_42012 pool_allocate 3 42012 NULL
121134 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
121135 +rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
121136 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
121137 +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
121138 +alloc_trace_kprobe_42041 alloc_trace_kprobe 6 42041 NULL
121139 +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
121140 +jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
121141 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
121142 +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
121143 +ufshcd_dev_cmd_completion_42080 ufshcd_dev_cmd_completion 0 42080 NULL
121144 +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
121145 +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
121146 +submit_inquiry_42108 submit_inquiry 3 42108 NULL
121147 +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 NULL
121148 +blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
121149 +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
121150 +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
121151 +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
121152 +write_file_beacon_42185 write_file_beacon 3 42185 NULL
121153 +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
121154 +blockdev_direct_IO_42235 blockdev_direct_IO 5 42235 NULL nohasharray
121155 +pla_ocp_read_42235 pla_ocp_read 3 42235 &blockdev_direct_IO_42235
121156 +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
121157 +find_last_bit_42260 find_last_bit 0 42260 NULL
121158 +__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
121159 +__tty_buffer_request_room_42276 __tty_buffer_request_room 2-0 42276 NULL
121160 +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
121161 +__cpus_weight_42299 __cpus_weight 2-0 42299 NULL
121162 +sel_read_perm_42302 sel_read_perm 3 42302 NULL
121163 +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
121164 +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
121165 +xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL
121166 +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
121167 +tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
121168 +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
121169 +drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
121170 +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
121171 +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
121172 +krng_get_random_42420 krng_get_random 3 42420 NULL
121173 +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
121174 +spr_wm_latency_write_42441 spr_wm_latency_write 3 42441 NULL
121175 +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
121176 +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
121177 +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
121178 +kuc_free_42455 kuc_free 2 42455 NULL
121179 +cp2112_gpio_get_42467 cp2112_gpio_get 2 42467 NULL
121180 +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
121181 +omfs_readpages_42490 omfs_readpages 4 42490 NULL
121182 +bypass_write_42498 bypass_write 3 42498 NULL
121183 +SyS_mincore_42511 SyS_mincore 1-2 42511 NULL
121184 +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
121185 +dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
121186 +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
121187 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
121188 +ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
121189 +udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
121190 +iwl_print_event_log_42566 iwl_print_event_log 0-7-5 42566 NULL
121191 +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
121192 +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
121193 +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
121194 +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
121195 +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
121196 +parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL nohasharray
121197 +num_controllers_42644 num_controllers 0 42644 &parport_pc_compat_write_block_pio_42644
121198 +_regmap_raw_write_42652 _regmap_raw_write 4-2 42652 NULL
121199 +request_key_and_link_42693 request_key_and_link 4 42693 NULL
121200 +vb2_read_42703 vb2_read 3 42703 NULL
121201 +read_status_42722 read_status 0 42722 NULL
121202 +iwl_mvm_coex_dump_mbox_old_42727 iwl_mvm_coex_dump_mbox_old 4-3-0 42727 NULL
121203 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
121204 +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
121205 +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
121206 +dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
121207 +x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
121208 +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
121209 +cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
121210 +isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
121211 +elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
121212 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
121213 +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0 42796 NULL
121214 +fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
121215 +drm_ioctl_42813 drm_ioctl 2 42813 NULL
121216 +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
121217 +set_arg_42824 set_arg 3 42824 NULL
121218 +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
121219 +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
121220 +nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
121221 +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
121222 +hd_end_request_42904 hd_end_request 2 42904 NULL
121223 +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
121224 +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
121225 +vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
121226 +ntb_setup_snb_msix_42971 ntb_setup_snb_msix 2 42971 NULL
121227 +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
121228 +nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL nohasharray
121229 +rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
121230 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
121231 +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
121232 +__bioset_create_43059 __bioset_create 1 43059 NULL
121233 +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
121234 +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
121235 +_xfer_secondary_pool_43089 _xfer_secondary_pool 2 43089 NULL
121236 +sysfs_create_file_ns_43103 sysfs_create_file_ns 0 43103 NULL
121237 +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
121238 +calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
121239 +read_file_dfs_43145 read_file_dfs 3 43145 NULL
121240 +cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
121241 +usb_string_sub_43164 usb_string_sub 0 43164 NULL
121242 +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
121243 +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
121244 +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
121245 +uio_write_43202 uio_write 3 43202 NULL
121246 +iso_callback_43208 iso_callback 3 43208 NULL
121247 +ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
121248 +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
121249 +atomic_long_add_return_43217 atomic_long_add_return 1 43217 NULL
121250 +gfs2_direct_IO_43220 gfs2_direct_IO 4 43220 NULL
121251 +batadv_tt_tvlv_unicast_handler_v1_43239 batadv_tt_tvlv_unicast_handler_v1 5 43239 NULL
121252 +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
121253 +ide_end_rq_43269 ide_end_rq 4 43269 NULL
121254 +evtchn_write_43278 evtchn_write 3 43278 NULL nohasharray
121255 +parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 &evtchn_write_43278
121256 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
121257 +mpage_alloc_43299 mpage_alloc 3 43299 NULL
121258 +mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL
121259 +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
121260 +xenfb_write_43412 xenfb_write 3 43412 NULL
121261 +ext4_xattr_check_names_43422 ext4_xattr_check_names 0 43422 NULL
121262 +__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
121263 +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
121264 +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
121265 +usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray
121266 +usb_string_43443 usb_string 0 43443 &usemap_size_43443
121267 +get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
121268 +fs_path_prepare_for_add_43453 fs_path_prepare_for_add 2 43453 NULL
121269 +nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
121270 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
121271 +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
121272 +ll_direct_IO_26_43530 ll_direct_IO_26 4 43530 NULL
121273 +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
121274 +read_events_43534 read_events 3 43534 NULL
121275 +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
121276 +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL
121277 +request_resource_43548 request_resource 0 43548 NULL
121278 +rpc_malloc_43573 rpc_malloc 2 43573 NULL
121279 +handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL
121280 +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
121281 +proc_read_43614 proc_read 3 43614 NULL
121282 +disable_dma_on_even_43618 disable_dma_on_even 0 43618 NULL
121283 +alloc_thread_groups_43625 alloc_thread_groups 2 43625 NULL
121284 +random_write_43656 random_write 3 43656 NULL
121285 +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
121286 +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
121287 +write_file_tx99_power_43670 write_file_tx99_power 3 43670 NULL
121288 +dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
121289 +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
121290 +nvkm_connector_create__43711 nvkm_connector_create_ 6 43711 NULL
121291 +fuse_send_read_43725 fuse_send_read 4-0 43725 NULL
121292 +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
121293 +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
121294 +__alloc_alien_cache_43734 __alloc_alien_cache 2 43734 NULL
121295 +fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
121296 +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
121297 +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
121298 +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
121299 +byte_pos_43787 byte_pos 0 43787 &ocfs2_xattr_get_value_outside_43787
121300 +btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
121301 +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
121302 +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
121303 +read_flush_43851 read_flush 3 43851 NULL
121304 +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
121305 +ec_dbgfs_cmd_write_43895 ec_dbgfs_cmd_write 3 43895 NULL
121306 +SendString_43928 SendString 3 43928 NULL
121307 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
121308 +__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
121309 +nla_reserve_43984 nla_reserve 3 43984 NULL
121310 +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
121311 +kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 NULL nohasharray
121312 +scsi_command_size_43992 scsi_command_size 0 43992 &kvm_read_guest_virt_43992 nohasharray
121313 +bcm_recvmsg_43992 bcm_recvmsg 4 43992 &scsi_command_size_43992
121314 +emit_flags_44006 emit_flags 4-3 44006 NULL
121315 +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
121316 +fru_strlen_44046 fru_strlen 0 44046 NULL
121317 +ath9k_def_dump_modal_eeprom_44078 ath9k_def_dump_modal_eeprom 3-2-0 44078 NULL
121318 +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
121319 +pci_msix_vec_count_44093 pci_msix_vec_count 0 44093 NULL
121320 +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
121321 +skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
121322 +nouveau_clock_create__44116 nouveau_clock_create_ 6 44116 NULL
121323 +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
121324 +SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
121325 +tracing_resize_saved_cmdlines_44140 tracing_resize_saved_cmdlines 1 44140 NULL
121326 +ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
121327 +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
121328 +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
121329 +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
121330 +readreg_ipac_44186 readreg_ipac 0 44186 NULL
121331 +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
121332 +btrfs_item_offset_nr_44220 btrfs_item_offset_nr 0 44220 NULL
121333 +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
121334 +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
121335 +sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
121336 +device_create_file_44285 device_create_file 0 44285 NULL
121337 +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
121338 +bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
121339 +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
121340 +ccp_init_data_44324 ccp_init_data 5 44324 NULL
121341 +rs_init_44327 rs_init 1 44327 NULL
121342 +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray
121343 +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355
121344 +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
121345 +mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
121346 +aoedev_flush_44398 aoedev_flush 2 44398 NULL
121347 +strlcpy_44400 strlcpy 3 44400 NULL
121348 +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
121349 +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
121350 +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
121351 +mic_virtio_copy_to_user_44472 mic_virtio_copy_to_user 3-4 44472 NULL
121352 +write_file_debug_44476 write_file_debug 3 44476 NULL
121353 +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
121354 +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
121355 +bio_advance_44496 bio_advance 2 44496 NULL
121356 +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
121357 +ac_register_board_44504 ac_register_board 3 44504 NULL
121358 +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
121359 +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
121360 +spidev_write_44510 spidev_write 3 44510 NULL
121361 +SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
121362 +ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
121363 +comm_write_44537 comm_write 3 44537 NULL
121364 +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
121365 +l2cap_sock_memcpy_fromiovec_cb_44573 l2cap_sock_memcpy_fromiovec_cb 4 44573 NULL
121366 +nouveau_perfmon_create__44602 nouveau_perfmon_create_ 4 44602 NULL
121367 +xpcs_mmd_write_44633 xpcs_mmd_write 3 44633 NULL
121368 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
121369 +mpi_resize_44674 mpi_resize 2 44674 NULL
121370 +sysfs_create_link_44685 sysfs_create_link 0 44685 NULL
121371 +ts_read_44687 ts_read 3 44687 NULL
121372 +write_file_spectral_bins_44696 write_file_spectral_bins 3 44696 NULL
121373 +lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
121374 +C_SYSC_select_44701 C_SYSC_select 1 44701 NULL
121375 +__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 NULL nohasharray
121376 +xfer_to_user_44713 xfer_to_user 3 44713 &__generic_block_fiemap_44713
121377 +nft_hash_tbl_size_44724 nft_hash_tbl_size 0 44724 NULL
121378 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
121379 +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
121380 +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
121381 +efx_wanted_parallelism_44732 efx_wanted_parallelism 0 44732 NULL
121382 +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
121383 +bch_bio_max_sectors_44755 bch_bio_max_sectors 0 44755 NULL
121384 +tnode_new_44757 tnode_new 3 44757 NULL nohasharray
121385 +pty_write_44757 pty_write 3 44757 &tnode_new_44757
121386 +__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
121387 +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
121388 +irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
121389 +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
121390 +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
121391 +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
121392 +force_static_address_write_44819 force_static_address_write 3 44819 NULL
121393 +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
121394 +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
121395 +sisusb_write_44834 sisusb_write 3 44834 NULL
121396 +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
121397 +qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
121398 +copydesc_user_44855 copydesc_user 3 44855 NULL
121399 +set_advertising_44870 set_advertising 4 44870 NULL
121400 +init_rs_44873 init_rs 1 44873 NULL
121401 +skb_availroom_44883 skb_availroom 0 44883 NULL
121402 +do_tty_write_44896 do_tty_write 5 44896 NULL
121403 +regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
121404 +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
121405 +bytepos_delta_45017 bytepos_delta 0 45017 NULL
121406 +ptrace_writedata_45021 ptrace_writedata 4 45021 NULL
121407 +dm_kvzalloc_45025 dm_kvzalloc 1 45025 NULL
121408 +sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
121409 +sel_write_user_45060 sel_write_user 3 45060 NULL
121410 +snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
121411 +lnet_expand1tb_45102 lnet_expand1tb 6 45102 NULL
121412 +snd_card_new_45104 snd_card_new 5 45104 NULL
121413 +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
121414 +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
121415 +usbdev_read_45114 usbdev_read 3 45114 NULL
121416 +send_to_tty_45141 send_to_tty 3 45141 NULL
121417 +cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
121418 +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
121419 +device_write_45156 device_write 3 45156 NULL nohasharray
121420 +ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 &device_write_45156
121421 +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
121422 +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
121423 +snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL nohasharray
121424 +sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 &snd_sb_csp_load_user_45190
121425 +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
121426 +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
121427 +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
121428 +event_enable_write_45238 event_enable_write 3 45238 NULL
121429 +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
121430 +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
121431 +gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
121432 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
121433 +e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
121434 +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
121435 +brcmf_sdio_died_dump_45359 brcmf_sdio_died_dump 3 45359 NULL
121436 +null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
121437 +count_skb_frag_slots_45395 count_skb_frag_slots 0 45395 NULL
121438 +sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
121439 +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL
121440 +ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
121441 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
121442 +blkdev_direct_IO_45440 blkdev_direct_IO 4 45440 NULL
121443 +__node_remap_45458 __node_remap 4 45458 NULL
121444 +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
121445 +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
121446 +__calc_request_pg_45470 __calc_request_pg 0 45470 NULL
121447 +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
121448 +copy_macs_45534 copy_macs 4 45534 NULL
121449 +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
121450 +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
121451 +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
121452 +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
121453 +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
121454 +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
121455 +venus_rmdir_45564 venus_rmdir 4 45564 NULL
121456 +ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
121457 +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
121458 +ip_dst_mtu_maybe_forward_45627 ip_dst_mtu_maybe_forward 0 45627 NULL
121459 +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
121460 +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
121461 +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
121462 +bscnl_emit_45699 bscnl_emit 2-5-0 45699 NULL nohasharray
121463 +unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 &bscnl_emit_45699
121464 +sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
121465 +wlcore_smart_config_decode_event_45714 wlcore_smart_config_decode_event 2-4 45714 NULL
121466 +snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
121467 +rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
121468 +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
121469 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
121470 +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
121471 +osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
121472 +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
121473 +rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
121474 +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
121475 +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
121476 +ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
121477 +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
121478 +ipv6_recv_rxpmtu_45830 ipv6_recv_rxpmtu 3 45830 NULL
121479 +x509_process_extension_45854 x509_process_extension 5 45854 NULL
121480 +efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
121481 +isdn_write_45863 isdn_write 3 45863 NULL
121482 +get_rdac_req_45882 get_rdac_req 3 45882 NULL
121483 +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
121484 +cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
121485 +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
121486 +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
121487 +btree_keys_cachelines_45928 btree_keys_cachelines 0 45928 NULL
121488 +alloc_mr_45935 alloc_mr 1 45935 NULL
121489 +copy_to_45969 copy_to 3 45969 NULL
121490 +rb_simple_read_45972 rb_simple_read 3 45972 NULL
121491 +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
121492 +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
121493 +fnic_reset_stats_read_46030 fnic_reset_stats_read 3 46030 NULL nohasharray
121494 +get_free_entries_46030 get_free_entries 1 46030 &fnic_reset_stats_read_46030
121495 +__access_remote_vm_46031 __access_remote_vm 0 46031 NULL
121496 +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
121497 +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 NULL nohasharray
121498 +__ocfs2_move_extent_46060 __ocfs2_move_extent 3-4 46060 &dma_tx_errors_read_46060
121499 +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
121500 +memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
121501 +il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
121502 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
121503 +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
121504 +rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
121505 +vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 3-2 46146 NULL
121506 +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
121507 +twl_direction_out_46182 twl_direction_out 2 46182 NULL
121508 +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
121509 +fq_resize_46195 fq_resize 2 46195 NULL
121510 +add_conn_list_46197 add_conn_list 3-0 46197 NULL
121511 +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
121512 +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
121513 +dsp_write_46218 dsp_write 2 46218 NULL
121514 +hash_netiface4_expire_46226 hash_netiface4_expire 4 46226 NULL
121515 +xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
121516 +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
121517 +sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
121518 +C_SYSC_ppoll_46319 C_SYSC_ppoll 2 46319 NULL
121519 +__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
121520 +compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
121521 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
121522 +smk_write_direct_46363 smk_write_direct 3 46363 NULL
121523 +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
121524 +ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
121525 +cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
121526 +wdata_alloc_and_fillpages_46437 wdata_alloc_and_fillpages 1 46437 NULL
121527 +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
121528 +parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
121529 +il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
121530 +filldir64_46469 filldir64 3 46469 NULL
121531 +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
121532 +pin_code_reply_46510 pin_code_reply 4 46510 NULL
121533 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
121534 +kmsg_read_46514 kmsg_read 3 46514 NULL nohasharray
121535 +nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 &kmsg_read_46514
121536 +nlm_end_grace_write_46517 nlm_end_grace_write 3 46517 NULL
121537 +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
121538 +__btrfs_free_extent_46573 __btrfs_free_extent 7 46573 NULL
121539 +dn_current_mss_46574 dn_current_mss 0 46574 NULL
121540 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
121541 +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
121542 +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
121543 +vscnprintf_46617 vscnprintf 0-2 46617 NULL
121544 +__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL
121545 +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
121546 +pci_enable_device_46642 pci_enable_device 0 46642 NULL
121547 +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
121548 +e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
121549 +l2cap_create_le_flowctl_pdu_46682 l2cap_create_le_flowctl_pdu 3 46682 NULL
121550 +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
121551 +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
121552 +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
121553 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
121554 +irq_domain_add_simple_46734 irq_domain_add_simple 2 46734 NULL
121555 +read_file_tx99_46741 read_file_tx99 3 46741 NULL
121556 +ext4_count_free_46754 ext4_count_free 2 46754 NULL
121557 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
121558 +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
121559 +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
121560 +shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
121561 +readreg_46845 readreg 0 46845 NULL
121562 +spi_async_46857 spi_async 0 46857 NULL
121563 +vsnprintf_46863 vsnprintf 0 46863 NULL
121564 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
121565 +qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
121566 +lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
121567 +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
121568 +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
121569 +alloc_cmdid_46904 alloc_cmdid 0 46904 NULL
121570 +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
121571 +wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
121572 +fb_write_46924 fb_write 3 46924 NULL
121573 +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
121574 +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
121575 +SYSC_poll_46965 SYSC_poll 2 46965 NULL
121576 +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
121577 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
121578 +strlcat_46985 strlcat 3 46985 NULL
121579 +bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
121580 +sel_write_bool_46996 sel_write_bool 3 46996 NULL
121581 +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
121582 +cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
121583 +fs_path_len_47060 fs_path_len 0 47060 NULL
121584 +event_trigger_regex_write_47067 event_trigger_regex_write 3 47067 NULL
121585 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
121586 +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
121587 +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
121588 +ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
121589 +mousedev_read_47123 mousedev_read 3 47123 NULL
121590 +upcall_msg_size_47141 upcall_msg_size 2 47141 NULL
121591 +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 NULL nohasharray
121592 +ses_recv_diag_47143 ses_recv_diag 4 47143 &acpi_ut_initialize_buffer_47143
121593 +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
121594 +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
121595 +options_write_47243 options_write 3 47243 NULL
121596 +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
121597 +ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
121598 +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
121599 +vsnprintf_47291 vsnprintf 0 47291 NULL
121600 +SYSC_semop_47292 SYSC_semop 3 47292 NULL
121601 +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
121602 +virtqueue_add_47306 virtqueue_add 3 47306 NULL
121603 +nouveau_fb_create__47316 nouveau_fb_create_ 4 47316 NULL
121604 +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
121605 +nvme_submit_admin_cmd_47357 nvme_submit_admin_cmd 0 47357 NULL
121606 +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
121607 +kvm_arch_create_memslot_47364 kvm_arch_create_memslot 3 47364 NULL nohasharray
121608 +__output_copy_user_47364 __output_copy_user 3 47364 &kvm_arch_create_memslot_47364
121609 +__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
121610 +nv_rd32_47390 nv_rd32 0 47390 NULL nohasharray
121611 +trace_options_core_read_47390 trace_options_core_read 3 47390 &nv_rd32_47390
121612 +nametbl_list_47391 nametbl_list 2 47391 NULL
121613 +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
121614 +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
121615 +lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
121616 +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
121617 +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
121618 +lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
121619 +C_SYSC_set_mempolicy_47466 C_SYSC_set_mempolicy 3 47466 NULL
121620 +lprocfs_fid_write_common_47471 lprocfs_fid_write_common 2 47471 NULL
121621 +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
121622 +newpart_47485 newpart 6-4 47485 NULL
121623 +mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
121624 +core_sys_select_47494 core_sys_select 1 47494 NULL
121625 +as3722_block_write_47503 as3722_block_write 2-3 47503 NULL
121626 +alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
121627 +unlink_simple_47506 unlink_simple 3 47506 NULL
121628 +pstore_decompress_47510 pstore_decompress 0 47510 NULL
121629 +ec_i2c_count_response_47518 ec_i2c_count_response 0 47518 NULL
121630 +__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
121631 +process_vm_rw_47533 process_vm_rw 3-5 47533 NULL nohasharray
121632 +vscnprintf_47533 vscnprintf 0-2 47533 &process_vm_rw_47533
121633 +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
121634 +drbg_statelen_47551 drbg_statelen 0 47551 NULL
121635 +read_ldt_47570 read_ldt 2 47570 NULL
121636 +isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
121637 +btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
121638 +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
121639 +sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
121640 +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
121641 +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
121642 +ccp_sha_setkey_47633 ccp_sha_setkey 3 47633 NULL
121643 +get_size_47644 get_size 1-2 47644 NULL
121644 +osc_brw_prep_request_47680 osc_brw_prep_request 5 47680 NULL
121645 +packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
121646 +ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
121647 +save_microcode_47717 save_microcode 3 47717 NULL
121648 +bits_to_user_47733 bits_to_user 2-3 47733 NULL
121649 +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
121650 +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
121651 +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
121652 +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
121653 +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
121654 +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
121655 +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
121656 +ptlrpc_prep_req_47792 ptlrpc_prep_req 4 47792 NULL
121657 +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
121658 +W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
121659 +lov_packmd_47810 lov_packmd 0 47810 NULL
121660 +tree_mod_log_insert_move_47823 tree_mod_log_insert_move 5 47823 NULL
121661 +read_file_spectral_bins_47829 read_file_spectral_bins 3 47829 NULL
121662 +pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
121663 +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
121664 +vhci_read_47878 vhci_read 3 47878 NULL
121665 +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
121666 +cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
121667 +comedi_write_47926 comedi_write 3 47926 NULL
121668 +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
121669 +arch_setup_msi_irq_47959 arch_setup_msi_irq 0 47959 NULL
121670 +gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
121671 +mempool_resize_47983 mempool_resize 2 47983 NULL nohasharray
121672 +iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 &mempool_resize_47983
121673 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
121674 +ib_umad_write_47993 ib_umad_write 3 47993 NULL
121675 +lustre_cfg_len_48002 lustre_cfg_len 0-1 48002 NULL
121676 +gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
121677 +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
121678 +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
121679 +SYSC_writev_48040 SYSC_writev 3 48040 NULL
121680 +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
121681 +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
121682 +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
121683 +disc_write_48070 disc_write 3 48070 NULL
121684 +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
121685 +skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
121686 +wm_latency_write_48125 wm_latency_write 3 48125 NULL
121687 +load_firmware_48128 load_firmware 2 48128 NULL
121688 +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
121689 +set_discoverable_48141 set_discoverable 4 48141 NULL
121690 +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
121691 +SyS_vmsplice_48150 SyS_vmsplice 3 48150 NULL
121692 +_add_to_r4w_48152 _add_to_r4w 4 48152 NULL
121693 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
121694 +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
121695 +rbd_obj_method_sync_48170 rbd_obj_method_sync 8 48170 NULL
121696 +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
121697 +cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
121698 +ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
121699 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
121700 +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
121701 +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
121702 +read_file_recv_48232 read_file_recv 3 48232 NULL
121703 +unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL
121704 +nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
121705 +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
121706 +batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
121707 +__videobuf_free_48260 __videobuf_free 0 48260 NULL
121708 +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
121709 +trace_options_write_48275 trace_options_write 3 48275 NULL
121710 +send_set_info_48288 send_set_info 7 48288 NULL
121711 +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
121712 +timblogiw_read_48305 timblogiw_read 3 48305 NULL
121713 +hash_setkey_48310 hash_setkey 3 48310 NULL
121714 +kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
121715 +skb_add_data_48363 skb_add_data 3 48363 NULL
121716 +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
121717 +ath10k_read_htt_max_amsdu_ampdu_48401 ath10k_read_htt_max_amsdu_ampdu 3 48401 NULL
121718 +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
121719 +uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
121720 +div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
121721 +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
121722 +print_filtered_48442 print_filtered 2-0 48442 NULL
121723 +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
121724 +copy_page_from_iter_iovec_48466 copy_page_from_iter_iovec 3-0 48466 NULL
121725 +compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
121726 +_iwl_dbgfs_bt_tx_prio_write_48473 _iwl_dbgfs_bt_tx_prio_write 3 48473 NULL
121727 +ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
121728 +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
121729 +ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL
121730 +send_control_msg_48498 send_control_msg 6 48498 NULL
121731 +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
121732 +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
121733 +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
121734 +phantom_get_free_48514 phantom_get_free 0 48514 NULL
121735 +drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
121736 +raid10_size_48571 raid10_size 0-2-3 48571 NULL
121737 +nvif_notify_init_48578 nvif_notify_init 7 48578 NULL
121738 +llog_data_len_48607 llog_data_len 1 48607 NULL
121739 +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
121740 +kernel_sock_ioctl_48644 kernel_sock_ioctl 0 48644 NULL
121741 +ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
121742 +mtd_read_48655 mtd_read 0 48655 NULL
121743 +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
121744 +sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL
121745 +hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
121746 +altera_drscan_48698 altera_drscan 2 48698 NULL
121747 +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
121748 +lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
121749 +SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
121750 +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
121751 +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
121752 +l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
121753 +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
121754 +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
121755 +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
121756 +azx_get_position_48841 azx_get_position 0 48841 NULL
121757 +vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
121758 +comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
121759 +suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
121760 +viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 NULL nohasharray
121761 +C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 &viafb_dvp1_proc_write_48864
121762 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
121763 +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
121764 +joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
121765 +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
121766 +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
121767 +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
121768 +si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
121769 +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
121770 +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
121771 +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
121772 +nilfs_direct_IO_48981 nilfs_direct_IO 4 48981 NULL
121773 +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
121774 +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
121775 +null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
121776 +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
121777 +transient_status_49027 transient_status 4 49027 NULL
121778 +ll_xattr_cache_add_49032 ll_xattr_cache_add 4-0 49032 NULL
121779 +scsi_register_49094 scsi_register 2 49094 NULL
121780 +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
121781 +xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
121782 +ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
121783 +pt_read_49136 pt_read 3 49136 NULL nohasharray
121784 +netxen_setup_msi_interrupts_49136 netxen_setup_msi_interrupts 2 49136 &pt_read_49136
121785 +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
121786 +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
121787 +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
121788 +__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
121789 +ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
121790 +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
121791 +print_queue_49191 print_queue 0-4 49191 NULL
121792 +root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
121793 +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
121794 +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
121795 +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
121796 +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
121797 +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
121798 +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
121799 +ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
121800 +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
121801 +viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
121802 +uio_read_49300 uio_read 3 49300 NULL
121803 +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
121804 +SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
121805 +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
121806 +srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
121807 +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
121808 +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
121809 +ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
121810 +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
121811 +tnode_alloc_49407 tnode_alloc 1 49407 NULL
121812 +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
121813 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
121814 +__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
121815 +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
121816 +xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
121817 +tipc_bclink_get_mtu_49483 tipc_bclink_get_mtu 0 49483 NULL
121818 +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
121819 +iwl_dbgfs_disable_power_off_read_49517 iwl_dbgfs_disable_power_off_read 3 49517 NULL
121820 +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
121821 +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
121822 +smk_write_access_49561 smk_write_access 3 49561 NULL
121823 +alloc_chunk_49575 alloc_chunk 1 49575 NULL
121824 +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
121825 +readfifo_49583 readfifo 1 49583 NULL
121826 +tap_write_49595 tap_write 3 49595 NULL
121827 +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
121828 +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
121829 +heap_init_49617 heap_init 2 49617 NULL
121830 +smk_write_doi_49621 smk_write_doi 3 49621 NULL
121831 +port_fops_read_49626 port_fops_read 3 49626 NULL
121832 +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
121833 +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
121834 +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
121835 +__copy_from_user_nocheck_49699 __copy_from_user_nocheck 0-3 49699 NULL
121836 +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
121837 +write_pool_49718 write_pool 3 49718 NULL
121838 +kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL nohasharray
121839 +sfw_create_test_rpc_49723 sfw_create_test_rpc 4 49723 &kvm_mmu_notifier_invalidate_page_49723
121840 +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
121841 +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
121842 +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
121843 +fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL
121844 +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
121845 +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
121846 +w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
121847 +ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
121848 +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
121849 +__of_parse_phandle_with_args_49807 __of_parse_phandle_with_args 0 49807 NULL
121850 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
121851 +add_uuid_49831 add_uuid 4 49831 NULL
121852 +iraw_loop_49842 iraw_loop 0-1 49842 NULL
121853 +twl4030_write_49846 twl4030_write 2 49846 NULL
121854 +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
121855 +timeradd_entry_49850 timeradd_entry 3 49850 NULL
121856 +fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
121857 +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
121858 +osc_brw_49896 osc_brw 4 49896 NULL
121859 +fuse_send_write_49915 fuse_send_write 4-0 49915 NULL
121860 +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
121861 +drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
121862 +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
121863 +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
121864 +security_context_to_sid_50019 security_context_to_sid 2 50019 NULL
121865 +isdn_read_50021 isdn_read 3 50021 NULL
121866 +mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
121867 +xlog_recovery_process_trans_50028 xlog_recovery_process_trans 4 50028 NULL
121868 +brcmf_debugfs_chipinfo_read_50033 brcmf_debugfs_chipinfo_read 3 50033 NULL
121869 +ioread8_50049 ioread8 0 50049 NULL
121870 +fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
121871 +__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
121872 +dev_set_alias_50084 dev_set_alias 3 50084 NULL
121873 +libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL
121874 +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
121875 +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
121876 +android_set_cntry_50100 android_set_cntry 0 50100 NULL
121877 +read_file_slot_50111 read_file_slot 3 50111 NULL
121878 +rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
121879 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
121880 +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
121881 +kmalloc_node_50163 kmalloc_node 1 50163 NULL
121882 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
121883 +ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
121884 +odev_update_50169 odev_update 2 50169 NULL
121885 +ubi_resize_volume_50172 ubi_resize_volume 2 50172 NULL nohasharray
121886 +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 &ubi_resize_volume_50172
121887 +cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
121888 +cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
121889 +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
121890 +l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
121891 +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
121892 +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
121893 +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
121894 +soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
121895 +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
121896 +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
121897 +soc_camera_read_50319 soc_camera_read 3 50319 NULL
121898 +do_launder_page_50329 do_launder_page 0 50329 NULL
121899 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
121900 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
121901 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 NULL
121902 +tpm_read_50344 tpm_read 3 50344 NULL
121903 +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
121904 +iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 NULL
121905 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
121906 +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
121907 +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
121908 +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
121909 +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
121910 +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
121911 +btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
121912 +pgctrl_write_50453 pgctrl_write 3 50453 NULL
121913 +device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
121914 +cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
121915 +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
121916 +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
121917 +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
121918 +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
121919 +trigger_request_store_50548 trigger_request_store 4 50548 NULL
121920 +usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
121921 +fat_readpages_50582 fat_readpages 4 50582 NULL
121922 +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
121923 +xillybus_write_50605 xillybus_write 3 50605 NULL
121924 +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
121925 +sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
121926 +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
121927 +ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
121928 +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
121929 +prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL
121930 +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
121931 +dev_mem_read_50706 dev_mem_read 3 50706 NULL
121932 +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
121933 +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
121934 +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
121935 +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
121936 +tpm_write_50798 tpm_write 3 50798 NULL
121937 +tun_do_read_50800 tun_do_read 4 50800 NULL
121938 +write_flush_50803 write_flush 3 50803 NULL
121939 +dvb_play_50814 dvb_play 3 50814 NULL
121940 +btrfs_stack_file_extent_disk_num_bytes_50825 btrfs_stack_file_extent_disk_num_bytes 0 50825 NULL
121941 +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
121942 +SetArea_50835 SetArea 4 50835 NULL
121943 +nft_trans_alloc_50836 nft_trans_alloc 3 50836 NULL
121944 +videobuf_dma_init_user_50839 videobuf_dma_init_user 4-3 50839 NULL
121945 +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
121946 +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
121947 +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
121948 +__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
121949 +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
121950 +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
121951 +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
121952 +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
121953 +show_device_status_50947 show_device_status 0 50947 NULL
121954 +irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
121955 +virtio_cread16_50951 virtio_cread16 0 50951 NULL
121956 +sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
121957 +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
121958 +of_modalias_node_50975 of_modalias_node 3 50975 NULL
121959 +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
121960 +timeout_write_50991 timeout_write 3 50991 NULL
121961 +proc_write_51003 proc_write 3 51003 NULL
121962 +jbd2_journal_extend_51012 jbd2_journal_extend 2 51012 NULL
121963 +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
121964 +fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL
121965 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
121966 +dump_midi_51040 dump_midi 3 51040 NULL
121967 +usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
121968 +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
121969 +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
121970 +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
121971 +rsc_mgr_init_51067 rsc_mgr_init 3 51067 NULL
121972 +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
121973 +__ipv4_tun_to_nlattr_51095 __ipv4_tun_to_nlattr 4 51095 NULL
121974 +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
121975 +ti_recv_51110 ti_recv 3 51110 NULL
121976 +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
121977 +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
121978 +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
121979 +i40evf_acquire_msix_vectors_51190 i40evf_acquire_msix_vectors 2 51190 NULL
121980 +iwl_dbgfs_bcast_filters_macs_read_51231 iwl_dbgfs_bcast_filters_macs_read 3 51231 NULL
121981 +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
121982 +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
121983 +drm_property_create_51239 drm_property_create 4 51239 NULL
121984 +st_read_51251 st_read 3 51251 NULL
121985 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
121986 +target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
121987 +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
121988 +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
121989 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
121990 +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
121991 +init_map_ipmac_51317 init_map_ipmac 5 51317 NULL
121992 +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
121993 +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
121994 +smk_write_ptrace_51333 smk_write_ptrace 3 51333 NULL
121995 +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
121996 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
121997 +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
121998 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
121999 +blk_register_region_51424 blk_register_region 1-2 51424 NULL
122000 +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
122001 +hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
122002 +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
122003 +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
122004 +vmxnet3_acquire_msix_vectors_51462 vmxnet3_acquire_msix_vectors 2 51462 NULL
122005 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
122006 +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
122007 +osc_brw_internal_51489 osc_brw_internal 5 51489 NULL
122008 +kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
122009 +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
122010 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
122011 +batadv_tt_prepare_tvlv_local_data_51568 batadv_tt_prepare_tvlv_local_data 0 51568 NULL
122012 +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
122013 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
122014 +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
122015 +extent_fiemap_51621 extent_fiemap 3 51621 NULL
122016 +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
122017 +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
122018 +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
122019 +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
122020 +rtw_os_xmit_resource_alloc23a_51693 rtw_os_xmit_resource_alloc23a 3 51693 NULL
122021 +host_mapping_level_51696 host_mapping_level 0 51696 NULL
122022 +sel_write_access_51704 sel_write_access 3 51704 NULL
122023 +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
122024 +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
122025 +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
122026 +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
122027 +str_read_51731 str_read 4 51731 NULL
122028 +cm4040_read_51732 cm4040_read 3 51732 NULL
122029 +get_user_pages_fast_51751 get_user_pages_fast 0 51751 NULL
122030 +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
122031 +if_write_51756 if_write 3 51756 NULL
122032 +ssd1307fb_alloc_array_51788 ssd1307fb_alloc_array 1 51788 NULL
122033 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
122034 +buffer_from_user_51826 buffer_from_user 3 51826 NULL
122035 +ioread32_51847 ioread32 0 51847 NULL nohasharray
122036 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
122037 +do_readv_writev_51849 do_readv_writev 4 51849 NULL
122038 +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
122039 +bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
122040 +pointer_size_read_51863 pointer_size_read 3 51863 NULL
122041 +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
122042 +user_read_51881 user_read 3 51881 NULL
122043 +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
122044 +SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL
122045 +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
122046 +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
122047 +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
122048 +xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
122049 +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
122050 +get_clock_info_51952 get_clock_info 4 51952 NULL
122051 +snd_mask_min_51969 snd_mask_min 0 51969 NULL
122052 +get_zone_51981 get_zone 0-1 51981 NULL
122053 +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
122054 +_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
122055 +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
122056 +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
122057 +rdmalt_52022 rdmalt 0 52022 NULL
122058 +override_release_52032 override_release 2 52032 NULL
122059 +end_port_52042 end_port 0 52042 NULL
122060 +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
122061 +msnd_fifo_write_52052 msnd_fifo_write 0-3 52052 NULL
122062 +dvb_ringbuffer_avail_52057 dvb_ringbuffer_avail 0 52057 NULL
122063 +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
122064 +isofs_readpages_52067 isofs_readpages 4 52067 NULL
122065 +mxuport_process_read_urb_data_52072 mxuport_process_read_urb_data 3 52072 NULL
122066 +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
122067 +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
122068 +smsdvb_stats_read_52114 smsdvb_stats_read 3 52114 NULL
122069 +split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
122070 +retry_count_read_52129 retry_count_read 3 52129 NULL
122071 +gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
122072 +sub_alloc_52140 sub_alloc 0 52140 NULL
122073 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL
122074 +htable_size_52148 htable_size 0-1 52148 NULL
122075 +smk_write_load2_52155 smk_write_load2 3 52155 NULL
122076 +tipc_node_get_mtu_52157 tipc_node_get_mtu 0 52157 NULL
122077 +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
122078 +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
122079 +print_prefix_52176 print_prefix 0 52176 NULL
122080 +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
122081 +reiserfs_posix_acl_from_disk_52191 reiserfs_posix_acl_from_disk 2 52191 NULL
122082 +f2fs_seek_block_52194 f2fs_seek_block 2 52194 NULL
122083 +vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
122084 +fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL
122085 +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
122086 +shrink_slab_52261 shrink_slab 2 52261 NULL
122087 +ext2_direct_IO_52270 ext2_direct_IO 4 52270 NULL
122088 +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
122089 +handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
122090 +kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
122091 +read_file_reset_52310 read_file_reset 3 52310 NULL
122092 +ssd1307fb_write_52315 ssd1307fb_write 3 52315 NULL
122093 +request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
122094 +hwflags_read_52318 hwflags_read 3 52318 NULL
122095 +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
122096 +hur_len_52339 hur_len 0 52339 NULL
122097 +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL
122098 +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
122099 +iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
122100 +hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
122101 +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
122102 +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
122103 +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
122104 +aer_inject_write_52399 aer_inject_write 3 52399 NULL
122105 +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
122106 +hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
122107 +delay_status_52431 delay_status 5 52431 NULL
122108 +ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
122109 +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
122110 +alauda_read_data_52452 alauda_read_data 3 52452 NULL
122111 +bt_alloc_52457 bt_alloc 2 52457 NULL
122112 +ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
122113 +usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
122114 +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
122115 +fd_do_rw_52495 fd_do_rw 3 52495 NULL
122116 +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
122117 +lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
122118 +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
122119 +bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
122120 +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
122121 +raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
122122 +SyS_vmsplice_52540 SyS_vmsplice 3 52540 NULL
122123 +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
122124 +debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
122125 +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
122126 +SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
122127 +ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
122128 +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
122129 +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
122130 +nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
122131 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
122132 +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
122133 +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
122134 +__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
122135 +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
122136 +blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
122137 +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
122138 +hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
122139 +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
122140 +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
122141 +nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
122142 +xenvif_write_io_ring_52802 xenvif_write_io_ring 3 52802 NULL
122143 +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
122144 +lb_alloc_ep_req_52837 lb_alloc_ep_req 2 52837 NULL
122145 +mon_bin_get_event_52863 mon_bin_get_event 4-6 52863 NULL
122146 +twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
122147 +qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL
122148 +twlreg_write_52880 twlreg_write 3 52880 NULL
122149 +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
122150 +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
122151 +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
122152 +copy_from_iter_bvec_52912 copy_from_iter_bvec 0-2 52912 NULL
122153 +dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
122154 +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
122155 +iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
122156 +__nodes_remap_52951 __nodes_remap 5 52951 NULL
122157 +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
122158 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
122159 +num_node_state_52989 num_node_state 0 52989 NULL
122160 +efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
122161 +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
122162 +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
122163 +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
122164 +nv50_chan_create_53039 nv50_chan_create 5 53039 NULL
122165 +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
122166 +fimc_get_alpha_mask_53057 fimc_get_alpha_mask 0 53057 NULL
122167 +cfi_read_query_53066 cfi_read_query 0 53066 NULL
122168 +iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
122169 +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
122170 +mic_virtio_copy_from_user_53107 mic_virtio_copy_from_user 3 53107 NULL
122171 +ath10k_mac_create_53118 ath10k_mac_create 1 53118 NULL
122172 +verity_status_53120 verity_status 5 53120 NULL
122173 +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
122174 +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
122175 +copy_user_segment_list_53150 copy_user_segment_list 2 53150 NULL
122176 +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
122177 +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
122178 +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
122179 +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
122180 +ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
122181 +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
122182 +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
122183 +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
122184 +f2fs_fiemap_53310 f2fs_fiemap 4 53310 NULL
122185 +ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
122186 +find_nr_power_limit_53330 find_nr_power_limit 0 53330 NULL
122187 +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
122188 +btree_keys_bytes_53348 btree_keys_bytes 0 53348 NULL
122189 +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
122190 +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
122191 +test_fw_misc_read_53384 test_fw_misc_read 3 53384 NULL
122192 +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
122193 +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
122194 +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
122195 +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
122196 +ima_write_template_field_data_53475 ima_write_template_field_data 2 53475 NULL nohasharray
122197 +create_trace_kprobe_53475 create_trace_kprobe 1 53475 &ima_write_template_field_data_53475
122198 +iowarrior_read_53483 iowarrior_read 3 53483 NULL
122199 +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
122200 +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
122201 +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
122202 +dbAllocNext_53506 dbAllocNext 0 53506 NULL
122203 +check_acl_53512 check_acl 0 53512 NULL nohasharray
122204 +force_sc_support_write_53512 force_sc_support_write 3 53512 &check_acl_53512
122205 +nft_data_dump_53549 nft_data_dump 5 53549 NULL
122206 +SYSC_bind_53582 SYSC_bind 3 53582 NULL
122207 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
122208 +proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
122209 +pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
122210 +___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL nohasharray
122211 +wil_write_file_txmgmt_53626 wil_write_file_txmgmt 3 53626 &___alloc_bootmem_nopanic_53626
122212 +ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
122213 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
122214 +fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
122215 +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
122216 +bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
122217 +igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 &bdev_logical_block_size_53690
122218 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
122219 +__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
122220 +wdm_write_53735 wdm_write 3 53735 NULL
122221 +lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL
122222 +wa_populate_buf_in_urb_53758 wa_populate_buf_in_urb 3-4 53758 NULL
122223 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
122224 +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
122225 +qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
122226 +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
122227 +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
122228 +nls_nullsize_53815 nls_nullsize 0 53815 NULL
122229 +setup_data_read_53822 setup_data_read 3 53822 NULL
122230 +btrfs_free_reserved_extent_53873 btrfs_free_reserved_extent 2 53873 NULL nohasharray
122231 +pms_read_53873 pms_read 3 53873 &btrfs_free_reserved_extent_53873
122232 +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
122233 +SyS_setgroups_53900 SyS_setgroups 1 53900 NULL
122234 +batadv_tt_tvlv_ogm_handler_v1_53909 batadv_tt_tvlv_ogm_handler_v1 5 53909 NULL
122235 +azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
122236 +usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
122237 +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
122238 +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
122239 +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
122240 +hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
122241 +snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
122242 +mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
122243 +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
122244 +batadv_tt_update_orig_54049 batadv_tt_update_orig 6-4 54049 NULL
122245 +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
122246 +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
122247 +rproc_state_read_54057 rproc_state_read 3 54057 NULL
122248 +bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
122249 +altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
122250 +lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103
122251 +__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
122252 +strn_len_54122 strn_len 0 54122 NULL
122253 +isku_receive_54130 isku_receive 4 54130 NULL
122254 +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
122255 +irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
122256 +memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
122257 +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
122258 +p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
122259 +do_sys_poll_54221 do_sys_poll 2 54221 NULL
122260 +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
122261 +pi_read_regr_54231 pi_read_regr 0 54231 NULL
122262 +mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
122263 +reada_add_block_54247 reada_add_block 2 54247 NULL
122264 +write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL
122265 +xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
122266 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
122267 +audio_write_54261 audio_write 4 54261 NULL nohasharray
122268 +wusb_prf_54261 wusb_prf 7 54261 &audio_write_54261
122269 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
122270 +kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
122271 +sizeof_long_54276 sizeof_long 0 54276 NULL
122272 +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
122273 +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
122274 +reclaim_pages_54301 reclaim_pages 3 54301 NULL
122275 +sprintf_54306 sprintf 0 54306 NULL
122276 +path_setxattr_54308 path_setxattr 4 54308 NULL
122277 +bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
122278 +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
122279 +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
122280 +__get_free_pages_54352 __get_free_pages 0 54352 NULL
122281 +readlink_copy_54366 readlink_copy 2 54366 NULL
122282 +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
122283 +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 NULL nohasharray
122284 +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 &intel_sdvo_write_cmd_54377
122285 +ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
122286 +snd_pcm_oss_read2_54387 snd_pcm_oss_read2 0-3 54387 NULL
122287 +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL nohasharray
122288 +hash_mac4_expire_54392 hash_mac4_expire 4 54392 &iwl_dbgfs_power_save_status_read_54392
122289 +ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
122290 +copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL
122291 +sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
122292 +simple_strtoull_54493 simple_strtoull 0 54493 NULL
122293 +l2cap_create_basic_pdu_54508 l2cap_create_basic_pdu 3 54508 NULL
122294 +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
122295 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
122296 +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
122297 +viacam_read_54526 viacam_read 3 54526 NULL
122298 +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
122299 +setsockopt_54539 setsockopt 5 54539 NULL
122300 +lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
122301 +SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 NULL
122302 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
122303 +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
122304 +nvme_npages_54601 nvme_npages 0-1 54601 NULL
122305 +irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
122306 +port_fops_write_54627 port_fops_write 3 54627 NULL
122307 +tipc_send_stream_54648 tipc_send_stream 4 54648 NULL
122308 +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
122309 +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
122310 +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
122311 +simple_alloc_urb_54661 simple_alloc_urb 3 54661 NULL
122312 +tdp_page_fault_54663 tdp_page_fault 2 54663 NULL
122313 +bus_add_device_54665 bus_add_device 0 54665 NULL
122314 +cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
122315 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
122316 +evm_read_key_54674 evm_read_key 3 54674 NULL
122317 +jfs_direct_IO_54687 jfs_direct_IO 4 54687 NULL
122318 +rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
122319 +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
122320 +kzalloc_54740 kzalloc 1 54740 NULL
122321 +wep_iv_read_54744 wep_iv_read 3 54744 NULL
122322 +lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
122323 +crystalhd_user_data_54754 crystalhd_user_data 3 54754 NULL
122324 +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
122325 +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
122326 +ldsem_atomic_update_54774 ldsem_atomic_update 1 54774 NULL
122327 +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
122328 +nfsd_write_54809 nfsd_write 6 54809 NULL
122329 +ar9287_dump_modal_eeprom_54814 ar9287_dump_modal_eeprom 3-2 54814 NULL
122330 +kvzalloc_54815 kvzalloc 1 54815 NULL nohasharray
122331 +crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815 nohasharray
122332 +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 &crypto_tfm_ctx_alignment_54815
122333 +generic_perform_write_54832 generic_perform_write 3 54832 NULL
122334 +write_rio_54837 write_rio 3 54837 NULL
122335 +ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL nohasharray
122336 +nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 &ext3_acl_from_disk_54839
122337 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
122338 +printer_read_54851 printer_read 3 54851 NULL
122339 +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
122340 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
122341 +iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL nohasharray
122342 +kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
122343 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
122344 +bio_add_page_54933 bio_add_page 0-3 54933 NULL
122345 +mxms_structlen_54939 mxms_structlen 0 54939 NULL
122346 +add_port_54941 add_port 2 54941 NULL
122347 +tipc_send2name_54946 tipc_send2name 5 54946 NULL
122348 +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0-3 54949 NULL
122349 +alauda_write_data_54967 alauda_write_data 3 54967 NULL
122350 +c4_add_card_54968 c4_add_card 3 54968 NULL
122351 +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
122352 +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
122353 +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
122354 +efw_transaction_55052 efw_transaction 5-7 55052 NULL
122355 +apei_exec_run_55075 apei_exec_run 0 55075 NULL
122356 +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
122357 +read_dma_55086 read_dma 3 55086 NULL
122358 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
122359 +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
122360 +filldir_55137 filldir 3 55137 NULL
122361 +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
122362 +npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
122363 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
122364 +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
122365 +compat_SyS_ppoll_55196 compat_SyS_ppoll 2 55196 NULL
122366 +sched_feat_write_55202 sched_feat_write 3 55202 NULL
122367 +ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL
122368 +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
122369 +mlx4_load_one_55213 mlx4_load_one 3 55213 NULL
122370 +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
122371 +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
122372 +nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL
122373 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
122374 +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
122375 +lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
122376 +persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL
122377 +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
122378 +lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
122379 +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
122380 +wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
122381 +qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL nohasharray
122382 +compat_SyS_process_vm_readv_55305 compat_SyS_process_vm_readv 3-5 55305 &qp_alloc_guest_work_55305
122383 +compat_SyS_mbind_55329 compat_SyS_mbind 5 55329 NULL
122384 +vme_user_read_55338 vme_user_read 3 55338 NULL
122385 +__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 NULL nohasharray
122386 +sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 &__wa_xfer_setup_sizes_55342
122387 +cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
122388 +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
122389 +nouveau_cli_create_55425 nouveau_cli_create 3 55425 NULL
122390 +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
122391 +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
122392 +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
122393 +ufshcd_exec_dev_cmd_55479 ufshcd_exec_dev_cmd 0 55479 NULL
122394 +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
122395 +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
122396 +batadv_tt_entries_55487 batadv_tt_entries 0-1 55487 NULL
122397 +ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 NULL
122398 +tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
122399 +ea_get_55522 ea_get 3-0 55522 NULL
122400 +buffer_size_55534 buffer_size 0 55534 NULL
122401 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
122402 +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
122403 +hash_ipport6_expire_55549 hash_ipport6_expire 4 55549 NULL
122404 +dm_stats_list_55551 dm_stats_list 4 55551 NULL
122405 +compat_SyS_setsockopt_55581 compat_SyS_setsockopt 5 55581 NULL
122406 +add_partition_55588 add_partition 2 55588 NULL
122407 +kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
122408 +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
122409 +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
122410 +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
122411 +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
122412 +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
122413 +pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
122414 +osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
122415 +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
122416 +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
122417 +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
122418 +get_info_55681 get_info 3 55681 NULL
122419 +iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
122420 +ext4_alloc_file_blocks_55689 ext4_alloc_file_blocks 3 55689 NULL
122421 +genl_allocate_reserve_groups_55705 genl_allocate_reserve_groups 1 55705 NULL
122422 +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
122423 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
122424 +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
122425 +set_local_name_55757 set_local_name 4 55757 NULL
122426 +ethtool_copy_validate_indir_55769 ethtool_copy_validate_indir 4 55769 NULL
122427 +strlen_55778 strlen 0 55778 NULL
122428 +set_spte_55783 set_spte 4-5 55783 NULL
122429 +conf_read_55786 conf_read 3 55786 NULL nohasharray
122430 +req_bio_endio_55786 req_bio_endio 3 55786 &conf_read_55786
122431 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
122432 +sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
122433 +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
122434 +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
122435 +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
122436 +hsc_write_55875 hsc_write 3 55875 NULL
122437 +ramdisk_store_55885 ramdisk_store 4 55885 NULL
122438 +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
122439 +hash_ip4_expire_55911 hash_ip4_expire 4 55911 NULL
122440 +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
122441 +kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
122442 +sel_read_policy_55947 sel_read_policy 3 55947 NULL
122443 +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
122444 +simple_read_from_buffer_55957 simple_read_from_buffer 5-2-0 55957 NULL
122445 +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
122446 +btrfs_clone_55977 btrfs_clone 5-3-6 55977 NULL
122447 +wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 3-2 55992 NULL
122448 +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
122449 +iwl_trans_read_prph_56052 iwl_trans_read_prph 0 56052 NULL
122450 +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
122451 +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
122452 +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
122453 +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
122454 +write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
122455 +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
122456 +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0-3 56194 NULL
122457 +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
122458 +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
122459 +ufshcd_query_descriptor_56236 ufshcd_query_descriptor 0 56236 NULL
122460 +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
122461 +fd_copyin_56247 fd_copyin 3 56247 NULL
122462 +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
122463 +acpi_ex_get_serial_access_length_56275 acpi_ex_get_serial_access_length 0-2 56275 NULL
122464 +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
122465 +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
122466 +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
122467 +dvb_aplay_56296 dvb_aplay 3 56296 NULL
122468 +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
122469 +speakup_file_write_56310 speakup_file_write 3 56310 NULL
122470 +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
122471 +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
122472 +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
122473 +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
122474 +mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
122475 +iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL
122476 +dev_read_56369 dev_read 3 56369 NULL
122477 +ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
122478 +lnet_ping_56378 lnet_ping 4 56378 NULL
122479 +write_gssp_56404 write_gssp 3 56404 NULL
122480 +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
122481 +store_msg_56417 store_msg 3 56417 NULL
122482 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
122483 +l2cap_segment_le_sdu_56426 l2cap_segment_le_sdu 4 56426 NULL nohasharray
122484 +nvme_submit_cmd_56426 nvme_submit_cmd 0 56426 &l2cap_segment_le_sdu_56426
122485 +lprocfs_fid_space_seq_write_56431 lprocfs_fid_space_seq_write 3 56431 NULL nohasharray
122486 +ec_dbgfs_cmd_read_56431 ec_dbgfs_cmd_read 3 56431 &lprocfs_fid_space_seq_write_56431
122487 +fl_create_56435 fl_create 5 56435 NULL
122488 +gnttab_map_56439 gnttab_map 2 56439 NULL
122489 +cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
122490 +set_connectable_56458 set_connectable 4 56458 NULL
122491 +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
122492 +putused_user_56467 putused_user 3 56467 NULL
122493 +ocfs2_zero_extend_range_56468 ocfs2_zero_extend_range 3-2 56468 NULL
122494 +lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
122495 +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
122496 +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
122497 +memblock_virt_alloc_56501 memblock_virt_alloc 1 56501 NULL
122498 +init_map_ip_56508 init_map_ip 5 56508 NULL
122499 +lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
122500 +cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
122501 +ip_options_get_56538 ip_options_get 4 56538 NULL
122502 +ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
122503 +alloc_apertures_56561 alloc_apertures 1 56561 NULL
122504 +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
122505 +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
122506 +gro_pull_from_frag0_56593 gro_pull_from_frag0 2 56593 NULL
122507 +event_filter_write_56609 event_filter_write 3 56609 NULL
122508 +nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
122509 +gather_array_56641 gather_array 3 56641 NULL
122510 +lookup_extent_backref_56644 lookup_extent_backref 9 56644 NULL
122511 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
122512 +nv50_gpio_intr_mask_56665 nv50_gpio_intr_mask 4-3 56665 NULL
122513 +tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
122514 +snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
122515 +dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
122516 +sfw_alloc_pages_56709 sfw_alloc_pages 3 56709 NULL
122517 +sta_flags_read_56710 sta_flags_read 3 56710 NULL
122518 +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
122519 +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
122520 +__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
122521 +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
122522 +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
122523 +ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 NULL
122524 +ion_ioctl_56806 ion_ioctl 2 56806 NULL
122525 +do_syslog_56807 do_syslog 3 56807 NULL
122526 +mtdchar_write_56831 mtdchar_write 3 56831 NULL
122527 +snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
122528 +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
122529 +gk20a_ram_get_56863 gk20a_ram_get 2 56863 NULL
122530 +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
122531 +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
122532 +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
122533 +le_auto_conn_write_56895 le_auto_conn_write 3 56895 NULL nohasharray
122534 +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 &le_auto_conn_write_56895
122535 +hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
122536 +strcspn_56913 strcspn 0 56913 NULL
122537 +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
122538 +journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
122539 +nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
122540 +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
122541 +sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
122542 +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
122543 +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
122544 +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
122545 +ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 NULL nohasharray
122546 +skb_network_offset_57043 skb_network_offset 0 57043 &ieee80211_if_fmt_state_57043
122547 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
122548 +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
122549 +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
122550 +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
122551 +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
122552 +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
122553 +altera_get_note_57099 altera_get_note 6 57099 NULL
122554 +hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
122555 +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
122556 +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
122557 +ima_show_htable_value_57136 ima_show_htable_value 2 57136 NULL nohasharray
122558 +rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &ima_show_htable_value_57136 nohasharray
122559 +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 &rds_ib_sub_signaled_57136
122560 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
122561 +_iwl_dbgfs_bf_params_write_57141 _iwl_dbgfs_bf_params_write 3 57141 NULL
122562 +acpi_gsb_i2c_read_bytes_57145 acpi_gsb_i2c_read_bytes 4 57145 NULL
122563 +udl_prime_create_57159 udl_prime_create 2 57159 NULL
122564 +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
122565 +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
122566 +hash_netnet6_expire_57191 hash_netnet6_expire 4 57191 NULL
122567 +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
122568 +dma_fifo_alloc_57236 dma_fifo_alloc 2-3-5 57236 NULL
122569 +drbg_blocklen_57239 drbg_blocklen 0 57239 NULL
122570 +rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
122571 +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
122572 +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
122573 +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
122574 +lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
122575 +pstore_file_read_57288 pstore_file_read 3 57288 NULL
122576 +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
122577 +string_length_no_trail_57290 string_length_no_trail 0-2 57290 NULL
122578 +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
122579 +write_file_regval_57313 write_file_regval 3 57313 NULL
122580 +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
122581 +usblp_read_57342 usblp_read 3 57342 NULL
122582 +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
122583 +dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
122584 +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
122585 +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
122586 +bzImage64_load_57388 bzImage64_load 7 57388 NULL
122587 +read_file_blob_57406 read_file_blob 3 57406 NULL
122588 +enclosure_register_57412 enclosure_register 3 57412 NULL
122589 +read_file_eeprom_57428 read_file_eeprom 3 57428 NULL
122590 +compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
122591 +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
122592 +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
122593 +sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
122594 +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL
122595 +read_file_skb_rx_57490 read_file_skb_rx 3 57490 NULL
122596 +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
122597 +skb_headlen_57501 skb_headlen 0 57501 NULL
122598 +copy_in_user_57502 copy_in_user 3 57502 NULL
122599 +ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
122600 +init_tag_map_57515 init_tag_map 3 57515 NULL
122601 +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
122602 +il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517
122603 +cmm_read_57520 cmm_read 3 57520 NULL
122604 +inode_permission_57531 inode_permission 0 57531 NULL
122605 +acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
122606 +ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
122607 +compat_SyS_process_vm_writev_57542 compat_SyS_process_vm_writev 3-5 57542 NULL
122608 +ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL
122609 +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
122610 +get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
122611 +ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
122612 +il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
122613 +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
122614 +copy_to_iter_bvec_57604 copy_to_iter_bvec 0-2 57604 NULL
122615 +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
122616 +sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
122617 +mem_read_57631 mem_read 3 57631 NULL
122618 +r3964_write_57662 r3964_write 4 57662 NULL
122619 +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
122620 +__lgwrite_57669 __lgwrite 4 57669 NULL
122621 +f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
122622 +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
122623 +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
122624 +pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 NULL
122625 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
122626 +SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL
122627 +ld2_57794 ld2 0 57794 NULL
122628 +ivtv_read_57796 ivtv_read 3 57796 NULL
122629 +ion_test_ioctl_57799 ion_test_ioctl 2 57799 NULL
122630 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
122631 +copy_to_user_57835 copy_to_user 3-0 57835 NULL
122632 +flash_read_57843 flash_read 3 57843 NULL
122633 +kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
122634 +radeon_ttm_gtt_read_57879 radeon_ttm_gtt_read 3 57879 NULL
122635 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
122636 +iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
122637 +ll_xattr_find_get_lock_57912 ll_xattr_find_get_lock 0 57912 NULL
122638 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
122639 +mwifiex_hscfg_read_57920 mwifiex_hscfg_read 3 57920 NULL
122640 +twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
122641 +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
122642 +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
122643 +xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
122644 +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
122645 +arch_gnttab_init_57948 arch_gnttab_init 2-1 57948 NULL
122646 +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
122647 +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
122648 +iov_iter_npages_57979 iov_iter_npages 0-2 57979 NULL
122649 +do_rx_dma_57996 do_rx_dma 5 57996 NULL
122650 +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
122651 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
122652 +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
122653 +mce_async_out_58056 mce_async_out 3 58056 NULL
122654 +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
122655 +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
122656 +cm4040_write_58079 cm4040_write 3 58079 NULL
122657 +savemem_58129 savemem 3 58129 NULL
122658 +ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
122659 +slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135
122660 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
122661 +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
122662 +i40evf_allocate_virt_mem_d_58210 i40evf_allocate_virt_mem_d 3 58210 NULL
122663 +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
122664 +read_file_debug_58256 read_file_debug 3 58256 NULL
122665 +osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
122666 +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
122667 +profile_load_58267 profile_load 3 58267 NULL
122668 +kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
122669 +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
122670 +r100_mm_rreg_58276 r100_mm_rreg 0 58276 NULL
122671 +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
122672 +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
122673 +mic_virtio_copy_from_user_58323 mic_virtio_copy_from_user 3 58323 NULL
122674 +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
122675 +lstcon_rpc_prep_58325 lstcon_rpc_prep 4 58325 NULL
122676 +ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
122677 +__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
122678 +ec_i2c_parse_response_58347 ec_i2c_parse_response 0 58347 NULL
122679 +brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
122680 +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
122681 +_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
122682 +kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3 58406 NULL nohasharray
122683 +idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
122684 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
122685 +capabilities_read_58457 capabilities_read 3 58457 NULL
122686 +usnic_vnic_get_resources_58462 usnic_vnic_get_resources 3 58462 NULL
122687 +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 NULL nohasharray
122688 +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 &compat_do_ipt_set_ctl_58466
122689 +nv_rd08_58472 nv_rd08 0 58472 NULL
122690 +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
122691 +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
122692 +dw_spi_show_regs_58486 dw_spi_show_regs 3 58486 NULL
122693 +btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL
122694 +tcf_hash_create_58507 tcf_hash_create 4 58507 NULL
122695 +cifs_write_from_iter_58526 cifs_write_from_iter 2 58526 NULL
122696 +rndis_add_response_58544 rndis_add_response 2 58544 NULL
122697 +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
122698 +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
122699 +cur_wm_latency_write_58581 cur_wm_latency_write 3 58581 NULL
122700 +get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
122701 +ea_read_inline_58589 ea_read_inline 0 58589 NULL
122702 +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
122703 +xip_file_read_58592 xip_file_read 3 58592 NULL
122704 +ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
122705 +radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
122706 +btrfs_direct_IO_58608 btrfs_direct_IO 4 58608 NULL
122707 +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
122708 +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
122709 +iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
122710 +find_zero_58685 find_zero 0-1 58685 NULL
122711 +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
122712 +tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
122713 +visor_charqueue_create_58703 visor_charqueue_create 1 58703 NULL
122714 +vx_send_msg_58711 vx_send_msg 0 58711 NULL
122715 +csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
122716 +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
122717 +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
122718 +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
122719 +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
122720 +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
122721 +isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
122722 +ep_read_58813 ep_read 3 58813 NULL
122723 +command_write_58841 command_write 3 58841 NULL
122724 +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
122725 +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
122726 +esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
122727 +lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
122728 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
122729 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
122730 +wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
122731 +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
122732 +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
122733 +init_list_set_59005 init_list_set 3 59005 NULL
122734 +ep_write_59008 ep_write 3 59008 NULL
122735 +lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
122736 +SyS_preadv_59029 SyS_preadv 3 59029 NULL
122737 +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
122738 +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
122739 +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
122740 +regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
122741 +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
122742 +sta_tx_latency_stat_table_59122 sta_tx_latency_stat_table 0-4-5 59122 NULL nohasharray
122743 +scsi_io_completion_59122 scsi_io_completion 2 59122 &sta_tx_latency_stat_table_59122
122744 +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
122745 +framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL nohasharray
122746 +print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 &framebuffer_alloc_59145
122747 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
122748 +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
122749 +ksize_59176 ksize 0 59176 NULL
122750 +setup_window_59178 setup_window 4-2-5-7 59178 NULL
122751 +ocfs2_move_extent_59187 ocfs2_move_extent 2-5 59187 NULL
122752 +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
122753 +check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
122754 +dt3155_read_59226 dt3155_read 3 59226 NULL
122755 +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL
122756 +nla_len_59258 nla_len 0 59258 NULL
122757 +drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
122758 +btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
122759 +fd_copyout_59323 fd_copyout 3 59323 NULL
122760 +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
122761 +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL
122762 +__map_request_59350 __map_request 0 59350 NULL
122763 +SyS_getrandom_59366 SyS_getrandom 2 59366 NULL
122764 +f2fs_fallocate_59377 f2fs_fallocate 4-3 59377 NULL
122765 +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
122766 +journal_init_dev_59384 journal_init_dev 5 59384 NULL
122767 +__net_get_random_once_59389 __net_get_random_once 2 59389 NULL
122768 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
122769 +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
122770 +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
122771 +fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
122772 +tipc_recv_stream_59456 tipc_recv_stream 4 59456 NULL
122773 +_iwl_dbgfs_bcast_filters_write_59491 _iwl_dbgfs_bcast_filters_write 3 59491 NULL
122774 +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
122775 +C_SYSC_get_mempolicy_59516 C_SYSC_get_mempolicy 3 59516 NULL
122776 +mic_vringh_copy_59523 mic_vringh_copy 4 59523 NULL
122777 +msix_setup_entries_59545 msix_setup_entries 0 59545 NULL
122778 +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
122779 +tunables_write_59563 tunables_write 3 59563 NULL
122780 +bio_split_59564 bio_split 2 59564 NULL
122781 +__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
122782 +write_pbl_59583 write_pbl 4 59583 NULL
122783 +memdup_user_59590 memdup_user 2 59590 NULL
122784 +mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray
122785 +xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616
122786 +ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
122787 +mtrr_write_59622 mtrr_write 3 59622 NULL
122788 +find_first_zero_bit_59636 find_first_zero_bit 0 59636 NULL
122789 +SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
122790 +hidraw_read_59650 hidraw_read 3 59650 NULL
122791 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
122792 +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
122793 +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
122794 +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
122795 +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
122796 +ioperm_get_59701 ioperm_get 4-3 59701 NULL
122797 +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
122798 +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL nohasharray
122799 +nv94_aux_mask_59740 nv94_aux_mask 2 59740 &ieee80211_if_read_fwded_unicast_59740
122800 +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
122801 +strnlen_59746 strnlen 0 59746 NULL
122802 +ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
122803 +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
122804 +venus_remove_59781 venus_remove 4 59781 NULL
122805 +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
122806 +C_SYSC_preadv_59801 C_SYSC_preadv 3 59801 NULL
122807 +ipw_write_59807 ipw_write 3 59807 NULL
122808 +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
122809 +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
122810 +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
122811 +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
122812 +biovec_create_pool_59878 biovec_create_pool 1 59878 NULL
122813 +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
122814 +l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
122815 +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
122816 +kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
122817 +ath10k_read_dfs_stats_59949 ath10k_read_dfs_stats 3 59949 NULL
122818 +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 NULL nohasharray
122819 +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 &dapm_widget_power_read_file_59950
122820 +il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
122821 +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
122822 +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
122823 +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
122824 +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
122825 +copy_items_60009 copy_items 7 60009 NULL
122826 +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
122827 +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
122828 +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
122829 +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
122830 +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
122831 +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
122832 +vcs_size_60050 vcs_size 0 60050 NULL
122833 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
122834 +compat_writev_60063 compat_writev 3 60063 NULL
122835 +ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
122836 +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
122837 +usb_os_desc_prepare_interf_dir_60075 usb_os_desc_prepare_interf_dir 2 60075 NULL
122838 +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
122839 +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
122840 +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
122841 +nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
122842 +pcpu_need_to_extend_60133 pcpu_need_to_extend 0 60133 NULL
122843 +__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
122844 +ld_usb_read_60156 ld_usb_read 3 60156 NULL
122845 +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
122846 +init_state_60165 init_state 2 60165 NULL
122847 +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 NULL nohasharray
122848 +sg_build_sgat_60179 sg_build_sgat 3 60179 &jffs2_alloc_full_dirent_60179
122849 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
122850 +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL nohasharray
122851 +arch_setup_msi_irqs_60193 arch_setup_msi_irqs 0 60193 &rx_rx_tkip_replays_read_60193
122852 +qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
122853 +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
122854 +irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 2-3 60264 NULL
122855 +display_crc_ctl_write_60273 display_crc_ctl_write 3 60273 NULL
122856 +printer_write_60276 printer_write 3 60276 NULL
122857 +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
122858 +getDataLength_60301 getDataLength 0 60301 NULL
122859 +bch_subtract_dirty_60306 bch_subtract_dirty 3-4 60306 NULL
122860 +usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
122861 +__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
122862 +max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL
122863 +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
122864 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
122865 +ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
122866 +driver_names_read_60399 driver_names_read 3 60399 NULL
122867 +simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
122868 +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
122869 +kmalloc_60432 kmalloc 1 60432 NULL nohasharray
122870 +tstats_write_60432 tstats_write 3 60432 &kmalloc_60432
122871 +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
122872 +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
122873 +lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
122874 +compat_SyS_get_mempolicy_60527 compat_SyS_get_mempolicy 3 60527 NULL
122875 +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
122876 +nonpaging_map_60551 nonpaging_map 4 60551 NULL
122877 +osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
122878 +xfs_vm_direct_IO_60557 xfs_vm_direct_IO 4 60557 NULL
122879 +tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
122880 +memblock_virt_alloc_try_nid_nopanic_60604 memblock_virt_alloc_try_nid_nopanic 1 60604 NULL
122881 +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
122882 +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
122883 +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
122884 +__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
122885 +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
122886 +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
122887 +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
122888 +raid_status_60755 raid_status 5 60755 NULL
122889 +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
122890 +opticon_write_60775 opticon_write 4 60775 NULL
122891 +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
122892 +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
122893 +nvif_object_init_60848 nvif_object_init 6 60848 NULL
122894 +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
122895 +alloc_buf_60864 alloc_buf 3-2 60864 NULL
122896 +generic_writepages_60871 generic_writepages 0 60871 NULL
122897 +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
122898 +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
122899 +libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
122900 +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
122901 +submit_extent_page_60928 submit_extent_page 5 60928 NULL
122902 +pti_char_write_60960 pti_char_write 3 60960 NULL
122903 +mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
122904 +__a2mp_build_60987 __a2mp_build 3 60987 NULL
122905 +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
122906 +generic_file_direct_write_60995 generic_file_direct_write 0 60995 NULL
122907 +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
122908 +graph_depth_write_61024 graph_depth_write 3 61024 NULL
122909 +sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
122910 +read_file_ackto_61037 read_file_ackto 3 61037 NULL
122911 +lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
122912 +symtab_init_61050 symtab_init 2 61050 NULL
122913 +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
122914 +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-2 61062 NULL
122915 +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
122916 +get_derived_key_61100 get_derived_key 4 61100 NULL
122917 +i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-4-3-2-1 61104 NULL
122918 +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
122919 +__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
122920 +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
122921 +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
122922 +pair_device_61175 pair_device 4 61175 NULL nohasharray
122923 +event_oom_late_read_61175 event_oom_late_read 3 61175 &pair_device_61175
122924 +dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
122925 +SyS_prctl_61202 SyS_prctl 4 61202 NULL
122926 +srp_create_fr_pool_61207 srp_create_fr_pool 3 61207 NULL
122927 +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
122928 +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
122929 +v9fs_mmap_file_read_61262 v9fs_mmap_file_read 3 61262 NULL
122930 +kvm_age_hva_61267 kvm_age_hva 2-3 61267 NULL
122931 +find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray
122932 +btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &find_get_pages_tag_61270 nohasharray
122933 +ifalias_store_61270 ifalias_store 4 61270 &btrfs_bio_alloc_61270
122934 +hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray
122935 +vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283
122936 +nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
122937 +xfer_from_user_61307 xfer_from_user 3 61307 NULL
122938 +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
122939 +C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
122940 +write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
122941 +st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL
122942 +rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
122943 +__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-3-2 61342 NULL
122944 +f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
122945 +wil_write_file_recovery_61354 wil_write_file_recovery 3 61354 NULL
122946 +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
122947 +system_enable_write_61396 system_enable_write 3 61396 NULL
122948 +xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL
122949 +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
122950 +snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
122951 +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
122952 +erst_errno_61526 erst_errno 0 61526 NULL
122953 +proc_write_device_61541 proc_write_device 3 61541 NULL
122954 +compat_SyS_select_61542 compat_SyS_select 1 61542 NULL
122955 +trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
122956 +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
122957 +parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
122958 +fan_proc_write_61569 fan_proc_write 3 61569 NULL
122959 +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
122960 +ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
122961 +seq_open_private_61589 seq_open_private 3 61589 NULL
122962 +ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-1-2 61591 NULL
122963 +netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
122964 +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
122965 +configfs_write_file_61621 configfs_write_file 3 61621 NULL
122966 +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
122967 +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
122968 +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL nohasharray
122969 +tcf_hashinfo_init_61643 tcf_hashinfo_init 2 61643 &snd_pcm_oss_read3_61643
122970 +resize_stripes_61650 resize_stripes 2 61650 NULL
122971 +ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL
122972 +insert_one_name_61668 insert_one_name 7 61668 NULL
122973 +qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL
122974 +lock_loop_61681 lock_loop 1 61681 NULL
122975 +__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
122976 +filter_read_61692 filter_read 3 61692 NULL
122977 +SyS_kexec_file_load_61715 SyS_kexec_file_load 3 61715 NULL
122978 +iov_length_61716 iov_length 0 61716 NULL
122979 +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
122980 +null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
122981 +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
122982 +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
122983 +SyS_sendto_61763 SyS_sendto 6 61763 NULL
122984 +mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
122985 +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
122986 +regcache_sync_block_61846 regcache_sync_block 5-4 61846 NULL
122987 +ath9k_hw_def_dump_eeprom_61853 ath9k_hw_def_dump_eeprom 5-4 61853 NULL
122988 +__skb_flow_dissect_61855 __skb_flow_dissect 5 61855 NULL
122989 +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
122990 +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
122991 +get_fw_name_61874 get_fw_name 3 61874 NULL
122992 +btrfs_ioctl_clone_61886 btrfs_ioctl_clone 3-4-5 61886 NULL
122993 +lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
122994 +clear_refs_write_61904 clear_refs_write 3 61904 NULL
122995 +kernfs_name_61910 kernfs_name 3 61910 NULL
122996 +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
122997 +au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
122998 +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
122999 +efi_get_runtime_map_size_61927 efi_get_runtime_map_size 0 61927 NULL
123000 +SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
123001 +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
123002 +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
123003 +fix_read_error_61965 fix_read_error 4 61965 NULL
123004 +ocfs2_quota_write_61972 ocfs2_quota_write 4-5 61972 NULL
123005 +fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
123006 +cow_file_range_61979 cow_file_range 3 61979 NULL
123007 +dequeue_event_62000 dequeue_event 3 62000 NULL
123008 +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
123009 +SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
123010 +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
123011 +SYSC_select_62024 SYSC_select 1 62024 NULL
123012 +comedi_write_array_to_buffer_62032 comedi_write_array_to_buffer 3 62032 NULL
123013 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
123014 +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
123015 +do_pselect_62061 do_pselect 1 62061 NULL
123016 +pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
123017 +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
123018 +ip_recv_error_62117 ip_recv_error 3 62117 NULL
123019 +generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
123020 +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
123021 +qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
123022 +kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133
123023 +ql_status_62135 ql_status 5 62135 NULL nohasharray
123024 +device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
123025 +video_usercopy_62151 video_usercopy 2 62151 NULL
123026 +SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
123027 +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
123028 +write_file_dfs_62180 write_file_dfs 3 62180 NULL
123029 +alloc_upcall_62186 alloc_upcall 2 62186 NULL
123030 +rounded_hashtable_size_62198 rounded_hashtable_size 0 62198 NULL
123031 +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
123032 +smk_read_syslog_62227 smk_read_syslog 3 62227 NULL
123033 +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
123034 +ion_handle_test_dma_62262 ion_handle_test_dma 4-5 62262 NULL
123035 +get_random_int_62279 get_random_int 0 62279 NULL
123036 +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
123037 +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
123038 +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
123039 +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
123040 +subseq_list_62332 subseq_list 3-0 62332 NULL
123041 +ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
123042 +flash_write_62354 flash_write 3 62354 NULL
123043 +xfpregs_set_62363 xfpregs_set 4 62363 NULL
123044 +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
123045 +altera_irscan_62396 altera_irscan 2 62396 NULL
123046 +set_ssp_62411 set_ssp 4 62411 NULL
123047 +tracing_saved_cmdlines_size_read_62491 tracing_saved_cmdlines_size_read 3 62491 NULL
123048 +srpc_alloc_bulk_62522 srpc_alloc_bulk 2 62522 NULL
123049 +pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
123050 +test_iso_queue_62534 test_iso_queue 5 62534 NULL
123051 +debugfs_read_62535 debugfs_read 3 62535 NULL
123052 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
123053 +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
123054 +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
123055 +compat_SyS_rt_sigpending_62580 compat_SyS_rt_sigpending 2 62580 NULL
123056 +get_subdir_62581 get_subdir 3 62581 NULL
123057 +dut_mode_write_62630 dut_mode_write 3 62630 NULL
123058 +vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
123059 +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
123060 +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
123061 +ieee80211_set_probe_resp_62700 ieee80211_set_probe_resp 3 62700 NULL
123062 +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
123063 +gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
123064 +rdm_62719 rdm 0 62719 NULL
123065 +obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
123066 +key_replays_read_62746 key_replays_read 3 62746 NULL
123067 +lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
123068 +mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
123069 +mxt_obj_instances_62764 mxt_obj_instances 0 62764 NULL
123070 +copy_page_to_iter_iovec_62770 copy_page_to_iter_iovec 0-3 62770 NULL nohasharray
123071 +ax25_sendmsg_62770 ax25_sendmsg 4 62770 &copy_page_to_iter_iovec_62770
123072 +C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
123073 +ptlrpc_req_set_repsize_62784 ptlrpc_req_set_repsize 2 62784 NULL
123074 +SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
123075 +dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
123076 +__add_action_62798 __add_action 4 62798 NULL
123077 +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
123078 +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
123079 +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
123080 +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
123081 +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
123082 +l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
123083 +aoechr_write_62883 aoechr_write 3 62883 NULL
123084 +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
123085 +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
123086 +getdqbuf_62908 getdqbuf 1 62908 NULL
123087 +ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
123088 +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
123089 +nvif_object_mthd_62960 nvif_object_mthd 4 62960 NULL
123090 +hwdep_read_62992 hwdep_read 3 62992 NULL
123091 +kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
123092 +__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
123093 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
123094 +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
123095 +unlink1_63059 unlink1 3 63059 NULL
123096 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
123097 +iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
123098 +sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5 63087 NULL
123099 +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
123100 +ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
123101 +iwl_mvm_coex_dump_mbox_63153 iwl_mvm_coex_dump_mbox 4-3-0 63153 NULL
123102 +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
123103 +SyS_syslog_63178 SyS_syslog 3 63178 NULL
123104 +vme_master_read_63221 vme_master_read 0 63221 NULL
123105 +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
123106 +ptp_read_63251 ptp_read 4 63251 NULL
123107 +xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
123108 +iwl_dbgfs_fw_error_dump_read_63263 iwl_dbgfs_fw_error_dump_read 3 63263 NULL
123109 +raid5_resize_63306 raid5_resize 2 63306 NULL
123110 +nfsd_vfs_read_63307 nfsd_vfs_read 5 63307 NULL
123111 +ath10k_read_fw_dbglog_63323 ath10k_read_fw_dbglog 3 63323 NULL
123112 +proc_info_read_63344 proc_info_read 3 63344 NULL
123113 +nvif_device_new_63358 nvif_device_new 5 63358 NULL
123114 +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
123115 +idmouse_read_63374 idmouse_read 3 63374 NULL
123116 +edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL nohasharray
123117 +usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 &edac_pci_alloc_ctl_info_63388
123118 +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
123119 +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
123120 +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
123121 +si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
123122 +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
123123 +reada_find_extent_63486 reada_find_extent 2 63486 NULL
123124 +read_kcore_63488 read_kcore 3 63488 NULL
123125 +iwl_dbgfs_bcast_filters_read_63489 iwl_dbgfs_bcast_filters_read 3 63489 NULL
123126 +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
123127 +efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 4-5 63529 NULL
123128 +ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL
123129 +write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
123130 +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
123131 +append_to_buffer_63550 append_to_buffer 3 63550 NULL
123132 +kvm_write_guest_page_63555 kvm_write_guest_page 5 63555 NULL
123133 +rproc_alloc_63577 rproc_alloc 5 63577 NULL
123134 +write_debug_level_63613 write_debug_level 3 63613 NULL
123135 +__spi_validate_63618 __spi_validate 0 63618 NULL
123136 +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
123137 +hid_report_len_63637 hid_report_len 0 63637 NULL
123138 +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
123139 +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
123140 +ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
123141 +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
123142 +vbi_read_63673 vbi_read 3 63673 NULL
123143 +write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
123144 +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
123145 +btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
123146 +ntb_debugfs_read_63728 ntb_debugfs_read 3 63728 NULL
123147 +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
123148 +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
123149 +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
123150 +spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
123151 +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
123152 +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
123153 +C_SYSC_process_vm_readv_63811 C_SYSC_process_vm_readv 3-5 63811 NULL
123154 +regmap_multi_reg_write_63826 regmap_multi_reg_write 3 63826 NULL nohasharray
123155 +prepare_copy_63826 prepare_copy 2 63826 &regmap_multi_reg_write_63826
123156 +sel_write_load_63830 sel_write_load 3 63830 NULL
123157 +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
123158 +nv10_gpio_intr_mask_63862 nv10_gpio_intr_mask 4-3 63862 NULL
123159 +xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
123160 +uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
123161 +snd_compr_write_63923 snd_compr_write 3 63923 NULL
123162 +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
123163 +__team_options_register_63941 __team_options_register 3 63941 NULL
123164 +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
123165 +set_bredr_63975 set_bredr 4 63975 NULL
123166 +construct_key_and_link_63985 construct_key_and_link 3 63985 NULL
123167 +rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
123168 +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
123169 +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
123170 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
123171 +SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
123172 +nl80211_send_rx_assoc_64040 nl80211_send_rx_assoc 4 64040 NULL
123173 +__sock_create_64069 __sock_create 0 64069 NULL
123174 +get_u8_64076 get_u8 0 64076 NULL
123175 +xilly_malloc_64077 xilly_malloc 2 64077 NULL
123176 +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
123177 +vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL
123178 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
123179 +SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
123180 +to_bytes_64103 to_bytes 0-1 64103 NULL
123181 +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
123182 +rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
123183 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
123184 +bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
123185 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
123186 +init_bch_64130 init_bch 1-2 64130 NULL
123187 +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
123188 +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
123189 +number_of_tds_64156 number_of_tds 0 64156 NULL
123190 +bnx2x_vf_mcast_64166 bnx2x_vf_mcast 4 64166 NULL
123191 +cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
123192 +kernfs_iop_setxattr_64220 kernfs_iop_setxattr 4 64220 NULL
123193 +read_pulse_64227 read_pulse 0-3 64227 NULL
123194 +ea_len_64229 ea_len 0 64229 NULL
123195 +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
123196 +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL nohasharray
123197 +bpf_check_classic_64278 bpf_check_classic 2 64278 &btrfs_file_extent_offset_64278
123198 +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
123199 +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 NULL nohasharray
123200 +event_id_read_64288 event_id_read 3 64288 &xfs_dir_cilookup_result_64288
123201 +info_debugfs_read_64291 info_debugfs_read 3 64291 NULL
123202 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
123203 +snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
123204 +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
123205 +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
123206 +ts_write_64336 ts_write 3 64336 NULL
123207 +usbtmc_write_64340 usbtmc_write 3 64340 NULL
123208 +qlcnic_82xx_calculate_msix_vector_64354 qlcnic_82xx_calculate_msix_vector 0 64354 NULL
123209 +user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
123210 +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
123211 +reg_create_64372 reg_create 5 64372 NULL nohasharray
123212 +bnx2_enable_msix_64372 bnx2_enable_msix 2 64372 &reg_create_64372
123213 +ilo_write_64378 ilo_write 3 64378 NULL
123214 +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
123215 +vmcs_readl_64381 vmcs_readl 0 64381 NULL
123216 +nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
123217 +ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
123218 +pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
123219 +rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
123220 +keyctl_get_security_64418 keyctl_get_security 3 64418 NULL
123221 +oom_adj_write_64428 oom_adj_write 3 64428 NULL
123222 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 NULL
123223 +ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
123224 +single_open_size_64483 single_open_size 4 64483 NULL
123225 +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
123226 +msg_data_sz_64503 msg_data_sz 0 64503 NULL
123227 +remove_uuid_64505 remove_uuid 4 64505 NULL
123228 +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
123229 +iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
123230 +ses_send_diag_64527 ses_send_diag 4 64527 NULL
123231 +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
123232 +SyS_bind_64544 SyS_bind 3 64544 NULL
123233 +rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4 64554 NULL
123234 +__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3 64557 NULL
123235 +ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 NULL nohasharray
123236 +__spi_sync_64561 __spi_sync 0 64561 &ll_max_rw_chunk_seq_write_64561
123237 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
123238 +kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
123239 +do_erase_64574 do_erase 4 64574 NULL
123240 +fanotify_write_64623 fanotify_write 3 64623 NULL
123241 +_iwl_dbgfs_d0i3_refs_write_64642 _iwl_dbgfs_d0i3_refs_write 3 64642 NULL
123242 +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
123243 +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
123244 +tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661
123245 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
123246 +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
123247 +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
123248 +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
123249 +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
123250 +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
123251 +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
123252 +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
123253 +bio_map_kern_64751 bio_map_kern 3 64751 NULL
123254 +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
123255 +hwdep_write_64776 hwdep_write 3 64776 NULL
123256 +message_for_md_64777 message_for_md 5 64777 NULL
123257 +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
123258 +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
123259 +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
123260 +rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL nohasharray
123261 +nv_mask_64808 nv_mask 0 64808 &rfkill_fop_write_64808
123262 +proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
123263 +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
123264 +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
123265 +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
123266 +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
123267 +pci_vc_do_save_buffer_64876 pci_vc_do_save_buffer 0 64876 NULL
123268 +lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
123269 +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
123270 +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL nohasharray
123271 +tipc_port_iovec_reject_64958 tipc_port_iovec_reject 4 64958 &ip_options_get_from_user_64958
123272 +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
123273 +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
123274 +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
123275 +insert_dent_65034 insert_dent 7 65034 NULL
123276 +snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL
123277 +ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
123278 +pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
123279 +__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
123280 +batadv_socket_write_65083 batadv_socket_write 3 65083 NULL
123281 +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
123282 +ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0-3 65090 NULL
123283 +usbtest_alloc_urb_65115 usbtest_alloc_urb 3-5 65115 NULL
123284 +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
123285 +nouveau_event_create_65229 nouveau_event_create 2-1 65229 NULL
123286 +print_endpoint_stat_65232 print_endpoint_stat 0-4-3 65232 NULL
123287 +whci_n_caps_65247 whci_n_caps 0 65247 NULL
123288 +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
123289 +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
123290 +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
123291 +fat_direct_IO_65295 fat_direct_IO 4 65295 NULL
123292 +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
123293 +get_var_len_65304 get_var_len 0 65304 NULL
123294 +unpack_array_65318 unpack_array 0 65318 NULL
123295 +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
123296 +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
123297 +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
123298 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
123299 +SyS_writev_65372 SyS_writev 3 65372 NULL
123300 +__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
123301 +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
123302 +__read_vmcore_65402 __read_vmcore 2 65402 NULL
123303 +ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
123304 +device_add_groups_65423 device_add_groups 0 65423 NULL
123305 +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
123306 +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
123307 +il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
123308 +clear_user_65470 clear_user 2 65470 NULL
123309 +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
123310 +lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9 65493 NULL
123311 +nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
123312 +tree_mod_log_eb_copy_65535 tree_mod_log_eb_copy 6 65535 NULL
123313 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
123314 new file mode 100644
123315 index 0000000..560cd7b
123316 --- /dev/null
123317 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
123318 @@ -0,0 +1,92 @@
123319 +spa_set_aux_vdevs_746 spa_set_aux_vdevs 3 746 NULL
123320 +zfs_lookup_2144 zfs_lookup 0 2144 NULL
123321 +mappedread_2627 mappedread 2 2627 NULL
123322 +vdev_disk_dio_alloc_2957 vdev_disk_dio_alloc 1 2957 NULL
123323 +nv_alloc_pushpage_spl_4286 nv_alloc_pushpage_spl 2 4286 NULL
123324 +zpl_xattr_get_4574 zpl_xattr_get 0 4574 NULL
123325 +sa_replace_all_by_template_5699 sa_replace_all_by_template 3 5699 NULL
123326 +dmu_write_6048 dmu_write 4-3 6048 NULL
123327 +dmu_buf_hold_array_6095 dmu_buf_hold_array 4-3 6095 NULL
123328 +update_pages_6225 update_pages 2-3 6225 NULL
123329 +bio_nr_pages_7117 bio_nr_pages 0-2 7117 NULL
123330 +dmu_buf_hold_array_by_bonus_8562 dmu_buf_hold_array_by_bonus 3-2 8562 NULL
123331 +zpios_dmu_write_8858 zpios_dmu_write 4-5 8858 NULL
123332 +ddi_copyout_9401 ddi_copyout 3 9401 NULL
123333 +avl_numnodes_12384 avl_numnodes 0 12384 NULL
123334 +dmu_write_uio_dnode_12473 dmu_write_uio_dnode 3 12473 NULL
123335 +dmu_xuio_init_12866 dmu_xuio_init 2 12866 NULL
123336 +zpl_read_common_14389 zpl_read_common 0 14389 NULL
123337 +dmu_snapshot_realname_14632 dmu_snapshot_realname 4 14632 NULL
123338 +kmem_alloc_debug_14852 kmem_alloc_debug 1 14852 NULL
123339 +kmalloc_node_nofail_15151 kmalloc_node_nofail 1 15151 NULL
123340 +dmu_write_uio_16351 dmu_write_uio 4 16351 NULL
123341 +zfs_log_write_16524 zfs_log_write 6-5 16524 NULL
123342 +sa_build_layouts_16910 sa_build_layouts 3 16910 NULL
123343 +dsl_dir_namelen_17053 dsl_dir_namelen 0 17053 NULL
123344 +kcopy_copy_to_user_17336 kcopy_copy_to_user 5 17336 NULL
123345 +sa_add_layout_entry_17507 sa_add_layout_entry 3 17507 NULL
123346 +sa_attr_table_setup_18029 sa_attr_table_setup 3 18029 NULL
123347 +uiocopy_18680 uiocopy 2 18680 NULL
123348 +dmu_buf_hold_array_by_dnode_19125 dmu_buf_hold_array_by_dnode 2-3 19125 NULL
123349 +zpl_acl_from_xattr_21141 zpl_acl_from_xattr 2 21141 NULL
123350 +dsl_pool_tx_assign_init_22518 dsl_pool_tx_assign_init 2 22518 NULL
123351 +nvlist_lookup_byte_array_22527 nvlist_lookup_byte_array 0 22527 NULL
123352 +sa_replace_all_by_template_locked_22533 sa_replace_all_by_template_locked 3 22533 NULL
123353 +tsd_hash_table_init_22559 tsd_hash_table_init 1 22559 NULL
123354 +spa_vdev_remove_aux_23966 spa_vdev_remove_aux 4 23966 NULL
123355 +zpl_xattr_acl_set_access_24129 zpl_xattr_acl_set_access 4 24129 NULL
123356 +dmu_assign_arcbuf_24622 dmu_assign_arcbuf 2 24622 NULL
123357 +zap_lookup_norm_25166 zap_lookup_norm 9 25166 NULL
123358 +dmu_prealloc_25456 dmu_prealloc 4-3 25456 NULL
123359 +kmalloc_nofail_26347 kmalloc_nofail 1 26347 NULL
123360 +zfsctl_snapshot_zpath_27578 zfsctl_snapshot_zpath 2 27578 NULL
123361 +zpios_dmu_read_30015 zpios_dmu_read 4-5 30015 NULL
123362 +splat_write_30943 splat_write 3 30943 NULL
123363 +zpl_xattr_get_sa_31183 zpl_xattr_get_sa 0 31183 NULL
123364 +dmu_read_uio_31467 dmu_read_uio 4 31467 NULL
123365 +zfs_replay_fuids_31479 zfs_replay_fuids 4 31479 NULL
123366 +spa_history_log_to_phys_31632 spa_history_log_to_phys 0-1 31632 NULL
123367 +__zpl_xattr_get_32601 __zpl_xattr_get 0 32601 NULL
123368 +proc_copyout_string_34049 proc_copyout_string 2 34049 NULL
123369 +nv_alloc_sleep_spl_34544 nv_alloc_sleep_spl 2 34544 NULL
123370 +nv_alloc_nosleep_spl_34761 nv_alloc_nosleep_spl 2 34761 NULL
123371 +zap_leaf_array_match_36922 zap_leaf_array_match 4 36922 NULL
123372 +copyinstr_36980 copyinstr 3 36980 NULL
123373 +zpl_xattr_acl_set_default_37864 zpl_xattr_acl_set_default 4 37864 NULL
123374 +splat_read_38116 splat_read 3 38116 NULL
123375 +sa_setup_38756 sa_setup 4 38756 NULL
123376 +vdev_disk_physio_39898 vdev_disk_physio 3 39898 NULL
123377 +arc_buf_size_39982 arc_buf_size 0 39982 NULL
123378 +kzalloc_nofail_40719 kzalloc_nofail 1 40719 NULL
123379 +fuidstr_to_sid_40777 fuidstr_to_sid 4 40777 NULL
123380 +vdev_raidz_matrix_reconstruct_40852 vdev_raidz_matrix_reconstruct 2-3 40852 NULL
123381 +sa_find_layout_40892 sa_find_layout 4 40892 NULL
123382 +zpl_xattr_get_dir_41918 zpl_xattr_get_dir 0 41918 NULL
123383 +zfs_sa_get_xattr_42600 zfs_sa_get_xattr 0 42600 NULL
123384 +zpl_xattr_acl_set_42808 zpl_xattr_acl_set 4 42808 NULL
123385 +xdr_dec_array_43091 xdr_dec_array 5 43091 NULL
123386 +dsl_dataset_namelen_43136 dsl_dataset_namelen 0 43136 NULL
123387 +kcopy_write_43683 kcopy_write 3 43683 NULL
123388 +uiomove_44355 uiomove 2 44355 NULL
123389 +dmu_read_44418 dmu_read 4-3 44418 NULL
123390 +ddi_copyin_44846 ddi_copyin 3 44846 NULL
123391 +kcopy_do_get_45061 kcopy_do_get 5 45061 NULL
123392 +copyin_45945 copyin 3 45945 NULL
123393 +zil_itx_create_46555 zil_itx_create 2 46555 NULL
123394 +dmu_write_uio_dbuf_48064 dmu_write_uio_dbuf 3 48064 NULL
123395 +blk_rq_pos_48233 blk_rq_pos 0 48233 NULL
123396 +spa_history_write_49650 spa_history_write 3 49650 NULL
123397 +kcopy_copy_pages_to_user_49823 kcopy_copy_pages_to_user 3-4 49823 NULL
123398 +zfs_log_write_50162 zfs_log_write 6-5 50162 NULL
123399 +i_fm_alloc_51038 i_fm_alloc 2 51038 NULL
123400 +copyout_51409 copyout 3 51409 NULL
123401 +zvol_log_write_54898 zvol_log_write 4-3 54898 NULL
123402 +zfs_acl_node_alloc_55641 zfs_acl_node_alloc 1 55641 NULL
123403 +get_nvlist_56685 get_nvlist 2 56685 NULL
123404 +zprop_get_numprops_56820 zprop_get_numprops 0 56820 NULL
123405 +splat_taskq_test4_common_59829 splat_taskq_test4_common 5 59829 NULL
123406 +zfs_replay_domain_cnt_61399 zfs_replay_domain_cnt 0 61399 NULL
123407 +zpios_write_61823 zpios_write 3 61823 NULL
123408 +proc_copyin_string_62019 proc_copyin_string 4 62019 NULL
123409 +random_get_pseudo_bytes_64611 random_get_pseudo_bytes 2 64611 NULL
123410 +zpios_read_64734 zpios_read 3 64734 NULL
123411 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
123412 new file mode 100644
123413 index 0000000..95f7abd
123414 --- /dev/null
123415 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
123416 @@ -0,0 +1,259 @@
123417 +/*
123418 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
123419 + * Licensed under the GPL v2, or (at your option) v3
123420 + *
123421 + * Homepage:
123422 + * http://www.grsecurity.net/~ephox/overflow_plugin/
123423 + *
123424 + * Documentation:
123425 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
123426 + *
123427 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
123428 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
123429 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
123430 + *
123431 + * Usage:
123432 + * $ make
123433 + * $ make run
123434 + */
123435 +
123436 +#include "gcc-common.h"
123437 +#include "size_overflow.h"
123438 +
123439 +int plugin_is_GPL_compatible;
123440 +
123441 +tree report_size_overflow_decl;
123442 +
123443 +tree size_overflow_type_HI;
123444 +tree size_overflow_type_SI;
123445 +tree size_overflow_type_DI;
123446 +tree size_overflow_type_TI;
123447 +
123448 +static struct plugin_info size_overflow_plugin_info = {
123449 + .version = "20140725",
123450 + .help = "no-size-overflow\tturn off size overflow checking\n",
123451 +};
123452 +
123453 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
123454 +{
123455 + unsigned int arg_count;
123456 + enum tree_code code = TREE_CODE(*node);
123457 +
123458 + switch (code) {
123459 + case FUNCTION_DECL:
123460 + arg_count = type_num_arguments(TREE_TYPE(*node));
123461 + break;
123462 + case FUNCTION_TYPE:
123463 + case METHOD_TYPE:
123464 + arg_count = type_num_arguments(*node);
123465 + break;
123466 + default:
123467 + *no_add_attrs = true;
123468 + error("%s: %qE attribute only applies to functions", __func__, name);
123469 + return NULL_TREE;
123470 + }
123471 +
123472 + for (; args; args = TREE_CHAIN(args)) {
123473 + tree position = TREE_VALUE(args);
123474 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
123475 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
123476 + *no_add_attrs = true;
123477 + }
123478 + }
123479 + return NULL_TREE;
123480 +}
123481 +
123482 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
123483 +{
123484 + unsigned int arg_count;
123485 + enum tree_code code = TREE_CODE(*node);
123486 +
123487 + switch (code) {
123488 + case FUNCTION_DECL:
123489 + arg_count = type_num_arguments(TREE_TYPE(*node));
123490 + break;
123491 + case FUNCTION_TYPE:
123492 + case METHOD_TYPE:
123493 + arg_count = type_num_arguments(*node);
123494 + break;
123495 + case FIELD_DECL:
123496 + return NULL_TREE;
123497 + default:
123498 + *no_add_attrs = true;
123499 + error("%qE attribute only applies to functions", name);
123500 + return NULL_TREE;
123501 + }
123502 +
123503 + if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0)
123504 + return NULL_TREE;
123505 +
123506 + for (; args; args = TREE_CHAIN(args)) {
123507 + tree position = TREE_VALUE(args);
123508 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
123509 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
123510 + *no_add_attrs = true;
123511 + }
123512 + }
123513 + return NULL_TREE;
123514 +}
123515 +
123516 +static struct attribute_spec size_overflow_attr = {
123517 + .name = "size_overflow",
123518 + .min_length = 1,
123519 + .max_length = -1,
123520 + .decl_required = true,
123521 + .type_required = false,
123522 + .function_type_required = false,
123523 + .handler = handle_size_overflow_attribute,
123524 +#if BUILDING_GCC_VERSION >= 4007
123525 + .affects_type_identity = false
123526 +#endif
123527 +};
123528 +
123529 +static struct attribute_spec intentional_overflow_attr = {
123530 + .name = "intentional_overflow",
123531 + .min_length = 1,
123532 + .max_length = -1,
123533 + .decl_required = true,
123534 + .type_required = false,
123535 + .function_type_required = false,
123536 + .handler = handle_intentional_overflow_attribute,
123537 +#if BUILDING_GCC_VERSION >= 4007
123538 + .affects_type_identity = false
123539 +#endif
123540 +};
123541 +
123542 +static void register_attributes(void __unused *event_data, void __unused *data)
123543 +{
123544 + register_attribute(&size_overflow_attr);
123545 + register_attribute(&intentional_overflow_attr);
123546 +}
123547 +
123548 +static tree create_typedef(tree type, const char* ident)
123549 +{
123550 + tree new_type, decl;
123551 +
123552 + new_type = build_variant_type_copy(type);
123553 + decl = build_decl(BUILTINS_LOCATION, TYPE_DECL, get_identifier(ident), new_type);
123554 + DECL_ORIGINAL_TYPE(decl) = type;
123555 + TYPE_NAME(new_type) = decl;
123556 + return new_type;
123557 +}
123558 +
123559 +// Create the noreturn report_size_overflow() function decl.
123560 +static void size_overflow_start_unit(void __unused *gcc_data, void __unused *user_data)
123561 +{
123562 + tree const_char_ptr_type_node;
123563 + tree fntype;
123564 +
123565 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
123566 +
123567 + size_overflow_type_HI = create_typedef(intHI_type_node, "size_overflow_type_HI");
123568 + size_overflow_type_SI = create_typedef(intSI_type_node, "size_overflow_type_SI");
123569 + size_overflow_type_DI = create_typedef(intDI_type_node, "size_overflow_type_DI");
123570 + size_overflow_type_TI = create_typedef(intTI_type_node, "size_overflow_type_TI");
123571 +
123572 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
123573 + fntype = build_function_type_list(void_type_node,
123574 + const_char_ptr_type_node,
123575 + unsigned_type_node,
123576 + const_char_ptr_type_node,
123577 + const_char_ptr_type_node,
123578 + NULL_TREE);
123579 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
123580 +
123581 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
123582 + TREE_PUBLIC(report_size_overflow_decl) = 1;
123583 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
123584 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
123585 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
123586 +}
123587 +
123588 +
123589 +extern struct gimple_opt_pass pass_dce;
123590 +
123591 +static struct opt_pass *make_dce_pass(void)
123592 +{
123593 +#if BUILDING_GCC_VERSION >= 4009
123594 + return make_pass_dce(g);
123595 +#else
123596 + return &pass_dce.pass;
123597 +#endif
123598 +}
123599 +
123600 +
123601 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
123602 +{
123603 + int i;
123604 + const char * const plugin_name = plugin_info->base_name;
123605 + const int argc = plugin_info->argc;
123606 + const struct plugin_argument * const argv = plugin_info->argv;
123607 + bool enable = true;
123608 + struct register_pass_info insert_size_overflow_asm_pass_info;
123609 + struct register_pass_info __unused dump_before_pass_info;
123610 + struct register_pass_info __unused dump_after_pass_info;
123611 + struct register_pass_info insert_size_overflow_check_info;
123612 + struct register_pass_info dce_pass_info;
123613 + static const struct ggc_root_tab gt_ggc_r_gt_size_overflow[] = {
123614 + {
123615 + .base = &report_size_overflow_decl,
123616 + .nelt = 1,
123617 + .stride = sizeof(report_size_overflow_decl),
123618 + .cb = &gt_ggc_mx_tree_node,
123619 + .pchw = &gt_pch_nx_tree_node
123620 + },
123621 + LAST_GGC_ROOT_TAB
123622 + };
123623 +
123624 + insert_size_overflow_asm_pass_info.pass = make_insert_size_overflow_asm_pass();
123625 + insert_size_overflow_asm_pass_info.reference_pass_name = "ssa";
123626 + insert_size_overflow_asm_pass_info.ref_pass_instance_number = 1;
123627 + insert_size_overflow_asm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
123628 +
123629 + dump_before_pass_info.pass = make_dump_pass();
123630 + dump_before_pass_info.reference_pass_name = "increase_alignment";
123631 + dump_before_pass_info.ref_pass_instance_number = 1;
123632 + dump_before_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
123633 +
123634 + insert_size_overflow_check_info.pass = make_insert_size_overflow_check();
123635 + insert_size_overflow_check_info.reference_pass_name = "increase_alignment";
123636 + insert_size_overflow_check_info.ref_pass_instance_number = 1;
123637 + insert_size_overflow_check_info.pos_op = PASS_POS_INSERT_BEFORE;
123638 +
123639 + dump_after_pass_info.pass = make_dump_pass();
123640 + dump_after_pass_info.reference_pass_name = "increase_alignment";
123641 + dump_after_pass_info.ref_pass_instance_number = 1;
123642 + dump_after_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
123643 +
123644 + dce_pass_info.pass = make_dce_pass();
123645 + dce_pass_info.reference_pass_name = "vrp";
123646 + dce_pass_info.ref_pass_instance_number = 1;
123647 + dce_pass_info.pos_op = PASS_POS_INSERT_AFTER;
123648 +
123649 + if (!plugin_default_version_check(version, &gcc_version)) {
123650 + error(G_("incompatible gcc/plugin versions"));
123651 + return 1;
123652 + }
123653 +
123654 + for (i = 0; i < argc; ++i) {
123655 + if (!strcmp(argv[i].key, "no-size-overflow")) {
123656 + enable = false;
123657 + continue;
123658 + }
123659 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
123660 + }
123661 +
123662 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
123663 + if (enable) {
123664 + register_callback(plugin_name, PLUGIN_START_UNIT, &size_overflow_start_unit, NULL);
123665 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_size_overflow);
123666 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info);
123667 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info);
123668 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_check_info);
123669 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info);
123670 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dce_pass_info);
123671 + }
123672 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
123673 +
123674 + return 0;
123675 +}
123676 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
123677 new file mode 100644
123678 index 0000000..0888f6c
123679 --- /dev/null
123680 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
123681 @@ -0,0 +1,364 @@
123682 +/*
123683 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
123684 + * Licensed under the GPL v2, or (at your option) v3
123685 + *
123686 + * Homepage:
123687 + * http://www.grsecurity.net/~ephox/overflow_plugin/
123688 + *
123689 + * Documentation:
123690 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
123691 + *
123692 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
123693 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
123694 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
123695 + *
123696 + * Usage:
123697 + * $ make
123698 + * $ make run
123699 + */
123700 +
123701 +#include "gcc-common.h"
123702 +#include "size_overflow.h"
123703 +
123704 +#include "size_overflow_hash.h"
123705 +#include "size_overflow_hash_aux.h"
123706 +
123707 +#define CODES_LIMIT 32
123708 +
123709 +static unsigned char get_tree_code(const_tree type)
123710 +{
123711 + switch (TREE_CODE(type)) {
123712 + case ARRAY_TYPE:
123713 + return 0;
123714 + case BOOLEAN_TYPE:
123715 + return 1;
123716 + case ENUMERAL_TYPE:
123717 + return 2;
123718 + case FUNCTION_TYPE:
123719 + return 3;
123720 + case INTEGER_TYPE:
123721 + return 4;
123722 + case POINTER_TYPE:
123723 + return 5;
123724 + case RECORD_TYPE:
123725 + return 6;
123726 + case UNION_TYPE:
123727 + return 7;
123728 + case VOID_TYPE:
123729 + return 8;
123730 + case REAL_TYPE:
123731 + return 9;
123732 + case VECTOR_TYPE:
123733 + return 10;
123734 + case REFERENCE_TYPE:
123735 + return 11;
123736 + case OFFSET_TYPE:
123737 + return 12;
123738 + case COMPLEX_TYPE:
123739 + return 13;
123740 + default:
123741 + debug_tree((tree)type);
123742 + gcc_unreachable();
123743 + }
123744 +}
123745 +
123746 +struct function_hash {
123747 + size_t tree_codes_len;
123748 + unsigned char tree_codes[CODES_LIMIT];
123749 + const_tree fndecl;
123750 + unsigned int hash;
123751 +};
123752 +
123753 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
123754 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
123755 +{
123756 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
123757 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
123758 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
123759 +
123760 + unsigned int m = 0x57559429;
123761 + unsigned int n = 0x5052acdb;
123762 + const unsigned int *key4 = (const unsigned int *)key;
123763 + unsigned int h = len;
123764 + unsigned int k = len + seed + n;
123765 + unsigned long long p;
123766 +
123767 + while (len >= 8) {
123768 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
123769 + len -= 8;
123770 + }
123771 + if (len >= 4) {
123772 + cwmixb(key4[0]) key4 += 1;
123773 + len -= 4;
123774 + }
123775 + if (len)
123776 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
123777 + cwmixb(h ^ (k + n));
123778 + return k ^ h;
123779 +
123780 +#undef cwfold
123781 +#undef cwmixa
123782 +#undef cwmixb
123783 +}
123784 +
123785 +static void set_hash(const char *fn_name, struct function_hash *fn_hash_data)
123786 +{
123787 + unsigned int fn, codes, seed = 0;
123788 +
123789 + fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff;
123790 + codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff;
123791 +
123792 + fn_hash_data->hash = fn ^ codes;
123793 +}
123794 +
123795 +static void set_node_codes(const_tree type, struct function_hash *fn_hash_data)
123796 +{
123797 + gcc_assert(type != NULL_TREE);
123798 + gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type);
123799 +
123800 + while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) {
123801 + fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type);
123802 + fn_hash_data->tree_codes_len++;
123803 + type = TREE_TYPE(type);
123804 + }
123805 +}
123806 +
123807 +static void set_result_codes(const_tree node, struct function_hash *fn_hash_data)
123808 +{
123809 + const_tree result;
123810 +
123811 + gcc_assert(node != NULL_TREE);
123812 +
123813 + if (DECL_P(node)) {
123814 + result = DECL_RESULT(node);
123815 + if (result != NULL_TREE)
123816 + return set_node_codes(TREE_TYPE(result), fn_hash_data);
123817 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
123818 + }
123819 +
123820 + gcc_assert(TYPE_P(node));
123821 +
123822 + if (TREE_CODE(node) == FUNCTION_TYPE)
123823 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
123824 +
123825 + return set_node_codes(node, fn_hash_data);
123826 +}
123827 +
123828 +static void set_function_codes(struct function_hash *fn_hash_data)
123829 +{
123830 + const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl);
123831 + enum tree_code code = TREE_CODE(type);
123832 +
123833 + gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
123834 +
123835 + set_result_codes(fn_hash_data->fndecl, fn_hash_data);
123836 +
123837 + for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg))
123838 + set_node_codes(TREE_VALUE(arg), fn_hash_data);
123839 +}
123840 +
123841 +static const struct size_overflow_hash *get_proper_hash_chain(const struct size_overflow_hash *entry, const char *func_name)
123842 +{
123843 + while (entry) {
123844 + if (!strcmp(entry->name, func_name))
123845 + return entry;
123846 + entry = entry->next;
123847 + }
123848 + return NULL;
123849 +}
123850 +
123851 +const struct size_overflow_hash *get_function_hash(const_tree fndecl)
123852 +{
123853 + const struct size_overflow_hash *entry;
123854 + struct function_hash fn_hash_data;
123855 + const char *func_name;
123856 +
123857 + // skip builtins __builtin_constant_p
123858 + if (DECL_BUILT_IN(fndecl))
123859 + return NULL;
123860 +
123861 + fn_hash_data.fndecl = fndecl;
123862 + fn_hash_data.tree_codes_len = 0;
123863 +
123864 + set_function_codes(&fn_hash_data);
123865 + gcc_assert(fn_hash_data.tree_codes_len != 0);
123866 +
123867 + func_name = DECL_NAME_POINTER(fn_hash_data.fndecl);
123868 + set_hash(func_name, &fn_hash_data);
123869 +
123870 + entry = size_overflow_hash[fn_hash_data.hash];
123871 + entry = get_proper_hash_chain(entry, func_name);
123872 + if (entry)
123873 + return entry;
123874 + entry = size_overflow_hash_aux[fn_hash_data.hash];
123875 + return get_proper_hash_chain(entry, func_name);
123876 +}
123877 +
123878 +static void print_missing_msg(const_tree func, unsigned int argnum)
123879 +{
123880 + location_t loc;
123881 + const char *curfunc;
123882 + struct function_hash fn_hash_data;
123883 +
123884 + fn_hash_data.fndecl = DECL_ORIGIN(func);
123885 + fn_hash_data.tree_codes_len = 0;
123886 +
123887 + loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl);
123888 + curfunc = DECL_NAME_POINTER(fn_hash_data.fndecl);
123889 +
123890 + set_function_codes(&fn_hash_data);
123891 + set_hash(curfunc, &fn_hash_data);
123892 +
123893 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash);
123894 +}
123895 +
123896 +unsigned int find_arg_number_tree(const_tree arg, const_tree func)
123897 +{
123898 + tree var;
123899 + unsigned int argnum = 1;
123900 +
123901 + if (TREE_CODE(arg) == SSA_NAME)
123902 + arg = SSA_NAME_VAR(arg);
123903 +
123904 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) {
123905 + if (!operand_equal_p(arg, var, 0) && strcmp(DECL_NAME_POINTER(var), DECL_NAME_POINTER(arg)))
123906 + continue;
123907 + if (!skip_types(var))
123908 + return argnum;
123909 + }
123910 +
123911 + return CANNOT_FIND_ARG;
123912 +}
123913 +
123914 +static const char *get_asm_string(const_gimple stmt)
123915 +{
123916 + if (!stmt)
123917 + return NULL;
123918 + if (gimple_code(stmt) != GIMPLE_ASM)
123919 + return NULL;
123920 +
123921 + return gimple_asm_string(stmt);
123922 +}
123923 +
123924 +bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt)
123925 +{
123926 + const char *str;
123927 +
123928 + str = get_asm_string(stmt);
123929 + if (!str)
123930 + return false;
123931 + return !strncmp(str, TURN_OFF_ASM_STR, sizeof(TURN_OFF_ASM_STR) - 1);
123932 +}
123933 +
123934 +bool is_size_overflow_intentional_asm_yes(const_gimple stmt)
123935 +{
123936 + const char *str;
123937 +
123938 + str = get_asm_string(stmt);
123939 + if (!str)
123940 + return false;
123941 + return !strncmp(str, YES_ASM_STR, sizeof(YES_ASM_STR) - 1);
123942 +}
123943 +
123944 +bool is_size_overflow_asm(const_gimple stmt)
123945 +{
123946 + const char *str;
123947 +
123948 + str = get_asm_string(stmt);
123949 + if (!str)
123950 + return false;
123951 + return !strncmp(str, OK_ASM_STR, sizeof(OK_ASM_STR) - 1);
123952 +}
123953 +
123954 +bool is_a_return_check(const_tree node)
123955 +{
123956 + if (TREE_CODE(node) == FUNCTION_DECL)
123957 + return true;
123958 +
123959 + gcc_assert(TREE_CODE(node) == PARM_DECL);
123960 + return false;
123961 +}
123962 +
123963 +// Get the argnum of a function decl, if node is a return then the argnum is 0
123964 +unsigned int get_function_num(const_tree node, const_tree orig_fndecl)
123965 +{
123966 + if (is_a_return_check(node))
123967 + return 0;
123968 + else
123969 + return find_arg_number_tree(node, orig_fndecl);
123970 +}
123971 +
123972 +unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl)
123973 +{
123974 + const struct size_overflow_hash *hash;
123975 + unsigned int new_argnum;
123976 + tree arg;
123977 + const_tree origarg;
123978 +
123979 + if (argnum == 0)
123980 + return argnum;
123981 +
123982 + hash = get_function_hash(fndecl);
123983 + if (hash && hash->param & (1U << argnum))
123984 + return argnum;
123985 +
123986 + if (DECL_EXTERNAL(fndecl))
123987 + return argnum;
123988 +
123989 + origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl));
123990 + argnum--;
123991 + while (origarg && argnum) {
123992 + origarg = TREE_CHAIN(origarg);
123993 + argnum--;
123994 + }
123995 + gcc_assert(argnum == 0);
123996 + gcc_assert(origarg != NULL_TREE);
123997 +
123998 + for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++)
123999 + if (operand_equal_p(origarg, arg, 0) || !strcmp(DECL_NAME_POINTER(origarg), DECL_NAME_POINTER(arg)))
124000 + return new_argnum;
124001 +
124002 + return CANNOT_FIND_ARG;
124003 +}
124004 +
124005 +static bool is_in_hash_table(const_tree fndecl, unsigned int num)
124006 +{
124007 + const struct size_overflow_hash *hash;
124008 +
124009 + hash = get_function_hash(fndecl);
124010 + if (hash && (hash->param & (1U << num)))
124011 + return true;
124012 + return false;
124013 +}
124014 +
124015 +/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table.
124016 + * If the function is missing everywhere then print the missing message into stderr.
124017 + */
124018 +bool is_missing_function(const_tree orig_fndecl, unsigned int num)
124019 +{
124020 + switch (DECL_FUNCTION_CODE(orig_fndecl)) {
124021 +#if BUILDING_GCC_VERSION >= 4008
124022 + case BUILT_IN_BSWAP16:
124023 +#endif
124024 + case BUILT_IN_BSWAP32:
124025 + case BUILT_IN_BSWAP64:
124026 + case BUILT_IN_EXPECT:
124027 + case BUILT_IN_MEMCMP:
124028 + return false;
124029 + default:
124030 + break;
124031 + }
124032 +
124033 + // skip test.c
124034 + if (strcmp(DECL_NAME_POINTER(current_function_decl), "coolmalloc")) {
124035 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl)))
124036 + warning(0, "unnecessary size_overflow attribute on: %s\n", DECL_NAME_POINTER(orig_fndecl));
124037 + }
124038 +
124039 + if (is_in_hash_table(orig_fndecl, num))
124040 + return false;
124041 +
124042 + print_missing_msg(orig_fndecl, num);
124043 + return true;
124044 +}
124045 +
124046 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
124047 new file mode 100644
124048 index 0000000..924652b
124049 --- /dev/null
124050 +++ b/tools/gcc/stackleak_plugin.c
124051 @@ -0,0 +1,395 @@
124052 +/*
124053 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
124054 + * Licensed under the GPL v2
124055 + *
124056 + * Note: the choice of the license means that the compilation process is
124057 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
124058 + * but for the kernel it doesn't matter since it doesn't link against
124059 + * any of the gcc libraries
124060 + *
124061 + * gcc plugin to help implement various PaX features
124062 + *
124063 + * - track lowest stack pointer
124064 + *
124065 + * TODO:
124066 + * - initialize all local variables
124067 + *
124068 + * BUGS:
124069 + * - none known
124070 + */
124071 +
124072 +#include "gcc-common.h"
124073 +
124074 +int plugin_is_GPL_compatible;
124075 +
124076 +static int track_frame_size = -1;
124077 +static const char track_function[] = "pax_track_stack";
124078 +static const char check_function[] = "pax_check_alloca";
124079 +static tree track_function_decl, check_function_decl;
124080 +static bool init_locals;
124081 +
124082 +static struct plugin_info stackleak_plugin_info = {
124083 + .version = "201408011900",
124084 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
124085 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
124086 +};
124087 +
124088 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
124089 +{
124090 + gimple check_alloca;
124091 + tree alloca_size;
124092 +
124093 + // insert call to void pax_check_alloca(unsigned long size)
124094 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
124095 + check_alloca = gimple_build_call(check_function_decl, 1, alloca_size);
124096 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
124097 +}
124098 +
124099 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
124100 +{
124101 + gimple track_stack;
124102 +
124103 + // insert call to void pax_track_stack(void)
124104 + track_stack = gimple_build_call(track_function_decl, 0);
124105 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
124106 +}
124107 +
124108 +static bool is_alloca(gimple stmt)
124109 +{
124110 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
124111 + return true;
124112 +
124113 +#if BUILDING_GCC_VERSION >= 4007
124114 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
124115 + return true;
124116 +#endif
124117 +
124118 + return false;
124119 +}
124120 +
124121 +static unsigned int execute_stackleak_tree_instrument(void)
124122 +{
124123 + basic_block bb, entry_bb;
124124 + bool prologue_instrumented = false, is_leaf = true;
124125 +
124126 + entry_bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb;
124127 +
124128 + // 1. loop through BBs and GIMPLE statements
124129 + FOR_EACH_BB_FN(bb, cfun) {
124130 + gimple_stmt_iterator gsi;
124131 +
124132 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
124133 + gimple stmt;
124134 +
124135 + stmt = gsi_stmt(gsi);
124136 +
124137 + if (is_gimple_call(stmt))
124138 + is_leaf = false;
124139 +
124140 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
124141 + if (!is_alloca(stmt))
124142 + continue;
124143 +
124144 + // 2. insert stack overflow check before each __builtin_alloca call
124145 + stackleak_check_alloca(&gsi);
124146 +
124147 + // 3. insert track call after each __builtin_alloca call
124148 + stackleak_add_instrumentation(&gsi);
124149 + if (bb == entry_bb)
124150 + prologue_instrumented = true;
124151 + }
124152 + }
124153 +
124154 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
124155 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
124156 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
124157 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
124158 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
124159 + return 0;
124160 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
124161 + return 0;
124162 +
124163 + // 4. insert track call at the beginning
124164 + if (!prologue_instrumented) {
124165 + gimple_stmt_iterator gsi;
124166 +
124167 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
124168 + if (dom_info_available_p(CDI_DOMINATORS))
124169 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
124170 + gsi = gsi_start_bb(bb);
124171 + stackleak_add_instrumentation(&gsi);
124172 + }
124173 +
124174 + return 0;
124175 +}
124176 +
124177 +static unsigned int execute_stackleak_final(void)
124178 +{
124179 + rtx insn, next;
124180 +
124181 + if (cfun->calls_alloca)
124182 + return 0;
124183 +
124184 + // keep calls only if function frame is big enough
124185 + if (get_frame_size() >= track_frame_size)
124186 + return 0;
124187 +
124188 + // 1. find pax_track_stack calls
124189 + for (insn = get_insns(); insn; insn = next) {
124190 + // 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))
124191 + rtx body;
124192 +
124193 + next = NEXT_INSN(insn);
124194 + if (!CALL_P(insn))
124195 + continue;
124196 + body = PATTERN(insn);
124197 + if (GET_CODE(body) != CALL)
124198 + continue;
124199 + body = XEXP(body, 0);
124200 + if (GET_CODE(body) != MEM)
124201 + continue;
124202 + body = XEXP(body, 0);
124203 + if (GET_CODE(body) != SYMBOL_REF)
124204 + continue;
124205 +// if (strcmp(XSTR(body, 0), track_function))
124206 + if (SYMBOL_REF_DECL(body) != track_function_decl)
124207 + continue;
124208 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
124209 + // 2. delete call
124210 + delete_insn_and_edges(insn);
124211 +#if BUILDING_GCC_VERSION >= 4007
124212 + if (GET_CODE(next) == NOTE && NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
124213 + insn = next;
124214 + next = NEXT_INSN(insn);
124215 + delete_insn_and_edges(insn);
124216 + }
124217 +#endif
124218 + }
124219 +
124220 +// print_simple_rtl(stderr, get_insns());
124221 +// print_rtl(stderr, get_insns());
124222 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
124223 +
124224 + return 0;
124225 +}
124226 +
124227 +static bool gate_stackleak_track_stack(void)
124228 +{
124229 + tree section;
124230 +
124231 + if (ix86_cmodel != CM_KERNEL)
124232 + return false;
124233 +
124234 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
124235 + if (section && TREE_VALUE(section)) {
124236 + section = TREE_VALUE(TREE_VALUE(section));
124237 +
124238 + if (!strncmp(TREE_STRING_POINTER(section), ".init.text", 10))
124239 + return false;
124240 + if (!strncmp(TREE_STRING_POINTER(section), ".devinit.text", 13))
124241 + return false;
124242 + if (!strncmp(TREE_STRING_POINTER(section), ".cpuinit.text", 13))
124243 + return false;
124244 + if (!strncmp(TREE_STRING_POINTER(section), ".meminit.text", 13))
124245 + return false;
124246 + }
124247 +
124248 + return track_frame_size >= 0;
124249 +}
124250 +
124251 +static void stackleak_start_unit(void *gcc_data, void *user_data)
124252 +{
124253 + tree fntype;
124254 +
124255 + // void pax_track_stack(void)
124256 + fntype = build_function_type_list(void_type_node, NULL_TREE);
124257 + track_function_decl = build_fn_decl(track_function, fntype);
124258 + DECL_ASSEMBLER_NAME(track_function_decl); // for LTO
124259 + TREE_PUBLIC(track_function_decl) = 1;
124260 + DECL_EXTERNAL(track_function_decl) = 1;
124261 + DECL_ARTIFICIAL(track_function_decl) = 1;
124262 +
124263 + // void pax_check_alloca(unsigned long)
124264 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
124265 + check_function_decl = build_fn_decl(check_function, fntype);
124266 + DECL_ASSEMBLER_NAME(check_function_decl); // for LTO
124267 + TREE_PUBLIC(check_function_decl) = 1;
124268 + DECL_EXTERNAL(check_function_decl) = 1;
124269 + DECL_ARTIFICIAL(check_function_decl) = 1;
124270 +}
124271 +
124272 +#if BUILDING_GCC_VERSION >= 4009
124273 +static const struct pass_data stackleak_tree_instrument_pass_data = {
124274 +#else
124275 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
124276 + .pass = {
124277 +#endif
124278 + .type = GIMPLE_PASS,
124279 + .name = "stackleak_tree_instrument",
124280 +#if BUILDING_GCC_VERSION >= 4008
124281 + .optinfo_flags = OPTGROUP_NONE,
124282 +#endif
124283 +#if BUILDING_GCC_VERSION >= 4009
124284 + .has_gate = true,
124285 + .has_execute = true,
124286 +#else
124287 + .gate = gate_stackleak_track_stack,
124288 + .execute = execute_stackleak_tree_instrument,
124289 + .sub = NULL,
124290 + .next = NULL,
124291 + .static_pass_number = 0,
124292 +#endif
124293 + .tv_id = TV_NONE,
124294 + .properties_required = PROP_gimple_leh | PROP_cfg,
124295 + .properties_provided = 0,
124296 + .properties_destroyed = 0,
124297 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
124298 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa | TODO_rebuild_cgraph_edges
124299 +#if BUILDING_GCC_VERSION < 4009
124300 + }
124301 +#endif
124302 +};
124303 +
124304 +#if BUILDING_GCC_VERSION >= 4009
124305 +static const struct pass_data stackleak_final_rtl_opt_pass_data = {
124306 +#else
124307 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
124308 + .pass = {
124309 +#endif
124310 + .type = RTL_PASS,
124311 + .name = "stackleak_final",
124312 +#if BUILDING_GCC_VERSION >= 4008
124313 + .optinfo_flags = OPTGROUP_NONE,
124314 +#endif
124315 +#if BUILDING_GCC_VERSION >= 4009
124316 + .has_gate = true,
124317 + .has_execute = true,
124318 +#else
124319 + .gate = gate_stackleak_track_stack,
124320 + .execute = execute_stackleak_final,
124321 + .sub = NULL,
124322 + .next = NULL,
124323 + .static_pass_number = 0,
124324 +#endif
124325 + .tv_id = TV_NONE,
124326 + .properties_required = 0,
124327 + .properties_provided = 0,
124328 + .properties_destroyed = 0,
124329 + .todo_flags_start = 0,
124330 + .todo_flags_finish = TODO_dump_func
124331 +#if BUILDING_GCC_VERSION < 4009
124332 + }
124333 +#endif
124334 +};
124335 +
124336 +#if BUILDING_GCC_VERSION >= 4009
124337 +namespace {
124338 +class stackleak_tree_instrument_pass : public gimple_opt_pass {
124339 +public:
124340 + stackleak_tree_instrument_pass() : gimple_opt_pass(stackleak_tree_instrument_pass_data, g) {}
124341 + bool gate() { return gate_stackleak_track_stack(); }
124342 + unsigned int execute() { return execute_stackleak_tree_instrument(); }
124343 +};
124344 +
124345 +class stackleak_final_rtl_opt_pass : public rtl_opt_pass {
124346 +public:
124347 + stackleak_final_rtl_opt_pass() : rtl_opt_pass(stackleak_final_rtl_opt_pass_data, g) {}
124348 + bool gate() { return gate_stackleak_track_stack(); }
124349 + unsigned int execute() { return execute_stackleak_final(); }
124350 +};
124351 +}
124352 +
124353 +static opt_pass *make_stackleak_tree_instrument_pass(void)
124354 +{
124355 + return new stackleak_tree_instrument_pass();
124356 +}
124357 +
124358 +static opt_pass *make_stackleak_final_rtl_opt_pass(void)
124359 +{
124360 + return new stackleak_final_rtl_opt_pass();
124361 +}
124362 +#else
124363 +static struct opt_pass *make_stackleak_tree_instrument_pass(void)
124364 +{
124365 + return &stackleak_tree_instrument_pass.pass;
124366 +}
124367 +
124368 +static struct opt_pass *make_stackleak_final_rtl_opt_pass(void)
124369 +{
124370 + return &stackleak_final_rtl_opt_pass.pass;
124371 +}
124372 +#endif
124373 +
124374 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
124375 +{
124376 + const char * const plugin_name = plugin_info->base_name;
124377 + const int argc = plugin_info->argc;
124378 + const struct plugin_argument * const argv = plugin_info->argv;
124379 + int i;
124380 + struct register_pass_info stackleak_tree_instrument_pass_info;
124381 + struct register_pass_info stackleak_final_pass_info;
124382 + static const struct ggc_root_tab gt_ggc_r_gt_stackleak[] = {
124383 + {
124384 + .base = &track_function_decl,
124385 + .nelt = 1,
124386 + .stride = sizeof(track_function_decl),
124387 + .cb = &gt_ggc_mx_tree_node,
124388 + .pchw = &gt_pch_nx_tree_node
124389 + },
124390 + {
124391 + .base = &check_function_decl,
124392 + .nelt = 1,
124393 + .stride = sizeof(check_function_decl),
124394 + .cb = &gt_ggc_mx_tree_node,
124395 + .pchw = &gt_pch_nx_tree_node
124396 + },
124397 + LAST_GGC_ROOT_TAB
124398 + };
124399 +
124400 + stackleak_tree_instrument_pass_info.pass = make_stackleak_tree_instrument_pass();
124401 +// stackleak_tree_instrument_pass_info.reference_pass_name = "tree_profile";
124402 + stackleak_tree_instrument_pass_info.reference_pass_name = "optimized";
124403 + stackleak_tree_instrument_pass_info.ref_pass_instance_number = 1;
124404 + stackleak_tree_instrument_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
124405 +
124406 + stackleak_final_pass_info.pass = make_stackleak_final_rtl_opt_pass();
124407 + stackleak_final_pass_info.reference_pass_name = "final";
124408 + stackleak_final_pass_info.ref_pass_instance_number = 1;
124409 + stackleak_final_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
124410 +
124411 + if (!plugin_default_version_check(version, &gcc_version)) {
124412 + error(G_("incompatible gcc/plugin versions"));
124413 + return 1;
124414 + }
124415 +
124416 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
124417 +
124418 + for (i = 0; i < argc; ++i) {
124419 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
124420 + if (!argv[i].value) {
124421 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124422 + continue;
124423 + }
124424 + track_frame_size = atoi(argv[i].value);
124425 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
124426 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
124427 + continue;
124428 + }
124429 + if (!strcmp(argv[i].key, "initialize-locals")) {
124430 + if (argv[i].value) {
124431 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
124432 + continue;
124433 + }
124434 + init_locals = true;
124435 + continue;
124436 + }
124437 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124438 + }
124439 +
124440 + register_callback(plugin_name, PLUGIN_START_UNIT, &stackleak_start_unit, NULL);
124441 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_stackleak);
124442 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
124443 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
124444 +
124445 + return 0;
124446 +}
124447 diff --git a/tools/gcc/structleak_plugin.c b/tools/gcc/structleak_plugin.c
124448 new file mode 100644
124449 index 0000000..4ee2231
124450 --- /dev/null
124451 +++ b/tools/gcc/structleak_plugin.c
124452 @@ -0,0 +1,274 @@
124453 +/*
124454 + * Copyright 2013-2014 by PaX Team <pageexec@freemail.hu>
124455 + * Licensed under the GPL v2
124456 + *
124457 + * Note: the choice of the license means that the compilation process is
124458 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
124459 + * but for the kernel it doesn't matter since it doesn't link against
124460 + * any of the gcc libraries
124461 + *
124462 + * gcc plugin to forcibly initialize certain local variables that could
124463 + * otherwise leak kernel stack to userland if they aren't properly initialized
124464 + * by later code
124465 + *
124466 + * Homepage: http://pax.grsecurity.net/
124467 + *
124468 + * Usage:
124469 + * $ # for 4.5/4.6/C based 4.7
124470 + * $ 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
124471 + * $ # for C++ based 4.7/4.8+
124472 + * $ 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
124473 + * $ gcc -fplugin=./structleak_plugin.so test.c -O2
124474 + *
124475 + * TODO: eliminate redundant initializers
124476 + * increase type coverage
124477 + */
124478 +
124479 +#include "gcc-common.h"
124480 +
124481 +// unused C type flag in all versions 4.5-4.9
124482 +#define TYPE_USERSPACE(TYPE) TYPE_LANG_FLAG_3(TYPE)
124483 +
124484 +int plugin_is_GPL_compatible;
124485 +
124486 +static struct plugin_info structleak_plugin_info = {
124487 + .version = "201401260140",
124488 + .help = "disable\tdo not activate plugin\n",
124489 +};
124490 +
124491 +static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
124492 +{
124493 + *no_add_attrs = true;
124494 +
124495 + // check for types? for now accept everything linux has to offer
124496 + if (TREE_CODE(*node) != FIELD_DECL)
124497 + return NULL_TREE;
124498 +
124499 + *no_add_attrs = false;
124500 + return NULL_TREE;
124501 +}
124502 +
124503 +static struct attribute_spec user_attr = {
124504 + .name = "user",
124505 + .min_length = 0,
124506 + .max_length = 0,
124507 + .decl_required = false,
124508 + .type_required = false,
124509 + .function_type_required = false,
124510 + .handler = handle_user_attribute,
124511 +#if BUILDING_GCC_VERSION >= 4007
124512 + .affects_type_identity = true
124513 +#endif
124514 +};
124515 +
124516 +static void register_attributes(void *event_data, void *data)
124517 +{
124518 + register_attribute(&user_attr);
124519 +// register_attribute(&force_attr);
124520 +}
124521 +
124522 +static tree get_field_type(tree field)
124523 +{
124524 + return strip_array_types(TREE_TYPE(field));
124525 +}
124526 +
124527 +static bool is_userspace_type(tree type)
124528 +{
124529 + tree field;
124530 +
124531 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
124532 + tree fieldtype = get_field_type(field);
124533 + enum tree_code code = TREE_CODE(fieldtype);
124534 +
124535 + if (code == RECORD_TYPE || code == UNION_TYPE)
124536 + if (is_userspace_type(fieldtype))
124537 + return true;
124538 +
124539 + if (lookup_attribute("user", DECL_ATTRIBUTES(field)))
124540 + return true;
124541 + }
124542 + return false;
124543 +}
124544 +
124545 +static void finish_type(void *event_data, void *data)
124546 +{
124547 + tree type = (tree)event_data;
124548 +
124549 + if (TYPE_USERSPACE(type))
124550 + return;
124551 +
124552 + if (is_userspace_type(type))
124553 + TYPE_USERSPACE(type) = 1;
124554 +}
124555 +
124556 +static void initialize(tree var)
124557 +{
124558 + basic_block bb;
124559 + gimple_stmt_iterator gsi;
124560 + tree initializer;
124561 + gimple init_stmt;
124562 +
124563 + // this is the original entry bb before the forced split
124564 + // TODO: check further BBs in case more splits occured before us
124565 + bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb->next_bb;
124566 +
124567 + // first check if the variable is already initialized, warn otherwise
124568 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
124569 + gimple stmt = gsi_stmt(gsi);
124570 + tree rhs1;
124571 +
124572 + // we're looking for an assignment of a single rhs...
124573 + if (!gimple_assign_single_p(stmt))
124574 + continue;
124575 + rhs1 = gimple_assign_rhs1(stmt);
124576 +#if BUILDING_GCC_VERSION >= 4007
124577 + // ... of a non-clobbering expression...
124578 + if (TREE_CLOBBER_P(rhs1))
124579 + continue;
124580 +#endif
124581 + // ... to our variable...
124582 + if (gimple_get_lhs(stmt) != var)
124583 + continue;
124584 + // if it's an initializer then we're good
124585 + if (TREE_CODE(rhs1) == CONSTRUCTOR)
124586 + return;
124587 + }
124588 +
124589 + // these aren't the 0days you're looking for
124590 +// inform(DECL_SOURCE_LOCATION(var), "userspace variable will be forcibly initialized");
124591 +
124592 + // build the initializer expression
124593 + initializer = build_constructor(TREE_TYPE(var), NULL);
124594 +
124595 + // build the initializer stmt
124596 + init_stmt = gimple_build_assign(var, initializer);
124597 + gsi = gsi_start_bb(ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb);
124598 + gsi_insert_before(&gsi, init_stmt, GSI_NEW_STMT);
124599 + update_stmt(init_stmt);
124600 +}
124601 +
124602 +static unsigned int handle_function(void)
124603 +{
124604 + basic_block bb;
124605 + unsigned int ret = 0;
124606 + tree var;
124607 + unsigned int i;
124608 +
124609 + // split the first bb where we can put the forced initializers
124610 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
124611 + if (dom_info_available_p(CDI_DOMINATORS))
124612 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
124613 +
124614 + // enumarate all local variables and forcibly initialize our targets
124615 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
124616 + tree type = TREE_TYPE(var);
124617 +
124618 + gcc_assert(DECL_P(var));
124619 + if (!auto_var_in_fn_p(var, current_function_decl))
124620 + continue;
124621 +
124622 + // only care about structure types
124623 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
124624 + continue;
124625 +
124626 + // if the type is of interest, examine the variable
124627 + if (TYPE_USERSPACE(type))
124628 + initialize(var);
124629 + }
124630 +
124631 + return ret;
124632 +}
124633 +
124634 +#if BUILDING_GCC_VERSION >= 4009
124635 +static const struct pass_data structleak_pass_data = {
124636 +#else
124637 +static struct gimple_opt_pass structleak_pass = {
124638 + .pass = {
124639 +#endif
124640 + .type = GIMPLE_PASS,
124641 + .name = "structleak",
124642 +#if BUILDING_GCC_VERSION >= 4008
124643 + .optinfo_flags = OPTGROUP_NONE,
124644 +#endif
124645 +#if BUILDING_GCC_VERSION >= 4009
124646 + .has_gate = false,
124647 + .has_execute = true,
124648 +#else
124649 + .gate = NULL,
124650 + .execute = handle_function,
124651 + .sub = NULL,
124652 + .next = NULL,
124653 + .static_pass_number = 0,
124654 +#endif
124655 + .tv_id = TV_NONE,
124656 + .properties_required = PROP_cfg,
124657 + .properties_provided = 0,
124658 + .properties_destroyed = 0,
124659 + .todo_flags_start = 0,
124660 + .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
124661 +#if BUILDING_GCC_VERSION < 4009
124662 + }
124663 +#endif
124664 +};
124665 +
124666 +#if BUILDING_GCC_VERSION >= 4009
124667 +namespace {
124668 +class structleak_pass : public gimple_opt_pass {
124669 +public:
124670 + structleak_pass() : gimple_opt_pass(structleak_pass_data, g) {}
124671 + unsigned int execute() { return handle_function(); }
124672 +};
124673 +}
124674 +
124675 +static opt_pass *make_structleak_pass(void)
124676 +{
124677 + return new structleak_pass();
124678 +}
124679 +#else
124680 +static struct opt_pass *make_structleak_pass(void)
124681 +{
124682 + return &structleak_pass.pass;
124683 +}
124684 +#endif
124685 +
124686 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
124687 +{
124688 + int i;
124689 + const char * const plugin_name = plugin_info->base_name;
124690 + const int argc = plugin_info->argc;
124691 + const struct plugin_argument * const argv = plugin_info->argv;
124692 + bool enable = true;
124693 + struct register_pass_info structleak_pass_info;
124694 +
124695 + structleak_pass_info.pass = make_structleak_pass();
124696 + structleak_pass_info.reference_pass_name = "ssa";
124697 + structleak_pass_info.ref_pass_instance_number = 1;
124698 + structleak_pass_info.pos_op = PASS_POS_INSERT_AFTER;
124699 +
124700 + if (!plugin_default_version_check(version, &gcc_version)) {
124701 + error(G_("incompatible gcc/plugin versions"));
124702 + return 1;
124703 + }
124704 +
124705 + if (strcmp(lang_hooks.name, "GNU C")) {
124706 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
124707 + enable = false;
124708 + }
124709 +
124710 + for (i = 0; i < argc; ++i) {
124711 + if (!strcmp(argv[i].key, "disable")) {
124712 + enable = false;
124713 + continue;
124714 + }
124715 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124716 + }
124717 +
124718 + register_callback(plugin_name, PLUGIN_INFO, NULL, &structleak_plugin_info);
124719 + if (enable) {
124720 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &structleak_pass_info);
124721 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
124722 + }
124723 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
124724 +
124725 + return 0;
124726 +}
124727 diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
124728 index 88461f0..6fb70a0 100644
124729 --- a/tools/include/linux/compiler.h
124730 +++ b/tools/include/linux/compiler.h
124731 @@ -35,6 +35,14 @@
124732 # define unlikely(x) __builtin_expect(!!(x), 0)
124733 #endif
124734
124735 +#ifndef __size_overflow
124736 +# define __size_overflow(...)
124737 +#endif
124738 +
124739 +#ifndef __intentional_overflow
124740 +# define __intentional_overflow(...)
124741 +#endif
124742 +
124743 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
124744
124745 #endif /* _TOOLS_LINUX_COMPILER_H */
124746 diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
124747 index 36c08b1..87c72d1 100644
124748 --- a/tools/lib/api/Makefile
124749 +++ b/tools/lib/api/Makefile
124750 @@ -21,7 +21,7 @@ LIB_OBJS += $(OUTPUT)fd/array.o
124751
124752 LIBFILE = libapikfs.a
124753
124754 -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
124755 +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
124756 EXTLIBS = -lelf -lpthread -lrt -lm
124757 ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
124758 ALL_LDFLAGS = $(LDFLAGS)
124759 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
124760 index 6789d788..4afd019e 100644
124761 --- a/tools/perf/util/include/asm/alternative-asm.h
124762 +++ b/tools/perf/util/include/asm/alternative-asm.h
124763 @@ -5,4 +5,7 @@
124764
124765 #define altinstruction_entry #
124766
124767 + .macro pax_force_retaddr rip=0, reload=0
124768 + .endm
124769 +
124770 #endif
124771 diff --git a/tools/virtio/linux/uaccess.h b/tools/virtio/linux/uaccess.h
124772 index 0a578fe..b81f62d 100644
124773 --- a/tools/virtio/linux/uaccess.h
124774 +++ b/tools/virtio/linux/uaccess.h
124775 @@ -13,7 +13,7 @@ static inline void __chk_user_ptr(const volatile void *p, size_t size)
124776 ({ \
124777 typeof(ptr) __pu_ptr = (ptr); \
124778 __chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr)); \
124779 - ACCESS_ONCE(*(__pu_ptr)) = x; \
124780 + ACCESS_ONCE_RW(*(__pu_ptr)) = x; \
124781 0; \
124782 })
124783
124784 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
124785 index 3cee7b1..29cb7d8 100644
124786 --- a/virt/kvm/kvm_main.c
124787 +++ b/virt/kvm/kvm_main.c
124788 @@ -78,12 +78,17 @@ LIST_HEAD(vm_list);
124789
124790 static cpumask_var_t cpus_hardware_enabled;
124791 static int kvm_usage_count = 0;
124792 -static atomic_t hardware_enable_failed;
124793 +static atomic_unchecked_t hardware_enable_failed;
124794
124795 struct kmem_cache *kvm_vcpu_cache;
124796 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
124797
124798 -static __read_mostly struct preempt_ops kvm_preempt_ops;
124799 +static void kvm_sched_in(struct preempt_notifier *pn, int cpu);
124800 +static void kvm_sched_out(struct preempt_notifier *pn, struct task_struct *next);
124801 +static struct preempt_ops kvm_preempt_ops = {
124802 + .sched_in = kvm_sched_in,
124803 + .sched_out = kvm_sched_out,
124804 +};
124805
124806 struct dentry *kvm_debugfs_dir;
124807
124808 @@ -786,7 +791,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
124809 /* We can read the guest memory with __xxx_user() later on. */
124810 if ((mem->slot < KVM_USER_MEM_SLOTS) &&
124811 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
124812 - !access_ok(VERIFY_WRITE,
124813 + !access_ok_noprefault(VERIFY_WRITE,
124814 (void __user *)(unsigned long)mem->userspace_addr,
124815 mem->memory_size)))
124816 goto out;
124817 @@ -1690,9 +1695,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
124818
124819 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
124820 {
124821 - const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
124822 + int r;
124823 + unsigned long addr;
124824
124825 - return kvm_write_guest_page(kvm, gfn, zero_page, offset, len);
124826 + addr = gfn_to_hva(kvm, gfn);
124827 + if (kvm_is_error_hva(addr))
124828 + return -EFAULT;
124829 + r = __clear_user((void __user *)addr + offset, len);
124830 + if (r)
124831 + return -EFAULT;
124832 + mark_page_dirty(kvm, gfn);
124833 + return 0;
124834 }
124835 EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
124836
124837 @@ -1941,7 +1954,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
124838 return 0;
124839 }
124840
124841 -static struct file_operations kvm_vcpu_fops = {
124842 +static file_operations_no_const kvm_vcpu_fops __read_only = {
124843 .release = kvm_vcpu_release,
124844 .unlocked_ioctl = kvm_vcpu_ioctl,
124845 #ifdef CONFIG_COMPAT
124846 @@ -2650,7 +2663,7 @@ out:
124847 }
124848 #endif
124849
124850 -static struct file_operations kvm_vm_fops = {
124851 +static file_operations_no_const kvm_vm_fops __read_only = {
124852 .release = kvm_vm_release,
124853 .unlocked_ioctl = kvm_vm_ioctl,
124854 #ifdef CONFIG_COMPAT
124855 @@ -2721,7 +2734,7 @@ out:
124856 return r;
124857 }
124858
124859 -static struct file_operations kvm_chardev_ops = {
124860 +static file_operations_no_const kvm_chardev_ops __read_only = {
124861 .unlocked_ioctl = kvm_dev_ioctl,
124862 .compat_ioctl = kvm_dev_ioctl,
124863 .llseek = noop_llseek,
124864 @@ -2747,7 +2760,7 @@ static void hardware_enable_nolock(void *junk)
124865
124866 if (r) {
124867 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
124868 - atomic_inc(&hardware_enable_failed);
124869 + atomic_inc_unchecked(&hardware_enable_failed);
124870 printk(KERN_INFO "kvm: enabling virtualization on "
124871 "CPU%d failed\n", cpu);
124872 }
124873 @@ -2803,10 +2816,10 @@ static int hardware_enable_all(void)
124874
124875 kvm_usage_count++;
124876 if (kvm_usage_count == 1) {
124877 - atomic_set(&hardware_enable_failed, 0);
124878 + atomic_set_unchecked(&hardware_enable_failed, 0);
124879 on_each_cpu(hardware_enable_nolock, NULL, 1);
124880
124881 - if (atomic_read(&hardware_enable_failed)) {
124882 + if (atomic_read_unchecked(&hardware_enable_failed)) {
124883 hardware_disable_all_nolock();
124884 r = -EBUSY;
124885 }
124886 @@ -3213,7 +3226,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
124887 kvm_arch_vcpu_put(vcpu);
124888 }
124889
124890 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124891 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124892 struct module *module)
124893 {
124894 int r;
124895 @@ -3260,7 +3273,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124896 if (!vcpu_align)
124897 vcpu_align = __alignof__(struct kvm_vcpu);
124898 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
124899 - 0, NULL);
124900 + SLAB_USERCOPY, NULL);
124901 if (!kvm_vcpu_cache) {
124902 r = -ENOMEM;
124903 goto out_free_3;
124904 @@ -3270,9 +3283,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124905 if (r)
124906 goto out_free;
124907
124908 + pax_open_kernel();
124909 kvm_chardev_ops.owner = module;
124910 kvm_vm_fops.owner = module;
124911 kvm_vcpu_fops.owner = module;
124912 + pax_close_kernel();
124913
124914 r = misc_register(&kvm_dev);
124915 if (r) {
124916 @@ -3282,9 +3297,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124917
124918 register_syscore_ops(&kvm_syscore_ops);
124919
124920 - kvm_preempt_ops.sched_in = kvm_sched_in;
124921 - kvm_preempt_ops.sched_out = kvm_sched_out;
124922 -
124923 r = kvm_init_debug();
124924 if (r) {
124925 printk(KERN_ERR "kvm: create debugfs files failed\n");
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)